--- loncom/interface/lonsearchcat.pm	2004/04/27 15:24:09	1.217
+++ loncom/interface/lonsearchcat.pm	2004/05/03 19:24:14	1.220
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.217 2004/04/27 15:24:09 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.220 2004/05/03 19:24:14 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -286,7 +286,7 @@ END
     $ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'}));
     $ENV{'form.show'} = 20 if (! exists($ENV{'form.show'}));
     #
-    $ENV{'form.searchmode'} = 'basic';
+    $ENV{'form.searchmode'} = 'basic' if (! exists($ENV{'form.searchmode'}));
     if ($ENV{'form.phase'} eq 'adv_search' ||
         $ENV{'form.phase'} eq 'disp_adv') {
         $ENV{'form.searchmode'} = 'advanced';
@@ -1150,7 +1150,6 @@ sub parse_advanced_search {
                        'modifyinguser','standards','mime');
     my @StatsFields = ('stdno','avetries','difficulty','disc');
     my @EvalFields = ('clear','depth','helpful','correct','technical');
-    my @ContextFields = ('courses','dependencies');
     my $fillflag=0;
     my $pretty_search_string = "<br />\n";
     # Clean up fields for safety
@@ -1162,6 +1161,7 @@ sub parse_advanced_search {
 		   'lastrevisiondatestart_year','lastrevisiondateend_month',
 		   'lastrevisiondateend_day','lastrevisiondateend_year') {
 	$ENV{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g;
+        $ENV{'form.'.$field}=~s/(not\s*$|^\s*(and|or)|)//gi;
     }
     foreach ('mode','form','element') {
 	# is this required?  Hmmm.
@@ -1426,12 +1426,13 @@ sub parse_basic_search {
         &parse_domain_restrictions();
     #
     # Check to see if enough of a query is filled in
-    unless (&filled($ENV{'form.basicexp'})) {
+    my $search_string = $ENV{'form.basicexp'};
+    $search_string =~ s/(not\s*$|^\s*(and|or)|)//gi;
+    if (! &filled($search_string)) {
 	&output_blank_field_error($r,$closebutton,'phase=disp_basic');
 	return OK;
     }
     my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>';
-    my $search_string = $ENV{'form.basicexp'};
     if ($ENV{'form.related'}) {
         my @New_Words;
         ($search_string,@New_Words) = &related_version($ENV{'form.basicexp'});
@@ -2783,26 +2784,54 @@ extra custom metadata to show.
 ######################################################################
 sub detailed_citation_view {
     my ($prefix,%values) = @_;
-    my $icon=&Apache::loncommon::icon($values{'url'});
-    my $result=<<END;
-<b>$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
-    target='search_preview'>$values{'title'}</a></b>
-<p>
-<b>$values{'author'}</b>, <i>$values{'owner'}</i><br />
-
-<b>Subject:       </b> $values{'subject'}<br />
-<b>Keyword(s):    </b> $values{'keywords'}<br />
-<b>Notes:         </b> $values{'notes'}<br />
-<b>MIME Type:     </b> $values{'mimetag'}<br />
-<b>Language:      </b> $values{'language'}<br />
-<b>Copyright/Distribution:</b> $values{'copyrighttag'}<br />
-</p>
-$values{'extrashow'}
-<p>
-$values{'shortabstract'}
-</p>
-<hr align='left' width='200' noshade />
-END
+    my $icon=
+    my $result;
+    $result .= '<b>'.$prefix.
+        '<img src="'.&Apache::loncommon::icon($values{'url'}).' " />'.
+        '<a href="http://'.$ENV{'HTTP_HOST'}.$values{'url'}.'" '.
+        'target="search_preview">'.$values{'title'}."</a></b>\n";
+    $result .= "<p>\n";
+    $result .= '<b>'.$values{'author'}.'</b>,'.
+        ' <i>'.$values{'owner'}.'</i><br />';
+    foreach my $field 
+        (
+         { name=>'subject',
+           translate => '<b>Subject:</b>&nbsp;[_1]',},
+         { name=>'keywords',
+           translate => '<b>Keywords:</b>&nbsp;[_1]',},
+         { name=>'notes',
+           translate => '<b>Notes:</b>&nbsp;[_1]',},
+         { name=>'mimetag',
+           translate => '<b>MIME Type:</b>&nbsp;[_1]',},
+         { name=>'standards',
+           translate => '<b>Standards:</b>[_1]',},
+         { name=>'copyrighttag',
+           translate => '<b>Copyright/Distribution:</b>&nbsp;[_1]',},
+         { name=>'stdno',
+           translate => '<b>Number of Students:</b>&nbsp;[_1]',},
+         { name=>'avetries',
+           translate => '<b>Average Tries:</b>&nbsp;[_1]',},
+         { name=>'disc',
+           translate => '<b>Degree of Discrimination:</b>&nbsp;[_1]',},
+         { name=>'difficulty',
+           translate => '<b>Degree of Difficulty:</b>&nbsp;[_1]',},
+         { name=>'clear',
+           translate => '<b>Clear:</b>&nbsp;[_1]',},
+         { name=>'depth',
+           translate => '<b>Depth:</b>&nbsp;[_1]',},
+         { name=>'helpful',
+           translate => '<b>Helpful:</b>&nbsp;[_1]',},
+         { name=>'correct',
+           translate => '<b>Correcy:</b>&nbsp;[_1]',},
+         { name=>'technical',
+           translate => '<b>Technical:</b>&nbsp;[_1]',},
+         ) {
+        $result.= &mt($field->{'translate'},$values{$field->{'name'}}).
+            "<br />\n";
+    }
+    $result .= "</p>".$values{'extrashow'}.
+        '<p>'.$values{'shortabstract'}.'</p>';
+    $result .= '<hr align="left" width="200" noshade />'."\n";
     return $result;
 }