--- loncom/interface/lonsearchcat.pm	2006/09/26 15:24:18	1.276
+++ loncom/interface/lonsearchcat.pm	2007/05/01 02:13:40	1.285
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.276 2006/09/26 15:24:18 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.285 2007/05/01 02:13:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,7 +78,6 @@ use HTML::Entities();
 use Parse::RecDescent;
 use Apache::lonnavmaps;
 use Apache::lonindexer();
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
 
 ######################################################################
@@ -171,25 +170,32 @@ sub handler {
                 '_'.$env{'form.persistent_db_id'}.'_persistent_search.db';
     ##
     &Apache::lonhtmlcommon::clear_breadcrumbs();
+
+    my @allowed_searches = ('portfolio');
+    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
+        push(@allowed_searches,'res');
+    } 
     if (exists($env{'request.course.id'}) && $env{'request.course.id'} ne '') {
-        &Apache::lonhtmlcommon::add_breadcrumb
-             ({href=>'/adm/searchcat?'.
-                   'catalogmode='.$env{'form.catalogmode'}.
-                   '&launch='.$env{'form.launch'}.
-                   '&mode='.$env{'form.mode'},
-              text=>"Course and Catalog Search",
-              target=>'_top',
-              bug=>'Searching',});
-    } else {
-        &Apache::lonhtmlcommon::add_breadcrumb
-             ({href=>'/adm/searchcat?'.
-                   'catalogmode='.$env{'form.catalogmode'}.
-                   '&launch='.$env{'form.launch'}.
-                   '&mode='.$env{'form.mode'},
-              text=>"Catalog Search",
+        push(@allowed_searches,'course');
+    }
+    my $crumb_text = 'Portfolio Search';
+    if (@allowed_searches == 3) {
+        $crumb_text = 'Course, Portfolio and Catalog Search';
+    } elsif (@allowed_searches ==2) {
+        if (grep(/^res$/,@allowed_searches)) {
+            $crumb_text = 'Portfolio and Catalog Search'; 
+        } elsif (grep(/^course$/,@allowed_searches)) {
+            $crumb_text = 'Portfolio and Course Search';
+        }
+    }
+    &Apache::lonhtmlcommon::add_breadcrumb
+       ({href=>'/adm/searchcat?'.
+               'catalogmode='.$env{'form.catalogmode'}.
+               '&launch='.$env{'form.launch'}.
+               '&mode='.$env{'form.mode'},
+              text=>"$crumb_text",
               target=>'_top',
               bug=>'Searching',});
-    }
     #
     if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) {
         if (! &get_persistent_form_data($persistent_db_file)) {
@@ -297,12 +303,16 @@ END
     }
     #
     if ($env{'form.searchmode'} eq 'advanced') {
+        my $srchtype = 'Catalog';
+        if ($env{'form.area'} eq 'portfolio') {
+            $srchtype = 'Portfolio';
+        }
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/searchcat?phase=disp_adv&'.
                   'catalogmode='.$env{'form.catalogmode'}.
                   '&launch='.$env{'form.launch'}.
                   '&mode='.$env{'form.mode'},
-                  text=>"Advanced Search",
+                  text=>"Advanced $srchtype Search",
                   bug=>'Searching',});
     } elsif ($env{'form.searchmode'} eq 'course search') {
         &Apache::lonhtmlcommon::add_breadcrumb
@@ -511,7 +521,7 @@ sub course_search {
             my $applies = 0;
             my $symb = $resource->symb();
             my $ressymb = $symb;
-            if ($symb =~ m#(___adm/\w+/\w+)/(\d+)/bulletinboard$#) {
+            if ($symb =~ m#(___adm/$LONCAPA::domain_re/$LONCAPA::username_re)/(\d+)/bulletinboard$#) {
                 $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
                 unless ($ressymb =~ m#bulletin___\d+___adm/wrapper#) {
                     $ressymb=~s#(bulletin___\d+___)#$1adm/wrapper/#;
@@ -740,7 +750,8 @@ sub setup_basic_search {
                        '</label>';
     $onlysearchdomain = '<label>'.&mt('[_1] only search domain [_2]',
       &Apache::lonhtmlcommon::checkbox('domains',$env{'form.domains'},
-                                       $r->dir_config('lonDefDomain'))).
+                                       $r->dir_config('lonDefDomain')),
+				      $r->dir_config('lonDefDomain')).
                         '</label>';
     if ($area eq 'res') {
         $inclext= '<label>'.&mt('[_1] include external resources',
@@ -753,6 +764,9 @@ sub setup_basic_search {
                        '&launch='.$env{'form.launch'}.
                        '&mode='.$env{'form.mode'}.
                        '&area='.$area.
+                       '&form='.$env{'form.form'}.
+                       '&titleelement='.$env{'form.titleelement'}.
+                       '&element='.$env{'form.element'}.
                        '">'.&mt('Advanced Search').'</a>';
     #
     $scrout.='<form name="loncapa_search" method="post" '.
@@ -821,7 +835,22 @@ sub print_advanced_search_form{
 <input type="reset" name="reset" value='$lt{"reset"}' />
 $closebutton
 END
-    my $scrout= &Apache::loncommon::start_page('Advanced Catalog Search');
+    my $srchtype = 'Catalog';
+    my $jscript;
+    if ($env{'form.area'} eq 'portfolio') {
+        $srchtype = 'Portfolio';
+        $jscript = '<script type="text/javascript">
+function additional_metadata() {
+    if (document.advsearch.newfield.checked) {
+        document.advsearch.phase.value = "disp_adv";
+        document.advsearch.numaddedfields.value = parseInt(document.advsearch.numaddedfields.value) +1;
+        document.advsearch.submit();
+    }
+}
+</script>';
+    }
+    my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
+                                               $jscript);
     $scrout .= <<"ENDHEADER";
 $bread_crumb
 <form method="post" action="/adm/searchcat" name="advsearch">
@@ -832,7 +861,7 @@ ENDHEADER
         '<input type="hidden" name="phase" value="adv_search" />';
     my %fields=&Apache::lonmeta::fieldnames();
     #
-    $scrout .= '<h3>'.&mt('Standard Metadata').'</h3>';
+    $scrout .= '<h3>'.&mt('Standard [_1] Metadata',$srchtype).'</h3>';
     $scrout .= "<table>\n";
     $scrout .= '<tr><td>&nbsp;</td><td colspan="2"><font size="-1">'.
         ('&nbsp;'x2).&searchhelp()."</font></td></tr>\n";
@@ -921,33 +950,33 @@ ENDHEADER
     
     if ($env{'form.area'} eq 'portfolio') {
         # Added fields
+        my $curnumadd = $env{'form.numaddedfields'};
+        if ($curnumadd eq '') {
+            $curnumadd = 1;
+        }
         $scrout .= '<h3>'.&mt('Custom Metadata fields').'</h3>';
         $scrout .= "<table>\n";
         $scrout .= '<tr><td>&nbsp;</td><td align="center">'.
                    &mt('Field Name').'</td>'.'<td align="center">'.
-                   &mt('Field Value(s)').'</td></tr>'.
-                   '<tr><td>'.&mt('1: ').
-                   '</td><td align="center">'.
-                   '<input type="text" name="addedfield_0" size="10" /></td>'.
-                   '<td align="center"><input type="text" '.
-                   'name="addedvalues_0" size="15" /></td></tr>';
-        for (my $j=1; $j<=$env{'form.numaddedfields'}; $j++) {
+                   &mt('Field Value(s)').'</td></tr>';
+
+        for (my $j=0; $j<$curnumadd; $j++) {
             my $num = $j+1;
             $scrout .= '<tr><td>'.&mt('Custom metadata [_1]: ',$num).
                        '</td><td align="center">'.
                        '<input type="text" name="addedfield_'.$j.
-                       '" size="10" /></td>'.
+                       '" size="10" value="'.$env{'form.addedfield_'.$j}.
+                       '" /></td>'.
                        '<td align="center"><input type="text" '.
-                       'name="addedvalues_'.$j.'" size="15" /></td></tr>';
+                       'name="addedvalues_'.$j.'" size="15" value="'.
+                       $env{'form.addedvalues_'.$j}.'" /></td></tr>';
         }
-        my $numadded = 1 + $env{'form.numaddedfields'};
-        $scrout .= '<tr><td colspan="3">&nbsp;</td></tr>'.
-                   '<tr><td align="left" colspan="3">'.
-                   '<input type="button" name="newfield" '.
-                   'value="Additional custom field/value" '.
-                   'onclick="javascript:additional_metadata()" />'.
-                   '<input type="hidden" name="numaddedfelds" value="'.
-                   $numadded.'" /></td></tr></table>';
+        $scrout .= '<tr><td align="left" colspan="3"><label>'.
+                   '<input type="checkbox" name="newfield" '.
+                   'value="1" onclick="javascript:additional_metadata()" />'.
+                   &mt('Another custom field/value pair?').'</label>'.
+                   '<input type="hidden" name="numaddedfields" value="'.
+                   $curnumadd.'" /></td></tr></table>';
     } else {
         #
         # Dynamic metadata
@@ -961,7 +990,7 @@ ENDHEADER
                description=>'Network-wide number of accesses (hits)',},
              { name=>'stdno',
                description=>
-               'Total number of students who have worked on this problem',},
+               'Statistics calculated for number of students',},
              { name => 'avetries',
                description=>'Average number of tries till solved',},
              { name => 'difficulty',
@@ -1366,7 +1395,7 @@ sub parse_advanced_search {
 		   'lastrevisiondatestart_month','lastrevisiondatestart_day',
 		   'lastrevisiondatestart_year','lastrevisiondateend_month',
 		   'lastrevisiondateend_day','lastrevisiondateend_year') {
-	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g;
+	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.]//g;
     }
     foreach ('mode','form','element') {
 	# is this required?  Hmmm.
@@ -1399,6 +1428,17 @@ sub parse_advanced_search {
             $fillflag++;
         }
     }
+    if ($env{'form.area'} eq 'portfolio') {
+        # Added metadata fields
+        for (my $i=0; $i<$env{'form.numaddedfields'} ; $i++) {
+            my $field = $env{'form.addedfield_'.$i};
+            $field =~ s/^\s*(\S*)\s*$/$1/;
+            $field =~ s/\W/_/g;
+            if ($field ne '') {
+                $fillflag++;
+            }
+        }
+    }
     if (! $fillflag) {
 	&output_blank_field_error($r,$closebutton,
                                   'phase=disp_adv',$hidden_fields);
@@ -1489,9 +1529,25 @@ sub parse_advanced_search {
         #
         # Added metadata fields
         for (my $i=0; $i<$env{'form.numaddedfields'} ; $i++) {
-            if (($env{'form.addedfield_'.$i} ne '') && 
-                ($env{'form.addedvalue_'.$i} ne '')) {
-                my $stuff = 1; #FIXME 
+            my $field = $env{'form.addedfield_'.$i};
+            $field =~ s/^\s*(\S*)\s*$/$1/;
+            $field =~ s/\W/_/g;
+            $field =~ tr/A-Z/a-z/; 
+            if ($field ne '') {
+                my $value = $env{'form.addedvalues_'.$i};
+                if ($value ne '') {
+                    $value =~ s/'/''/g; #' stupid emacs
+                    my ($error,$query) = 
+                        &process_phrase_input($value,0,'pf.value');
+                    if (!defined($error)) {
+                        push(@queries,"pf.field = '$field' AND $query");
+                        $pretty_search_string .=
+                            $font.$field.'</font>: '.
+                            $env{'form.addedvalues_'.$i}.'<br />';
+                    }
+                } else {
+                    push(@queries,"pf.field = '$field' AND pf.value IS NULL");
+                }
             }
         }
     } else {
@@ -1583,7 +1639,11 @@ sub parse_advanced_search {
     }
     #
     if (@queries) {
-	$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
+        if ($env{'form.area'} eq 'portfolio') {
+            $query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND (".join(') AND (',@queries).'))';
+        } else {
+	    $query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
+        }
     } elsif ($customquery) {
         $query = '';
     }
@@ -1617,11 +1677,9 @@ sub parse_domain_restrictions {
         foreach (sort @allowed_domains) {
             $pretty_domains_string .= "<b>".$_."</b> ";
         }
-        foreach (keys(%Apache::lonnet::libserv)) {
-            if (exists($domain_hash{$Apache::lonnet::hostdom{$_}})) {
-                push @$libraries_to_query,$_;
-            }
-        }
+	my %servers = &Apache::lonnet::get_servers(\@allowed_domains,
+						   'library');
+	$libraries_to_query = [keys(%servers)];
     }
     return ($libraries_to_query,
             $pretty_domains_string);
@@ -1800,7 +1858,7 @@ sub process_phrase_input {
             $item[1];
         }
     term:
-        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ {
+        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ {
             $item[1];
         }
 ENDGRAMMAR
@@ -2456,7 +2514,8 @@ END
             @Servers_to_contact = ($serverlist);
         }
     } else {
-        @Servers_to_contact = sort(keys(%Apache::lonnet::libserv));
+	my %all_library_servers = &Apache::lonnet::all_library();
+        @Servers_to_contact = sort(keys(%all_library_servers));
     }
     my %Server_status;
     #