--- loncom/interface/lonsearchcat.pm	2004/05/05 14:14:10	1.222
+++ loncom/interface/lonsearchcat.pm	2004/05/10 13:06:29	1.226
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.222 2004/05/05 14:14:10 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.226 2004/05/10 13:06:29 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -231,24 +231,19 @@ END
     $hidden_fields = '<input type="hidden" name="persistent_db_id" value="'.
         $ENV{'form.persistent_db_id'}.'" />'."\n";
     if (exists($ENV{'form.catalogmode'})) {
-        $hidden_fields .= '<input type="hidden" name="catalogmode" value="'.
-                $ENV{'form.catalogmode'}.'" />'."\n";
+        $hidden_fields .= &hidden_field('catalogmode');
     }
     if (exists($ENV{'form.form'})) {
-        $hidden_fields .= '<input type="hidden" name="form" value="'.
-                $ENV{'form.form'}.'" />'."\n";
+        $hidden_fields .= &hidden_field('form');
     }
     if (exists($ENV{'form.element'})) {
-        $hidden_fields .= '<input type="hidden" name="element" value="'.
-                $ENV{'form.element'}.'" />'."\n";
+        $hidden_fields .= &hidden_field('element');
     }
     if (exists($ENV{'form.titleelement'})) {
-        $hidden_fields .= '<input type="hidden" name="titleelement" value="'.
-                $ENV{'form.titleelement'}.'" />'."\n";
+        $hidden_fields .= &hidden_field('titleelement');
     }
     if (exists($ENV{'form.mode'})) {
-        $hidden_fields .= '<input type="hidden" name="mode" value="'.
-                $ENV{'form.mode'}.'" />'."\n";
+        $hidden_fields .= &hidden_field('mode');
     }
     ##
     ## Configure dynamic components of interface
@@ -422,6 +417,14 @@ sub clean_up_environment {
     }
 }
 
+sub hidden_field {
+    my ($name,$value) = @_;
+    if (! defined($value)) {
+        $value = $ENV{'form.'.$name};
+    }
+    return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'.$/;
+}
+
 ######################################################################
 ######################################################################
 ##
@@ -616,7 +619,8 @@ sub print_basic_search_form {
             '<font size="-1">'.
             '<input type="submit" name="basicsubmit" '.
             'value="'.&mt('Search').'" />'.
-            ('&nbsp;'x2).$closebutton.('&nbsp;'x2).&viewoptions().
+            ('&nbsp;'x2).$closebutton.('&nbsp;'x2).
+            &viewoptions().
             '</font>'.
             '</td></tr>'.$/;
         $scrout .= '</table>'.$/.'</center>'.'</form>';
@@ -959,7 +963,7 @@ Outputs: text for box with view options
 ######################################################################
 ######################################################################
 sub viewoptions {
-    my $scrout="\n".'<nobr>';
+    my $scrout;
     if (! defined($ENV{'form.viewselect'})) { 
         $ENV{'form.viewselect'}='detailed'; 
     }
@@ -1244,8 +1248,8 @@ sub parse_advanced_search {
     my $font = '<font color="#800000" face="helvetica">';
     # Evaluate logical expression AND/OR/NOT phrase fields.
     foreach my $field (@BasicFields) {
-	if ($ENV{'form.'.$field}) {
-            my $searchphrase = $ENV{'form.'.$field};
+	next if (!defined($ENV{'form.'.$field}) || $ENV{'form.'.$field} eq '');
+        foreach my $searchphrase(&process_phrase_input($ENV{'form.'.$field})){
             $pretty_search_string .= $font."$field</font> contains <b>".
                 $searchphrase."</b>";
             if ($ENV{'form.'.$field.'_related'}) {
@@ -1259,7 +1263,7 @@ sub parse_advanced_search {
                 }
             }
             $pretty_search_string .= "<br />\n";
-	    push @queries,&build_SQL_query($field,$searchphrase);
+            push @queries,&build_SQL_query($field,$searchphrase);
         }
     }
     #
@@ -1396,7 +1400,7 @@ sub parse_advanced_search {
     $pretty_search_string .= $pretty_domains_string."<br />\n";
     #
     if (@queries) {
-	$query="select * from metadata where ".join(" AND ",@queries);
+	$query="SELECT * FROM metadata WHERE ".join(" AND ",@queries);
     } elsif ($customquery) {
         $query = '';
     }
@@ -1480,34 +1484,74 @@ sub parse_basic_search {
 	&output_blank_field_error($r,$closebutton,'phase=disp_basic');
 	return OK;
     }
-    my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>';
-    if ($ENV{'form.related'}) {
-        my @New_Words;
-        ($search_string,@New_Words) = &related_version($ENV{'form.basicexp'});
-        if (@New_Words) {
-            $pretty_search_string .= " with related words: <b>@New_Words</b>.";
+    my $pretty_search_string='';
+    my @Queries;
+    my $concatarg=join(',',
+                       ('title', 'author', 'subject', 'notes', 'abstract',
+                        'keywords'));
+    foreach my $search (&process_phrase_input($search_string)){
+        if ($ENV{'form.related'}) {
+            $pretty_search_string .= ' and <br />' if ($pretty_search_string ne '');
+            $pretty_search_string .= '<b>'.$search.'</b>';
+            my @New_Words;
+            ($search,@New_Words) = &related_version($search);
+            next if (! $search);
+            if (@New_Words) {
+                $pretty_search_string .= 
+                    " with related words: <b>@New_Words</b>";
+            }
         } else {
-            $pretty_search_string .= " with no related words.";
+            $pretty_search_string .= ' and ' if ($pretty_search_string ne '');
+            $pretty_search_string .= '<b>'.$search.'</b>';
         }
+        #
+        # Build SQL query string based on form page
+        push(@Queries,
+             &build_SQL_query('concat_ws(" ",'.$concatarg.')',$search));
     }
+    my $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
     #
-    # Build SQL query string based on form page
-    my $query='';
-    my $concatarg=join(',',
-		       ('title', 'author', 'subject', 'notes', 'abstract',
-                        'keywords'));
-    $concatarg='title' if $ENV{'form.titleonly'};
-    $query=&build_SQL_query('concat_ws(" ",'.$concatarg.')',$search_string);
     if (defined($pretty_domains_string) && $pretty_domains_string ne '') {
         $pretty_search_string .= ' '.$pretty_domains_string;
     }
     $pretty_search_string .= "<br />\n";
-    my $final_query = 'SELECT * FROM metadata WHERE '.$query;
-    # &Apache::lonnet::logthis($final_query);
+    $pretty_search_string =~ s:^<br /> and ::;
+#    &Apache::lonnet::logthis($final_query);
     return ($final_query,$pretty_search_string,
             $libraries_to_query);
 }
 
+sub process_phrase_input {
+    my ($phrase)=@_;
+    my @Phrases;
+    # &Apache::lonnet::logthis('phrase = :'.$phrase.':');
+    my $in_quotes = 0;
+    my @Words = split(/\s+/,$phrase);
+    foreach my $word (@Words) {
+        $word =~ s/(\w+)\"(\w+)/$1$2/g;
+        if ($in_quotes) {
+            if ($word =~ s/(\")$//) {
+                $in_quotes = 0;
+            }
+            if ($Phrases[-1] ne '') {
+                $Phrases[-1] .= ' ';
+            }
+            $Phrases[-1] .= $word;
+        } else {
+            if ($word =~ s/^(\")//) {
+                $in_quotes=1;
+            }
+            push(@Phrases,$word);
+        }
+    }
+    #
+    #foreach my $p (@Phrases) {
+    #    &Apache::lonnet::logthis('    subphrase = '.$p);
+    #}
+    #
+    return @Phrases;
+}
+
 ######################################################################
 ######################################################################
 
@@ -1526,19 +1570,13 @@ Note: Using this twice on a string is pr
 ######################################################################
 ######################################################################
 sub related_version {
-    my $search_string = shift;
-    my $result = $search_string;
-    my %New_Words = ();
-    while ($search_string =~ /(\w+)/cg) {
-        my $word = $1;
-        next if (lc($word) =~ /\b(or|and|not)\b/);
-        my @Words = &Apache::loncommon::get_related_words($word);
-        @Words = ($#Words>4? @Words[0..4] : @Words);
-        foreach (@Words) { $New_Words{$_}++;}
-        my $replacement = join " OR ", ($word,@Words);
-        $result =~ s/(\b)$word(\b)/$1($replacement)$2/g;
-    }
-    return $result,sort(keys(%New_Words));
+    my ($word) = @_;
+    return (undef) if (lc($word) =~ /\b(or|and|not)\b/);
+    my @Words = &Apache::loncommon::get_related_words($word);
+    # Only use 4 related words
+    @Words = ($#Words>4? @Words[0..4] : @Words);
+    my $result = join " OR ", ($word,@Words);
+    return $result,sort(@Words);
 }
 
 ######################################################################
@@ -1832,7 +1870,11 @@ a link to change the search query.
 ######################################################################
 sub print_sort_form {
     my ($r,$pretty_query_string) = @_;
-    my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+    my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1).
+        &Apache::lonhtmlcommon::breadcrumbs
+        (undef,'Searching','Searching',undef,undef,
+         ! ($ENV{'form.catalogmode'} eq 'groupsearch'));
+
     ##
     my %SortableFields=&Apache::lonlocal::texthash( 
          id        => 'Default',
@@ -2098,6 +2140,10 @@ results into MySQL.
 sub run_search {
     my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;
     my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+    $bodytag.=
+        &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Searching',
+                                            undef,undef,! $ENV{'form.launch'});
+
     my $connection = $r->connection;
     #
     # Print run_search header
@@ -2281,13 +2327,13 @@ END
     # results to get, so let the client know the top frame needs to be
     # loaded from /adm/searchcat
     $r->print("</body></html>");
-    if ($ENV{'form.catalogmode'} ne 'groupsearch') {
+#    if ($ENV{'form.catalogmode'} ne 'groupsearch') {
         $r->print("<script>".
                       "window.location='/adm/searchcat?".
                       "phase=sort&".
                       "persistent_db_id=$ENV{'form.persistent_db_id'}';".
                   "</script>");
-    }
+#    }
     return;
 }
 
@@ -2308,32 +2354,16 @@ sub prev_next_buttons {
     my ($current_min,$show,$total,$parms) = @_;
     return '' if ($show eq 'all'); # No links if you get them all at once.
     #
-    # Create links
-    my $prev_min = $current_min - $show;
-    $prev_min = 1 if $prev_min < 1;
-    my $prevlink = 
-        qq{<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">};
-    #
-    my $next_min = $current_min + $show;
-    $next_min = $current_min if ($next_min > $total);
-    my $nextlink =
-        qq{<a href="/adm/searchcat?$parms&start=$next_min&show=$show">};
-    my $reloadlink = 
-        qq{<a href="/adm/searchcat?$parms&start=$current_min&$show=$show">};
-    #
-    # Determine which parameters to pass
-    my $String = '[_1]prev[_2] &nbsp; [_3]reload[_4] &nbsp; [_5]next[_6]';
-    if ($prev_min == $current_min) {
-        $String =~ s:\[_[12]\]::g;
-    }
-    if ($next_min == $current_min) {
-        $String =~ s:\[_[56]\]::g;
-    }
-    my $links = &mt($String,
-                    $prevlink,  '</a>',
-                    $reloadlink,'</a>',
-                    $nextlink,  '</a>');
-    return $links;
+    # Create buttons
+    my $buttons = '<input type="submit" name="prev" value="'.&mt('Prev').'" ';
+    $buttons .= '/>';
+    $buttons .= '&nbsp;'x3;
+    $buttons .= '<input type="submit" name="reload" '.
+        'value="'.&mt('Reload').'" />';
+    $buttons .= '&nbsp;'x3;
+    $buttons .= '<input type="submit" name="next" value="'.&mt('Next').'" ';
+    $buttons .= '/>';
+    return $buttons;
 }
 
 ######################################################################
@@ -2396,8 +2426,15 @@ sub display_results {
     }
     ##
     ## Determine how many results we need to get
-    $ENV{'form.start'} = 1      if (! exists($ENV{'form.start'}));
-    $ENV{'form.show'}  = 'all'  if (! exists($ENV{'form.show'}));
+    $ENV{'form.start'} = 1  if (! exists($ENV{'form.start'}));
+    $ENV{'form.show'}  = 20 if (! exists($ENV{'form.show'}));
+    if (exists($ENV{'form.prev'})) {
+        $ENV{'form.start'} -= $ENV{'form.show'};
+    } elsif (exists($ENV{'form.next'})) {
+        $ENV{'form.start'} += $ENV{'form.show'};
+    }
+    $ENV{'form.start'} = 1 if ($ENV{'form.start'}<1);
+    $ENV{'form.start'} = $total_results if ($ENV{'form.start'}>$total_results);
     my $min = $ENV{'form.start'};
     my $max;
     if ($ENV{'form.show'} eq 'all') {
@@ -2407,14 +2444,19 @@ sub display_results {
         $max = $total_results if ($max > $total_results);
     }
     ##
+    ## Output form elements
+    $r->print(&hidden_field('table').
+              &hidden_field('phase').
+              &hidden_field('persistent_db_id').
+              &hidden_field('start')
+              );
+    ##
     ## Output links (if necessary) for 'prev' and 'next' pages.
     $r->print
-        ('<center>'.
-         &prev_next_buttons($min,$ENV{'form.show'},$total_results,
-                            "table=".$ENV{'form.table'}.
-                            "&phase=results".
-                            "&persistent_db_id=".$ENV{'form.persistent_db_id'})
-         ."</center>\n"
+        ('<table width="100%"><tr><td width="50%" align="right">'.
+         &prev_next_buttons($min,$ENV{'form.show'},$total_results).
+         '</td><td align="right">'.
+         &viewoptions().'</td></tr></table>'
          );
     if ($total_results == 0) {
         $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2">'.
@@ -2753,7 +2795,7 @@ SCRIPT
     $result.=<<END;
 </head>
 $bodytag
-<form name="results" method="post" action="" >
+<form name="results" method="post" action="/adm/searchcat" >
 <input type="hidden" name="Queue" value="" />
 $importbutton
 END
@@ -2811,6 +2853,41 @@ ENDFRAMES
 ######################################################################
 ######################################################################
 
+sub has_stat_data {
+    my ($values) = @_;
+    if ( (defined($values->{'count'})      && $values->{'count'}      ne '') ||
+         (defined($values->{'stdno'})      && $values->{'stdno'}      ne '') ||
+         (defined($values->{'disc'})       && $values->{'disc'}       ne '') ||
+         (defined($values->{'avetries'})   && $values->{'avetries'}   ne '') ||
+         (defined($values->{'difficulty'}) && $values->{'difficulty'} ne '')) {
+        return 1;
+    }
+    return 0;
+}
+
+sub statfields {
+    return ('count','stdno','disc','avetries','difficulty');
+}
+
+sub has_eval_data {
+    my ($values) = @_;
+    if ( (defined($values->{'clear'})     && $values->{'clear'}     ne '') ||
+         (defined($values->{'technical'}) && $values->{'technical'} ne '') ||
+         (defined($values->{'correct'})   && $values->{'correct'}   ne '') ||
+         (defined($values->{'helpful'})   && $values->{'helpful'}   ne '') ||
+         (defined($values->{'depth'})     && $values->{'depth'}     ne '')) {
+        return 1;
+    }
+    return 0;
+}
+
+sub evalfields { 
+    return ('clear','technical','correct','helpful','depth');
+}
+
+######################################################################
+######################################################################
+
 =pod 
 
 =item Metadata Viewing Functions
@@ -2832,10 +2909,9 @@ extra custom metadata to show.
 ######################################################################
 sub detailed_citation_view {
     my ($prefix,%values) = @_;
-    my $icon=
     my $result;
     $result .= '<b>'.$prefix.
-        '<img src="'.&Apache::loncommon::icon($values{'url'}).' " />'.
+        '<img src="'.&Apache::loncommon::icon($values{'url'}).' " />'.'&nbsp;'.
         '<a href="http://'.$ENV{'HTTP_HOST'}.$values{'url'}.'" '.
         'target="search_preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
@@ -2843,6 +2919,9 @@ sub detailed_citation_view {
         ' <i>'.$values{'owner'}.'</i><br />';
     foreach my $field 
         (
+         { name=>'url',
+           translate => '<b>URL:</b>&nbsp;[_1]',
+           special => 'url link',},
          { name=>'subject',
            translate => '<b>Subject:</b>&nbsp;[_1]',},
          { name=>'keywords',
@@ -2855,67 +2934,84 @@ sub detailed_citation_view {
            translate => '<b>Standards:</b>[_1]',},
          { name=>'copyrighttag',
            translate => '<b>Copyright/Distribution:</b>&nbsp;[_1]',},
+         { name=>'count',
+           format => "%d",
+           translate => '<b>Access Count:</b>&nbsp;[_1]',},
          { name=>'stdno',
+           format => "%d",
            translate => '<b>Number of Students:</b>&nbsp;[_1]',},
          { name=>'avetries',
+           format => "%.2f",
            translate => '<b>Average Tries:</b>&nbsp;[_1]',},
          { name=>'disc',
+           format => "%.2f",
            translate => '<b>Degree of Discrimination:</b>&nbsp;[_1]',},
          { name=>'difficulty',
+           format => "%.2f",
            translate => '<b>Degree of Difficulty:</b>&nbsp;[_1]',},
          { name=>'clear',
+           format => "%.2f",
            translate => '<b>Clear:</b>&nbsp;[_1]',},
          { name=>'depth',
+           format => "%.2f",
            translate => '<b>Depth:</b>&nbsp;[_1]',},
          { name=>'helpful',
+           format => "%.2f",
            translate => '<b>Helpful:</b>&nbsp;[_1]',},
          { name=>'correct',
-           translate => '<b>Correcy:</b>&nbsp;[_1]',},
+           format => "%.2f",
+           translate => '<b>Correct:</b>&nbsp;[_1]',},
          { name=>'technical',
+           format => "%.2f",
            translate => '<b>Technical:</b>&nbsp;[_1]',},
+         { name=>'comefrom_list',
+           type => 'list',
+           translate => 'Resources that lead up to this resource in maps',},
+         { name=>'goto_list',
+           type => 'list',
+           translate => 'Resources that follow this resource in maps',},
+         { name=>'sequsage_list',
+           type => 'list',
+           translate => 'Resources using or importing resource',},
          ) {
-        $result.= &mt($field->{'translate'},$values{$field->{'name'}}).
-            "<br />\n";
+        next if (! exists($values{$field->{'name'}}) ||
+                 $values{$field->{'name'}} eq '');
+        if (exists($field->{'type'}) && $field->{'type'} eq 'list') {
+            $result .= '<b>'.&mt($field->{'translate'}).'</b><ul>';
+            foreach my $item (split(',',$values{$field->{'name'}})){
+                $result .= '<li>'.
+                    '<a target="search_preview" '.
+                    'href="/res/'.$item.'">'.$item.'</a></li>';
+            }
+            $result .= '</ul>';
+        } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
+            $result.= &mt($field->{'translate'},
+                          sprintf($field->{'format'},
+                                  $values{$field->{'name'}})).'<br />'."\n";
+        } else {
+            if ($field->{'special'} eq 'url link') {
+                $result.= 
+                     &mt($field->{'translate'},
+                         '<a href="'.$values{'url'}.'" '.
+                         'target="search_preview">'.
+                         $values{$field->{'name'}}.
+                         '</a>');
+            } else {
+                $result.= &mt($field->{'translate'},
+                              $values{$field->{'name'}});
+            }
+            $result .= "<br />\n";
+        }
     }
-    $result .= "</p>".$values{'extrashow'}.
-        '<p>'.$values{'shortabstract'}.'</p>';
-    $result .= '<hr align="left" width="200" noshade />'."\n";
-    return $result;
-}
-
-######################################################################
-######################################################################
-
-sub has_stat_data {
-    my ($values) = @_;
-    if ( (defined($values->{'count'})      && $values->{'count'}      ne '') ||
-         (defined($values->{'stdno'})      && $values->{'stdno'}      ne '') ||
-         (defined($values->{'disc'})       && $values->{'disc'}       ne '') ||
-         (defined($values->{'avetries'})   && $values->{'avetries'}   ne '') ||
-         (defined($values->{'difficulty'}) && $values->{'difficulty'} ne '')) {
-        return 1;
+    $result .= "</p>";
+    if (exists($values{'extrashow'}) && $values{'extrashow'} ne '') {
+        $result .= '<p>'.$values{'extrashow'}.'</p>';
     }
-    return 0;
-}
-
-sub statfields {
-    return ('count','stdno','disc','avetries','difficulty');
-}
-
-sub has_eval_data {
-    my ($values) = @_;
-    if ( (defined($values->{'clear'})     && $values->{'clear'}     ne '') ||
-         (defined($values->{'technical'}) && $values->{'technical'} ne '') ||
-         (defined($values->{'correct'})   && $values->{'correct'}   ne '') ||
-         (defined($values->{'helpful'})   && $values->{'helpful'}   ne '') ||
-         (defined($values->{'depth'})     && $values->{'depth'}     ne '')) {
-        return 1;
+    if (exists($values{'shortabstract'}) && $values{'shortabstract'} ne '') {
+        $result .= '<p>'.$values{'shortabstract'}.'</p>';
     }
-    return 0;
-}
-
-sub evalfields { 
-    return ('clear','technical','correct','helpful','depth');
+    $result .= '<hr align="left" width="200" noshade />'."\n";
+    return $result;
 }
 
 ######################################################################
@@ -2932,7 +3028,8 @@ sub summary_view {
     my ($prefix,%values) = @_;
     my $icon=&Apache::loncommon::icon($values{'url'});
     my $result=<<END;
-$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
+$prefix<img src="$icon" />&nbsp;
+<a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
    target='search_preview'>$values{'author'}</a><br />
 $values{'title'}<br />
 $values{'owner'} -- $values{'lastrevisiondate'}<br />
@@ -2957,12 +3054,11 @@ END
 ######################################################################
 sub compact_view {
     my ($prefix,%values) = @_;
-    my $icon=&Apache::loncommon::icon($values{'url'});
-    my $result=<<END;
-$prefix <img src="$icon" /> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"  target='search_preview'>
-$values{'title'}</a>
-<b>$values{'author'}</b><br />
-END
+    my $result = 
+        $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).
+        '">&nbsp;<a href="'.$values{'url'}.'" target="search_preview">'.
+        $values{'title'}.'</a>'.('&nbsp;'x2).
+        '<b>'.$values{'author'}.'</b><br />';
     return $result;
 }