loncom/interface/lonsearchcat.pm - diff

Return to lonsearchcat.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsearchcat.pm between versions 1.200 and 1.250

-version 1.200, 2004/01/01 20:13:17
+version 1.250, 2005/12/29 19:45:19
  Line 48  described at http://www.lon-capa.org.
  lonsearchcat presents the user with an interface to search the LON-CAPA
  digital library.  lonsearchcat also initiates the execution of a search
  by sending the search parameters to LON-CAPA servers.  The progress of
- search (on a server basis) is displayed to the user in a seperate window.
+ search (on a server basis) is displayed to the user in a separate window.
  =head1 Internals
  Line 63  package Apache::lonsearchcat;
  use strict;
  use Apache::Constants qw(:common :http);
- use Apache::lonnet();
+ use Apache::lonnet;
  use Apache::File();
  use CGI qw(:standard);
  use Text::Query;
  Line 73  use Apache::lonmysql();
  use Apache::lonmeta;
  use Apache::lonhtmlcommon;
  use Apache::lonlocal;
+ use LONCAPA::lonmetadata();
+ use HTML::Entities();
+ use Parse::RecDescent;
+ use Apache::lonnavmaps;
  ######################################################################
  ######################################################################
- Line 115  sub handler {
+ Line 119  sub handler {
      my $loaderror=&Apache::lonnet::overloaderror($r);
      if ($loaderror) { return $loaderror; }
+     #
      my $closebutton;  # button that closes the search window
                        # This button is different for the RAT compared to
                        # normal invocation.
- Line 140  sub handler {
+ Line 144  sub handler {
      ##     printing the results.  We only need (theoretically) to do
      ##     this once, so the pause indicator is deleted
      ##
-     if (exists($ENV{'form.pause'})) {
+     if (exists($env{'form.pause'})) {
          sleep(1);
-         delete($ENV{'form.pause'});
+         delete($env{'form.pause'});
      }
      ##
      ## Initialize global variables
      ##
      my $domain  = $r->dir_config('lonDefDomain');
-     $diropendb= "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";
+     $diropendb= "/home/httpd/perl/tmp/".
+         "$env{'user.domain'}_$env{'user.name'}_searchcat.db";
      #
      # set the name of the persistent database
-     #          $ENV{'form.persistent_db_id'} can only have digits in it.
+     #          $env{'form.persistent_db_id'} can only have digits in it.
-     if (! exists($ENV{'form.persistent_db_id'}) ||
+     if (! exists($env{'form.persistent_db_id'}) ||
-         ($ENV{'form.persistent_db_id'} =~ /\D/) ||
+         ($env{'form.persistent_db_id'} =~ /\D/) ||
-         ($ENV{'form.launch'} eq '1')) {
+         ($env{'form.launch'} eq '1')) {
-         $ENV{'form.persistent_db_id'} = time;
+         $env{'form.persistent_db_id'} = time;
      }
      $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
      my $persistent_db_file = "/home/httpd/perl/tmp/".
          &Apache::lonnet::escape($domain).
-             '_'.&Apache::lonnet::escape($ENV{'user.name'}).
+             '_'.&Apache::lonnet::escape($env{'user.name'}).
-                 '_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db';
+                 '_'.$env{'form.persistent_db_id'}.'_persistent_search.db';
      ##
-     if (! &get_persistent_form_data($persistent_db_file)) {
+     &Apache::lonhtmlcommon::clear_breadcrumbs();
-         if ($ENV{'form.phase'} =~ /(run_search|results)/) {
+     if (exists($env{'request.course.id'}) && $env{'request.course.id'} ne '') {
-             &Apache::lonnet::logthis("lonsearchcat:Unable to recover data ".
+         &Apache::lonhtmlcommon::add_breadcrumb
-                                      "from $persistent_db_file");
+              ({href=>'/adm/searchcat?'.
-             $r->print(<<END);
+                    'catalogmode='.$env{'form.catalogmode'}.
- <html>
+                    '&launch='.$env{'form.launch'}.
- <head><title>LON-CAPA Search Error</title></head>
+                    '&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",
+               target=>'_top',
+               bug=>'Searching',});
+     }
+     #
+     if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) {
+         if (! &get_persistent_form_data($persistent_db_file)) {
+             if ($env{'form.phase'} =~ /(run_search|results)/) {
+                 &Apache::lonnet::logthis('lonsearchcat:'.
+                                          'Unable to recover data from '.
+                                          $persistent_db_file);
+ 		my $html=&Apache::lonxml::xmlbegin();
+ 		$r->print(<<END);
+ $html
+ <head>
+ <title>LON-CAPA Search Error</title></head>
  $bodytag
  We were unable to retrieve data describing your search.  This is a serious
  error and has been logged.  Please alert your LON-CAPA administrator.
  </body>
  </html>
  END
-             return OK;
+                 return OK;
+             }
          }
+     } else {
+         &clean_up_environment();
      }
      ##
      ## Clear out old values from groupsearch database
      ##
      untie %groupsearch_db if (tied(%groupsearch_db));
-     if (($ENV{'form.cleargroupsort'} eq '1') ||
+     if (($env{'form.cleargroupsort'} eq '1') ||
-         (($ENV{'form.launch'} eq '1') &&
+         (($env{'form.launch'} eq '1') &&
-          ($ENV{'form.catalogmode'} eq 'groupsearch'))) {
+          ($env{'form.catalogmode'} eq 'groupsearch'))) {
  	if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
  	    &start_fresh_session();
  	    untie %groupsearch_db;
-             delete($ENV{'form.cleargroupsort'});
+             delete($env{'form.cleargroupsort'});
  	} else {
              # This is a stupid error to give to the user.
              # It really tells them nothing.
- 	    $r->print('<html><head></head>'.$bodytag.
+ 	    my $html=&Apache::lonxml::xmlbegin();
+ 	    $r->print($html.'<head></head>'.$bodytag.
                        'Unable to tie hash to db file</body></html>');
  	    return OK;
  	}
- Line 202  END
+ Line 236  END
      ## Configure hidden fields
      ##
      $hidden_fields = '<input type="hidden" name="persistent_db_id" value="'.
-         $ENV{'form.persistent_db_id'}.'" />'."\n";
+         $env{'form.persistent_db_id'}.'" />'."\n";
-     if (exists($ENV{'form.catalogmode'})) {
+     if (exists($env{'form.catalogmode'})) {
-         $hidden_fields .= '<input type="hidden" name="catalogmode" value="'.
+         $hidden_fields .= &hidden_field('catalogmode');
-                 $ENV{'form.catalogmode'}.'" />'."\n";
+     }
-     }
+     if (exists($env{'form.form'})) {
-     if (exists($ENV{'form.form'})) {
+         $hidden_fields .= &hidden_field('form');
-         $hidden_fields .= '<input type="hidden" name="form" value="'.
+     }
-                 $ENV{'form.form'}.'" />'."\n";
+     if (exists($env{'form.element'})) {
-     }
+         $hidden_fields .= &hidden_field('element');
-     if (exists($ENV{'form.element'})) {
+     }
-         $hidden_fields .= '<input type="hidden" name="element" value="'.
+     if (exists($env{'form.titleelement'})) {
-                 $ENV{'form.element'}.'" />'."\n";
+         $hidden_fields .= &hidden_field('titleelement');
      }
-     if (exists($ENV{'form.titleelement'})) {
+     if (exists($env{'form.mode'})) {
-         $hidden_fields .= '<input type="hidden" name="titleelement" value="'.
+         $hidden_fields .= &hidden_field('mode');
-                 $ENV{'form.titleelement'}.'" />'."\n";
-     }
-     if (exists($ENV{'form.mode'})) {
-         $hidden_fields .= '<input type="hidden" name="mode" value="'.
-                 $ENV{'form.mode'}.'" />'."\n";
      }
      ##
      ## Configure dynamic components of interface
      ##
-     if ($ENV{'form.catalogmode'} eq 'interactive') {
+     if ($env{'form.catalogmode'} eq 'interactive') {
          $closebutton="<input type='button' name='close' value='CLOSE' ";
-         if ($ENV{'form.phase'} =~ /(results|run_search)/) {
+         if ($env{'form.phase'} =~ /(results|run_search)/) {
  	    $closebutton .="onClick='parent.close()'";
          } else {
              $closebutton .="onClick='self.close()'";
          }
          $closebutton .=">\n";
-     } elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
+     } elsif ($env{'form.catalogmode'} eq 'groupsearch') {
          $closebutton="<input type='button' name='close' value='CLOSE' ";
-         if ($ENV{'form.phase'} =~ /(results|run_search)/) {
+         if ($env{'form.phase'} =~ /(results|run_search)/) {
  	    $closebutton .="onClick='parent.close()'";
          } else {
              $closebutton .="onClick='self.close()'";
- Line 253  END
+ Line 282  END
      ##
      ## Sanity checks on form elements
      ##
-     if (!defined($ENV{'form.viewselect'})) {
+     if (!defined($env{'form.viewselect'})) {
-         if (($ENV{'form.catalogmode'} eq 'groupsearch') ||
+ 	$env{'form.viewselect'} ="summary";
-             ($ENV{'form.catalogmode'} eq 'interactive')) {
+     }
-             $ENV{'form.viewselect'} ="Compact View";
+     $env{'form.phase'} = 'disp_basic' if (! exists($env{'form.phase'}));
-         } else {
+     $env{'form.show'} = 20 if (! exists($env{'form.show'}));
-             $ENV{'form.viewselect'} ="Detailed Citation View";
+     #
-         }
+     $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';
+     } elsif ($env{'form.phase'} eq 'course_search') {
+         $env{'form.searchmode'} = 'course_search';
+     }
+     #
+     if ($env{'form.searchmode'} eq 'advanced') {
+         &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",
+                   bug=>'Searching',});
+     } elsif ($env{'form.searchmode'} eq 'course search') {
+         &Apache::lonhtmlcommon::add_breadcrumb
+             ({href=>'/adm/searchcat?phase=disp_adv&'.
+                   'catalogmode='.$env{'form.catalogmode'}.
+                   '&launch='.$env{'form.launch'}.
+                   '&mode='.$env{'form.mode'},
+                   text=>"Course Search",
+                   bug=>'Searching',});
      }
-     $ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'}));
-     $ENV{'form.show'} = 20 if (! exists($ENV{'form.show'}));
      ##
      ## Switch on the phase
      ##
-     if ($ENV{'form.phase'} eq 'disp_basic') {
+     if ($env{'form.phase'} eq 'disp_basic') {
          &print_basic_search_form($r,$closebutton,$hidden_fields);
-     } elsif ($ENV{'form.phase'} eq 'disp_adv') {
+     } elsif ($env{'form.phase'} eq 'disp_adv') {
          &print_advanced_search_form($r,$closebutton,$hidden_fields);
-     } elsif ($ENV{'form.phase'} eq 'results') {
+     } elsif ($env{'form.phase'} eq 'results') {
          &display_results($r,$importbutton,$closebutton,$diropendb);
-     } elsif ($ENV{'form.phase'} =~ /^(sort|run_search)$/) {
+     } elsif ($env{'form.phase'} =~ /^(sort|run_search)$/) {
          my ($query,$customquery,$customshow,$libraries,$pretty_string) =
              &get_persistent_data($persistent_db_file,
                   ['query','customquery','customshow',
                    'libraries','pretty_string']);
-         if ($ENV{'form.phase'} eq 'sort') {
+         if ($env{'form.phase'} eq 'sort') {
              &print_sort_form($r,$pretty_string);
-         } elsif ($ENV{'form.phase'} eq 'run_search') {
+         } elsif ($env{'form.phase'} eq 'run_search') {
              &run_search($r,$query,$customquery,$customshow,
                          $libraries,$pretty_string);
          }
-     } elsif ($ENV{'form.phase'} eq 'course_search') {
+     } elsif ($env{'form.phase'} eq 'course_search') {
          &course_search($r);
-     } elsif(($ENV{'form.phase'} eq 'basic_search') ||
+     } elsif(($env{'form.phase'} eq 'basic_search') ||
-             ($ENV{'form.phase'} eq 'adv_search')) {
+             ($env{'form.phase'} eq 'adv_search')) {
-         $ENV{'form.searchmode'} = 'basic';
+         #
-         if ($ENV{'form.phase'} eq 'adv_search') {
+         # We are running a search, try to parse it
-             $ENV{'form.searchmode'} = 'advanced';
+         my ($query,$customquery,$customshow,$libraries) =
+             (undef,undef,undef,undef);
+         my $pretty_string;
+         if ($env{'form.phase'} eq 'basic_search') {
+             ($query,$pretty_string,$libraries) =
+                 &parse_basic_search($r,$closebutton,$hidden_fields);
+             return OK if (! defined($query));
+             &make_persistent({ basicexp => $env{'form.basicexp'}},
+                              $persistent_db_file);
+         } else {                      # Advanced search
+             ($query,$customquery,$customshow,$libraries,$pretty_string)
+                 = &parse_advanced_search($r,$closebutton,$hidden_fields);
+             return OK if (! defined($query));
          }
+         &make_persistent({ query => $query,
+                            customquery => $customquery,
+                            customshow => $customshow,
+                            libraries => $libraries,
+                            pretty_string => $pretty_string },
+                          $persistent_db_file);
+         #
          # Set up table
          if (! defined(&create_results_table())) {
  	    my $errorstring=&Apache::lonmysql::get_error();
+             &Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '.
+                                      'needed table.  lonmysql error:'.
+                                      $errorstring);
+ 	    my $html=&Apache::lonxml::xmlbegin();
              $r->print(<<END);
- <html><head><title>Search Error</title></head>
+ $html
+ <head>
+ <title>Search Error</title></head>
  $bodytag
  Unable to create table in which to store search results.
  The search has been aborted.
- <br />$errorstring
  </body>
  </html>
  END
              return OK;
          }
-         delete($ENV{'form.launch'});
+         delete($env{'form.launch'});
          if (! &make_form_data_persistent($r,$persistent_db_file)) {
-             $r->print(<<END);
+ 	    my $html=&Apache::lonxml::xmlbegin();
- <html><head><title>Search Error</title></head>
+ 	    $r->print(<<END);
+ $html
+ <head>
+ <title>Search Error</title></head>
  $bodytag
  Unable to properly store search information.  The search has been aborted.
  </body>
- Line 316  Unable to properly store search informat
+ Line 393  Unable to properly store search informat
  END
              return OK;
          }
-         #
-         # We are running a search
-         my ($query,$customquery,$customshow,$libraries) =
-             (undef,undef,undef,undef);
-         my $pretty_string;
-         if ($ENV{'form.phase'} eq 'basic_search') {
-             ($query,$pretty_string,$libraries) =
-                 &parse_basic_search($r,$closebutton,$hidden_fields);
-         } else {                      # Advanced search
-             ($query,$customquery,$customshow,$libraries,$pretty_string)
-                 = &parse_advanced_search($r,$closebutton,$hidden_fields);
-             return OK if (! defined($query));
-         }
-         &make_persistent({ query => $query,
-                            customquery => $customquery,
-                            customshow => $customshow,
-                            libraries => $libraries,
-                            pretty_string => $pretty_string },
-                          $persistent_db_file);
          ##
          ## Print out the frames interface
          ##
-         &print_frames_interface($r);
+         if (defined($query)) {
+             &print_frames_interface($r);
+         }
      }
      return OK;
  }
+ #
+ # The mechanism used to store values away and retrieve them does not
+ # handle the case of missing environment variables being significant.
+ #
+ # This routine sets non existant checkbox form elements to ''.
+ #
+ sub clean_up_environment {
+     if ($env{'form.phase'} eq 'basic_search') {
+         if (! exists($env{'form.related'})) {
+             $env{'form.related'} = '';
+         }
+         if (! exists($env{'form.domains'})) {
+             $env{'form.domains'} = '';
+         }
+     } elsif ($env{'form.phase'} eq 'adv_search') {
+         foreach my $field ('title','keywords','notes',
+                            'abstract','standards','mime') {
+             if (! exists($env{'form.'.$field.'_related'})) {
+                 $env{'form.'.$field.'_related'} = '';
+             }
+         }
+     } elsif ($env{'form.phase'} eq 'course_search') {
+         if (! exists($env{'form.crsrelated'})) {
+             $env{'form.crsrelated'} = '';
+         }
+     }
+ }
+ sub hidden_field {
+     my ($name,$value) = @_;
+     if (! defined($value)) {
+         $value = $env{'form.'.$name};
+     }
+     return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'.$/;
+ }
  ######################################################################
  ######################################################################
  ##
- Line 357  my %alreadyseen;
+ Line 453  my %alreadyseen;
  my %hash;
  my $totalfound;
+ sub make_symb {
+     my ($id)=@_;
+     my ($mapid,$resid)=split(/\./,$id);
+     my $map=$hash{'map_id_'.$mapid};
+     my $res=$hash{'src_'.$id};
+     my $symb=&Apache::lonnet::encode_symb($map,$resid,$res);
+     return $symb;
+ }
  sub course_search {
      my $r=shift;
      my $bodytag=&Apache::loncommon::bodytag('Course Search');
-     my $pretty_search_string = '<b>'.$ENV{'form.courseexp'}.'</b>';
+     my $pretty_search_string = '<b>'.$env{'form.courseexp'}.'</b>';
-     my $search_string = $ENV{'form.courseexp'};
+     my $search_string = $env{'form.courseexp'};
      my @New_Words;
-     if ($ENV{'form.crsrelated'}) {
+     undef(%alreadyseen);
-         ($search_string,@New_Words) = &related_version($ENV{'form.courseexp'});
+     if ($env{'form.crsrelated'}) {
+         ($search_string,@New_Words) = &related_version($env{'form.courseexp'});
          if (@New_Words) {
              $pretty_search_string .= ' '.&mt("with related words").": <b>@New_Words</b>.";
          } else {
              $pretty_search_string .= ' '.&mt('with no related words').".";
          }
      }
-     my $fulltext=$ENV{'form.crsfulltext'};
+     my $fulltext=$env{'form.crsfulltext'};
+     my $discuss=$env{'form.crsdiscuss'};
      my @allwords=($search_string,@New_Words);
      $totalfound=0;
-     $r->print('<html><head><title>LON-CAPA Course Search</title></head>'.
+     my $html=&Apache::lonxml::xmlbegin();
- 	      $bodytag.$pretty_search_string);
+     $r->print($html.'<head><title>LON-CAPA Course Search</title></head>'.
+ 	      $bodytag.'<hr /><center><font size="+2" face="arial">'.$pretty_search_string.'</font></center><hr /><b>'.&mt('Course content').':</b><br />');
      $r->rflush();
  # ======================================================= Go through the course
-     undef %alreadyseen;
-     %alreadyseen=();
      my $c=$r->connection;
-     if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
+     if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db",
              &GDBM_READER(),0640)) {
-         foreach (keys %hash) {
+         foreach (sort(keys(%hash))) {
              if ($c->aborted()) { last; }
-             if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
+             if (($_=~/^src\_(.+)$/)) {
-                 &checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,
+ 		if ($hash{'randomout_'.$1} & !$env{'request.role.adv'}) {
-                              @allwords);
+ 		    next;
+ 		}
+ 		my $symb=&make_symb($1);
+                 &checkonthis($r,$1,$hash{$_},0,&Apache::lonnet::gettitle($symb),
+ 			     $fulltext,$symb,@allwords);
              }
          }
          untie(%hash);
      }
      unless ($totalfound) {
- 	$r->print('<p>'.&mt('No resources found').'.</p>');
+ 	$r->print('<p>'.&mt('No matches found in resources').'.</p>');
+     }
+ # Check discussions if requested
+     if ($discuss) {
+         my $totaldiscussions = 0;
+         $r->print('<br /><br /><b>'.&mt('Discussion postings').':</b><br />');
+         my $navmap = Apache::lonnavmaps::navmap->new();
+         my @allres=$navmap->retrieveResources();
+         my %discussiontime = &Apache::lonnet::dump('discussiontimes',
+                                $env{'course.'.$env{'request.course.id'}.'.domain'},
+                                $env{'course.'.$env{'request.course.id'}.'.num'});
+         foreach my $resource (@allres) {
+             my $result = '';
+             my $applies = 0;
+             my $symb = $resource->symb();
+             my $ressymb = $symb;
+             if ($symb =~ m#(___adm/\w+/\w+)/(\d+)/bulletinboard$#) {
+                 $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
+                 unless ($ressymb =~ m#bulletin___\d+___adm/wrapper#) {
+                     $ressymb=~s#(bulletin___\d+___)#$1adm/wrapper/#;
+                 }
+             }
+             if (defined($discussiontime{$ressymb})) {
+                 my %contrib = &Apache::lonnet::restore($ressymb,$env{'request.course.id'},
+                      $env{'course.'.$env{'request.course.id'}.'.domain'},
+                      $env{'course.'.$env{'request.course.id'}.'.num'});
+                 if ($contrib{'version'}) {
+                     for (my $id=1;$id<=$contrib{'version'};$id++) {
+                         unless (($contrib{'hidden'}=~/\.$id\./) || ($contrib{'deleted'}=~/\.$id\./)) {
+                             if ($contrib{$id.':subject'}) {
+                                 $result .= $contrib{$id.':subject'};
+                             }
+                             if ($contrib{$id.':message'}) {
+                                 $result .= $contrib{$id.':message'};
+                             }
+                             if ($contrib{$id,':attachmenturl'}) {
+                                 if ($contrib{$id,':attachmenturl'} =~ m-/([^/]+)$-) {
+                                     $result .= $1;
+                                 }
+                             }
+                             $applies = &checkwords($result,$applies,@allwords);
+                         }
+                     }
+                 }
+             }
+ # Does this discussion apply?
+             if ($applies) {
+                 my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ressymb);
+                 my $disctype = &mt('resource');
+                 if ($url =~ m#/bulletinboard$#) {
+                     if ($url =~m#^adm/wrapper/adm/.*/bulletinboard$#) {
+                         $url =~s#^adm/wrapper##;
+                     }
+                     $disctype = &mt('bulletin board');
+                 } else {
+                     $url = '/res/'.$url;
+                 }
+                 if ($url =~ /\?/) {
+                     $url .= '&symb=';
+                 } else {
+                     $url .= '?symb=';
+                 }
+                 $url .= &Apache::lonnet::escape($resource->symb());
+                 my $title = $resource->compTitle();
+                 $r->print('<br /><a href="'.$url.'" target="cat">'.
+                      ($title?$title:$url).'</a>&nbsp;&nbsp;-&nbsp;'.$disctype.'<br />');
+                 $totaldiscussions++;
+             } else {
+                 $r->print(' .');
+             }
+         }
+         unless ($totaldiscussions) {
+             $r->print('<p>'.&mt('No matches found in postings').'.</p>');
+         }
      }
  # =================================================== Done going through course
      $r->print('</body></html>');
  }
- Line 402  sub course_search {
+ Line 587  sub course_search {
  # =============================== This pulls up a resource and its dependencies
  sub checkonthis {
-     my ($r,$url,$level,$title,$fulltext,@allwords)=@_;
+     my ($r,$id,$url,$level,$title,$fulltext,$symb,@allwords)=@_;
-     $alreadyseen{$url}=1;
+     $alreadyseen{$id}=1;
+     if (&Apache::loncommon::connection_aborted($r)) { return; }
      $r->rflush();
-     my $result=&Apache::lonnet::metadata($url,'title').' '.
-                &Apache::lonnet::metadata($url,'subject').' '.
+     my $result=$title.' ';
-                &Apache::lonnet::metadata($url,'abstract').' '.
+     if ($env{'request.role.adv'} || !$hash{'encrypted_'.$id}) {
-                &Apache::lonnet::metadata($url,'keywords');
+ 	$result.=&Apache::lonnet::metadata($url,'title').' '.
-     if (($url) && ($fulltext)) {
+ 	    &Apache::lonnet::metadata($url,'subject').' '.
- 	$result.=&Apache::lonnet::ssi_body($url);
+ 	    &Apache::lonnet::metadata($url,'abstract').' '.
+ 	    &Apache::lonnet::metadata($url,'keywords');
+     }
+     my ($extension)=($url=~/\.(\w+)$/);
+     if (&Apache::loncommon::fileembstyle($extension) eq 'ssi' &&
+ 	($url) && ($fulltext)) {
+ 	$result.=&Apache::lonnet::ssi_body($url.'?symb='.&Apache::lonnet::escape($symb));
      }
      $result=~s/\s+/ /gs;
-     my $applies=0;
+     my $applies = 0;
-     foreach (@allwords) {
+     $applies = &checkwords($result,$applies,@allwords);
-         if ($_=~/\w/) {
- 	   if ($result=~/$_/si) {
- 	      $applies++;
-            }
-        }
-     }
  # Does this resource apply?
      if ($applies) {
         $r->print('<br />');
         for (my $i=0;$i<=$level*5;$i++) {
             $r->print('&nbsp;');
         }
-        $r->print('<a href="'.$url.'" target="cat">'.
+        my $href=$url;
- 		 ($title?$title:$url).'</a><br />');
+        if ($hash{'encrypted_'.$id} && !$env{'request.role.adv'}) {
+ 	   $href=&Apache::lonenc::encrypted($href)
+ 	       .'?symb='.&Apache::lonenc::encrypted($symb);
+        } else {
+ 	   $href.='?symb='.&Apache::lonnet::escape($symb);
+        }
+        $r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url).
+ 		 '</a><br />');
         $totalfound++;
      } elsif ($fulltext) {
         $r->print(' .');
- Line 438  sub checkonthis {
+ Line 631  sub checkonthis {
      my $dependencies=
                  &Apache::lonnet::metadata($url,'dependencies');
      foreach (split(/\,/,$dependencies)) {
-        if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {
+        if (($_=~/^\/res\//) && (!$alreadyseen{$id})) {
-           &checkonthis($r,$_,$level+1,'',$fulltext,@allwords);
+           &checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords);
         }
      }
  }
+ sub checkwords {
+     my ($result,$applies,@allwords) = @_;
+     foreach (@allwords) {
+         if ($_=~/\w/) {
+             if ($result=~/$_/si) {
+                 $applies++;
+             }
+         }
+     }
+     return $applies;
+ }
  sub untiehash {
      if (tied(%hash)) {
          untie(%hash);
- Line 452  sub untiehash {
+ Line 657  sub untiehash {
  } # End of course search scoping
+ sub search_html_header {
+     my $html=&Apache::lonxml::xmlbegin();
+     my $Str = <<ENDHEADER;
+ $html
+ <head>
+ <title>The LearningOnline Network with CAPA</title>
+ </head>
+ ENDHEADER
+     return $Str;
+ }
  ######################################################################
  ######################################################################
- Line 459  sub untiehash {
+ Line 675  sub untiehash {
  =item &print_basic_search_form()
- Returns a scalar which holds html for the basic search form.
+ Prints the form for the basic search.  Sorry the name is so cryptic.
  =cut
  ######################################################################
  ######################################################################
+ sub print_basic_search_form {
- sub print_basic_search_form{
      my ($r,$closebutton,$hidden_fields) = @_;
-     my $bodytag=&Apache::loncommon::bodytag('Search');
+     my $result = ($env{'form.catalogmode'} ne 'groupsearch');
-     my $scrout=<<"ENDDOCUMENT";
+     my $bodytag=&Apache::loncommon::bodytag('Search').
- <html>
+         &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Search_Basic',
- <head>
+                                    undef,undef,
- <title>The LearningOnline Network with CAPA</title>
+                                    $env{'form.catalogmode'} ne 'groupsearch');
- <script type="text/javascript">
+     my $scrout = &search_html_header().$bodytag;
-     function openhelp(val) {
+     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
- 	openhelpwin=open('/adm/help/searchcat.html','helpscreen',
+         # Define interface components
- 	     'scrollbars=1,width=600,height=300');
+         my $userelatedwords= '<label>'.
- 	openhelpwin.focus();
+             &mt('[_1] use related words',
-     }
+                 &Apache::lonhtmlcommon::checkbox
- </script>
+                 ('related',$env{'form.related'},'related')).'</label>';
- </head>
+         my $onlysearchdomain='<label>'.
- $bodytag
+             &mt('[_1] only search domain [_2]',
- ENDDOCUMENT
+                 &Apache::lonhtmlcommon::checkbox('domains',
- if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) {
+                                                  $env{'form.domains'},
-     my $CatalogSearch=&mt('Catalog Search');
+                                                  $r->dir_config('lonDefDomain')
-     my $Statement=&mt('Enter terms or phrases separated by AND, OR, or NOT then press SEARCH below');
+                                                  ),
-     $scrout.=(<<ENDDOCUMENT);
+                 $r->dir_config('lonDefDomain')
- <h1>$CatalogSearch</h1>
+                 ).'</label>';
- <form name="loncapa_search" method="post" action="/adm/searchcat">
+         my $inclext= '<label>'.
- <input type="hidden" name="phase" value="basic_search" />
+             &mt('[_1] include external resources',
- $hidden_fields
+                 &Apache::lonhtmlcommon::checkbox
- <p>
+                 ('inclext',$env{'form.inclext'})).'</label>';
- $Statement.
+         my $adv_search_link =
- </p>
+             '<a href="/adm/searchcat?'.
- <p>
+             'phase=disp_adv&'.
- <table>
+             'catalogmode='.$env{'form.catalogmode'}.
- <tr><td>
+             '&launch='.$env{'form.launch'}.
- ENDDOCUMENT
+             '&mode='.$env{'form.mode'}.
-     $scrout.='&nbsp;'.&Apache::lonhtmlcommon::textbox('basicexp',
+             '">'.&mt('Advanced Search').'</a>';
-                                             $ENV{'form.basicexp'},40).
+         #
-         '&nbsp;';
+         $scrout.='<form name="loncapa_search" method="post" '.
-     my $relatedcheckbox = &Apache::lonhtmlcommon::checkbox('related',
+             'action="/adm/searchcat">'.
- 						 $ENV{'form.related'});
+             '<input type="hidden" name="phase" value="basic_search" />'.
-     my $domain = $r->dir_config('lonDefDomain');
+             $hidden_fields;
-     my $domaincheckbox = &Apache::lonhtmlcommon::checkbox('domains',
+         #
- 						$ENV{'form.domains'});
+         $scrout .= '<center>'.$/;
-     my $srch=&mt('Search');
+         if ($env{'request.course.id'}) {
-     my $header=&mt('Advanced Search');
+             $scrout .= '<h1>'.&mt('LON-CAPA Catalog Search').'</h1>';
-     my $userelatedwords=&mt('use related words');
+         } else {
-     my $onlysearchdomain=&mt('only search domain');
+             # No need to tell them they are searching
-     my $view=&viewoptions();
+             $scrout.= ('<br />'x2);
-     $scrout.=<<END;
+         }
- </td><td><a
+         $scrout.='<table>'.
- href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}&mode=$ENV{'form.mode'}"
+             '<tr><td align="center" valign="top">'.
- >$header</a></td></tr>
+             &Apache::lonhtmlcommon::textbox
- <tr><td>$relatedcheckbox $userelatedwords</td>
+             ('basicexp',
-     <td>$domaincheckbox $onlysearchdomain <b>$domain</b></td></tr>
+              &HTML::Entities::encode($env{'form.basicexp'},'<>&"'),50
- </table>
+              ).
- </p>
+              '<br />'.
- $view
+             '<font size="-1">'.&searchhelp().'</font>'.'</td>'.
- <p>
+             '<td><font size="-1">'.
- &nbsp;<input type="submit" name="basicsubmit" value='$srch' />&nbsp;
+             '<nobr>'.('&nbsp;'x3).$adv_search_link.'</nobr>'.'<br />'.
- $closebutton
+             '<nobr>'.('&nbsp;'x1).$userelatedwords.'</nobr>'.'<br />'.
- END
+             '<nobr>'.('&nbsp;'x1).$onlysearchdomain.'</nobr>'.'<br />'.
-     $scrout.=<<ENDDOCUMENT;
+             '<nobr>'.('&nbsp;'x1).$inclext.'</nobr>'.'<br />'.
- </p>
+              '</font></td>'.
- </form>
+             '</tr>'.$/;
- ENDDOCUMENT
+         #
+         $scrout .= '<tr><td align="center" colspan="2">'.
+             '<font size="-1">'.
+             '<input type="submit" name="basicsubmit" '.
+             'value="'.&mt('Search').'" />'.
+             ('&nbsp;'x2).$closebutton.('&nbsp;'x2).
+             &viewoptions().
+             '</font>'.
+             '</td></tr>'.$/;
+         $scrout .= '</table>'.$/.'</center>'.'</form>';
      }
-     if ($ENV{'request.course.id'}) {
+     if ($env{'request.course.id'}) {
- 	my %lt=&Apache::lonlocal::texthash(
+ 	my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
- 					   'srch' => 'Search',
                                             'header' => 'Course Search',
  	 'note' => 'Enter terms or phrases, then press "Search" below',
  	 'use' => 'use related words',
- 	 'full' =>'fulltext search (time consuming)'
+ 	 'full' =>'fulltext search (time consuming)',
+          'disc' => 'search discussion postings (resources and bulletin boards)',
  					   );
          $scrout.=(<<ENDCOURSESEARCH);
+ <form name="loncapa_search" method="post" action="/adm/searchcat">
+ <center>
  <hr />
  <h1>$lt{'header'}</h1>
- <form name="course_search" method="post" action="/adm/searchcat">
  <input type="hidden" name="phase" value="course_search" />
  $hidden_fields
  <p>
- Line 552  $lt{'note'}.
+ Line 777  $lt{'note'}.
  ENDCOURSESEARCH
          $scrout.='&nbsp;'.
              &Apache::lonhtmlcommon::textbox('courseexp',
-                                   $ENV{'form.courseexp'},40);
+                                   $env{'form.courseexp'},40);
          my $crscheckbox =
              &Apache::lonhtmlcommon::checkbox('crsfulltext',
-                                    $ENV{'form.crsfulltext'});
+                                    $env{'form.crsfulltext'});
          my $relcheckbox =
              &Apache::lonhtmlcommon::checkbox('crsrelated',
- 				   $ENV{'form.crsrelated'});
+ 				   $env{'form.crsrelated'});
+         my $discheckbox =
+             &Apache::lonhtmlcommon::checkbox('crsdiscuss',
+                                    $env{'form.crsrelated'});
          $scrout.=(<<ENDENDCOURSE);
  </td></tr>
- <tr><td>$relcheckbox $lt{'use'}</td><td></td></tr>
+ <tr><td><label>$relcheckbox $lt{'use'}</label></td><td></td></tr>
- <tr><td>$crscheckbox $lt{'full'}</td><td></td></tr>
+ <tr><td><label>$crscheckbox $lt{'full'}</label></td><td></td></tr>
+ <tr><td><label>$discheckbox $lt{'disc'}</label></td><td></td></tr>
  </table><p>
  &nbsp;<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
  </p>
+ </center>
+ </form>
  ENDENDCOURSE
      }
      $scrout.=(<<ENDDOCUMENT);
- Line 582  ENDDOCUMENT
+ Line 813  ENDDOCUMENT
  =item &advanced_search_form()
- Returns a scalar which holds html for the advanced search form.
+ Prints the advanced search form.
  =cut
  ######################################################################
  ######################################################################
  sub print_advanced_search_form{
      my ($r,$closebutton,$hidden_fields) = @_;
+     my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search').
+         &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching',
+                                             'Search_Advanced',
+                                             undef,undef,
+                                   $env{'form.catalogmode'} ne 'groupsearch');
      my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
  				       'reset' => 'Reset',
  				       'help' => 'Help');
-     my $advanced_buttons = <<"END";
+     my $advanced_buttons=<<"END";
- <p>
  <input type="submit" name="advancedsubmit" value='$lt{"srch"}' />
  <input type="reset" name="reset" value='$lt{"reset"}' />
  $closebutton
- <input type="button" value="$lt{'help'}" onClick="openhelp()" />
- </p>
  END
-     if (!defined($ENV{'form.viewselect'})) {
+     my $scrout=&search_html_header();
-         $ENV{'form.viewselect'} ="Detailed Citation View";
+     $scrout .= <<"ENDHEADER";
-     }
-     my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search');
-     my $scrout=<<"ENDHEADER";
- <html>
- <head>
- <title>The LearningOnline Network with CAPA</title>
- <script type="text/javascript">
-     function openhelp(val) {
- 	openhelpwin=open('/adm/help/searchcat.html','helpscreen',
- 	     'scrollbars=1,width=600,height=300');
- 	openhelpwin.focus();
-     }
- </script>
- </head>
  $bodytag
- Enter terms or phrases separated by search operators
- such as AND, OR, or NOT.<br />
  <form method="post" action="/adm/searchcat" name="advsearch">
+ <p>
  $advanced_buttons
- $hidden_fields
- <input type="hidden" name="phase" value="adv_search" />
  ENDHEADER
-     $scrout.=&viewoptions();
+     $scrout.=('&nbsp;'x2).&viewoptions().'</p>'.$hidden_fields.
+         '<input type="hidden" name="phase" value="adv_search" />';
      my %fields=&Apache::lonmeta::fieldnames();
- # set undefined to "any"
-     $ENV{'form.language'}='any' unless length($ENV{'form.language'});
-     $ENV{'form.domains'} = 'any' if (! exists($ENV{'form.domains'}));
-     $ENV{'form.category'}='any' if (! defined($ENV{'form.category'}));
-     $scrout.='<table>';
-     $scrout.="<tr><th>".&mt('Field').'</th><th>'.&mt('Value').'</th><th>'
- 	.&mt('Related').'<br />'.&mt('Words')."</td></tr>\n";
-     foreach ('title','author','keywords','notes','abstract','standards',
- 	     'lowestgradelevel','highestgradelevel','mime') {
- 	$scrout.='<tr><td>'.&titlefield($fields{$_}).'</td><td>'.
- 	    &Apache::lonmeta::prettyinput($_,$ENV{'form.'.$_},$_,'advsearch',
-,'</td><td>',$ENV{'form.'.$_.'_related'}).
- 	    '</td></tr>';
-     }
-     # Hack - an empty table row.
-     $scrout.="<tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>\n";
- #    $scrout.=&searchphrasefield('file<br />extension','extension',
- #                        $ENV{'form.extension'});
- #    $scrout.="<tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>\n";
- #    $scrout.=&searchphrasefield('publisher<br />owner','owner',
- 	#			$ENV{'form.owner'});
-     $scrout.="</table>\n";
- #    $scrout.=&Apache::lonmeta::selectbox('File Category','category',
- #			$ENV{'form.category'},
- #			'any','Any category',
- #			undef,
- #			(&Apache::loncommon::filecategories()));
-     #----------------------------------------------------------------
-     # Allow restriction to multiple domains.
-     #   I make the crazy assumption that there will never be a domain 'any'.
      #
-     my @allowed_domains = (ref($ENV{'form.domains'}) ? @{$ENV{'form.domains'}}
+     $scrout .= '<h3>'.&mt('Standard Metadata').'</h3>';
-                            :  ($ENV{'form.domains'}) );
+     $scrout .= "<table>\n";
-     my %domain_hash = ();
+     $scrout .= '<tr><td>&nbsp;</td><td colspan="2"><font size="-1">'.
-     foreach (@allowed_domains) {
+         ('&nbsp;'x2).&searchhelp()."</font></td></tr>\n";
-         $domain_hash{$_}++;
+     my %related_word_search =
+         ('title'    => 1,
+          'author'   => 0,
+          'owner'    => 0,
+          'authorspace'  => 0,
+          'modifyinguser'=> 0,
+          'keywords' => 1,
+          'notes'    => 1,
+          'abstract' => 1,
+          'standards'=> 1,
+          'mime'     => 1,
+ 	 'subject'  => 1,
+          );
+     #
+     foreach my $field ('title','author','subject','owner','authorspace',
+ 		       'modifyinguser','keywords','notes','abstract',
+ 		       'standards','mime') {
+ 	$scrout.='<tr><td align="right">'.&titlefield($fields{$field}).'</td><td>'.
+ 	    &Apache::lonmeta::prettyinput($field,
+                                           $env{'form.'.$field},
+                                           $field,
+                                           'advsearch',
+ 					  $related_word_search{$field},
+                                           '</td><td align="left">',
+                                           $env{'form.'.$field.'_related'},
+);
+         if ($related_word_search{$field}) {
+             $scrout .= 'related words';
+         } else {
+             $scrout .= '</td><td>&nbsp;';
+         }
+         $scrout .= '</td></tr>'.$/;
+     }
+     foreach my $field ('lowestgradelevel','highestgradelevel') {
+ 	$scrout.='<tr>'.
+             '<td align="right">'.&titlefield($fields{$field}).'</td>'.
+             '<td colspan="2">'.
+ 	    &Apache::lonmeta::prettyinput($field,
+                                           $env{'form.'.$field},
+                                           $field,
+                                           'advsearch',
+).
+                                           '</td></tr>'.$/;
+     }
+     $scrout.='<tr><td align="right">'.
+ 	&titlefield(&mt('MIME Type Category')).'</td><td colspan="2">'.
+ 	    &Apache::loncommon::filecategoryselect('category',
+ 						   $env{'form.category'}).
+ 	    '</td></tr>'.$/;
+     $scrout.='<tr><td align="right" valign="top">'.
+ 	&titlefield(&mt('Domains')).'</td><td colspan="2">'.
+ 	    &Apache::loncommon::domain_select('domains',
+ 						   $env{'form.domains'},1).
+ 						   '<br /><label>'.
+             &mt('[_1] include external resources',
+                 &Apache::lonhtmlcommon::checkbox
+                 ('inclext',$env{'form.inclext'})).'</label></td></tr>'.$/;
+     #
+     # Misc metadata
+     $scrout.='<tr><td align="right" valign="top">'.
+ 	&titlefield(&mt('Copyright/Distribution')).'</td><td colspan="2">'.
+         &Apache::lonmeta::selectbox('copyright',
+                                     $env{'form.copyright'},
+                                     \&Apache::loncommon::copyrightdescription,
+                                     ( undef,
+                                       &Apache::loncommon::copyrightids)
+                                     ).'</td></tr>'.$/;
+     $scrout.='<tr><td align="right" valign="top">'.
+ 	&titlefield(&mt('Language')).'</td><td colspan="2">'.
+         &Apache::lonmeta::selectbox('language',
+                                     $env{'form.language'},
+                                     \&Apache::loncommon::languagedescription,
+                                     ('any',&Apache::loncommon::languageids)
+                                     ).'</td></tr>';
+     $scrout .= "</table>\n";
+     #
+     # Dynamic metadata
+     $scrout .= '<h3>'.&mt('Problem Statistics').'</h3>';
+     $scrout .= "<table>\n";
+     $scrout .= '<tr><td>&nbsp;</td><td align="center">'.&mt('Minimum').'</td>'.
+         '<td align="center">'.&mt('Maximum').'</td></tr>'."\n";
+     foreach my $statistic
+         ({ name=>'count',
+            description=>'Network-wide number of accesses (hits)',},
+          { name=>'stdno',
+            description=>
+                'Total number of students who have worked on this problem',},
+          { name => 'avetries',
+            description=>'Average number of tries till solved',},
+          { name => 'difficulty',
+            description=>'Degree of difficulty',},
+          { name => 'disc',
+            description=>'Degree of discrimination'}) {
+         $scrout .= '<tr><td align="right">'.
+             &titlefield(&mt($statistic->{'description'})).
+             '</td><td align="center">'.
+             '<input type="text" name="'.$statistic->{'name'}.'_min" '.
+             'value="" size="6" />'.
+             '</td><td align="center">'.
+             '<input type="text" name="'.$statistic->{'name'}.'_max" '.
+             'value="" size="6" />'.
+             '</td></tr>'.$/;
+     }
+     $scrout .= "</table>\n";
+     $scrout .= '<h3>'.&mt('Evaluation Data').'</h3>';
+     $scrout .= "<table>\n";
+     $scrout .= '<tr><td>&nbsp;</td><td align="center">'.&mt('Minimum').'</td>'.
+         '<td align="center">'.&mt('Maximum').'</td></tr>'."\n";
+     foreach my $evaluation
+         ( { name => 'clear',
+             description => 'Material presented in clear way'},
+           { name =>'depth',
+             description => 'Material covered with sufficient depth'},
+           { name => 'helpful',
+             description => 'Material is helpful'},
+           { name => 'correct',
+             description => 'Material appears to be correct'},
+           { name => 'technical',
+             description => 'Resource is technically correct'}){
+         $scrout .= '<tr><td align="right">'.
+             &titlefield(&mt($evaluation->{'description'})).
+             '</td><td align="center">'.
+             '<input type="text" name="'.$evaluation->{'name'}.'_min" '.
+             'value="" size="6" />'.
+             '</td><td align="center">'.
+             '<input type="text" name="'.$evaluation->{'name'}.'_max" '.
+             'value="" size="6" />'.
+             '</td></tr>'.$/;
      }
-     my @domains =&Apache::loncommon::get_domains();
+     $scrout .= "</table>\n";
-     # adjust the size of the select box
+     #
-     my $size = 4;
+     # Creation/Modification date limits
-     $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
+     $scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>';
-     $scrout.="\n".&titlefield(&mt('Domain to be searched')).
+     $scrout .= "\n<table>\n";
-             '<select name="domains" size="'.$size.'" multiple>'."\n".
+     my $cafter =
-                 '<option name="any" value="any" '.
+         &Apache::lonhtmlcommon::date_setter('advsearch',         # formname
-                     ($domain_hash{'any'}? 'selected ' :'').
+                                             'creationdate1', # fieldname
-                         '>all domains</option>'."\n";
+,           # current value
-     foreach my $dom (sort @domains) {
+                                             '',          # special
-         $scrout.="<option name=\"$dom\" ".
+,           # includeempty
-             ($domain_hash{$dom} ? 'selected ' :'').">$dom</option>\n";
+                                             '',          # state
-     }
+,           # no_hh_mm_ss
-     $scrout.="</select>\n";
+                                             );
+     my $cbefore =
- # ------------------------------------------- Compute customized metadata field
+         &Apache::lonhtmlcommon::date_setter('advsearch',         # formname
- #    $scrout.=<<CUSTOMMETADATA;
+                                             'creationdate2', # fieldname
- #<p>
+,           # current value
- #<font color="#800000" face="helvetica"><b>LIMIT BY SPECIAL METADATA FIELDS:</b>
+                                             '',          # special
- #</font>
+,           # includeempty
- #For resource-specific metadata, enter in an expression in the form of
+                                             '',          # state
- #<i>key</i>=<i>value</i> separated by operators such as AND, OR or NOT.<br />
+,           # no_hh_mm_ss
- #<b>Example:</b> grandmother=75 OR grandfather=85
+                                             );
- #<br />
+     $scrout .= &mt('<tr><td align="right">Created between</td>'.
- #CUSTOMMETADATA
+                    '<td>[_1]</td></tr>'.
- #    $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});
+                    '<tr><td align="right">and </td>'.
- #    $scrout.=<<CUSTOMSHOW;
+                    '<td>[_2]</td></tr>',$cafter,$cbefore);
- #<p>
+     my $lafter =
- #<font color="#800000" face="helvetica"><b>SHOW SPECIAL METADATA FIELDS:</b>
+         &Apache::lonhtmlcommon::date_setter('advsearch',
- #</font>
+                                             'revisiondate1',
- #Enter in a space-separated list of special metadata fields to show
+,           # current value
- #in a fielded listing for each record result.
+                                             '',          # special
- #<br />
+,           # includeempty
- #CUSTOMSHOW
+                                             '',          # state
- #    $scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});
+,           # no_hh_mm_ss
+                                             );
+     my $lbefore =
+         &Apache::lonhtmlcommon::date_setter('advsearch',
+                                             'revisiondate2',
+,           # current value
+                                             '',          # special
+,           # includeempty
+                                             '',          # state
+,           # no_hh_mm_ss
+                                             );
+     $scrout .= &mt('<tr><td align="right">Last modified between </td>'.
+                    '<td>[_1]</td></tr>'.
+                    '<tr><td align="right">and</td>'.
+                    '<td>[_2]</td></tr>',$lafter,$lbefore);
+     $scrout.="</table>\n";
      $scrout.=<<ENDDOCUMENT;
  $advanced_buttons
  </form>
- Line 711  ENDDOCUMENT
+ Line 1037  ENDDOCUMENT
      $r->print($scrout);
      return;
  }
  ######################################################################
  ######################################################################
  =pod
- =item &titlefield
+ =item &titlefield()
  Inputs: title text
- Line 726  Outputs: titletext with font wrapper
+ Line 1053  Outputs: titletext with font wrapper
  ######################################################################
  ######################################################################
  sub titlefield {
      my $title=shift;
-     return '<font face="arial" color="#800000">'.$title.'</font>';
+     return $title;
  }
  ######################################################################
  ######################################################################
  =pod
- =item viewoptiontext
+ =item viewoptiontext()
  Inputs: codename for view option
- Line 746  Outputs: displayed text
+ Line 1073  Outputs: displayed text
  ######################################################################
  ######################################################################
  sub viewoptiontext {
      my $code=shift;
-     my %desc=&Apache::lonlocal::texthash('detailed' => "Detailed Citation View",
+     my %desc=&Apache::lonlocal::texthash
- 					 'xml' => 'XML/SGML',
+         ('detailed' => "Detailed Citation View",
- 					 'compact' => 'Compact View',
+          'xml' => 'XML/SGML',
- 					 'fielded' => 'Fielded Format',
+          'compact' => 'Compact View',
- 					 'summary' => 'Summary View');
+          'fielded' => 'Fielded Format',
+          'summary' => 'Summary View');
      return $desc{$code};
  }
+ ######################################################################
  ######################################################################
  =pod
- =item viewoptions
+ =item viewoptions()
  Inputs: none
- Line 770  Outputs: text for box with view options
+ Line 1099  Outputs: text for box with view options
  ######################################################################
  ######################################################################
  sub viewoptions {
-     my $scrout="\n\n".'<table bgcolor="#FFFFBB"><tr><th>'.&mt('View Options').'</th><th>'.
+     my $scrout;
- 	&mt('Records per Page').'</th></tr><tr><td>';
+     if (! defined($env{'form.viewselect'})) {
-     unless ($ENV{'form.viewselect'}) { $ENV{'form.viewselect'}='detailed'; }
+         $env{'form.viewselect'}='detailed';
+     }
      $scrout.=&Apache::lonmeta::selectbox('viewselect',
- 			$ENV{'form.viewselect'},
+ 			$env{'form.viewselect'},
  			\&viewoptiontext,
  			sort(keys(%Views)));
-     $scrout.='</td><td>';
+     $scrout.= '&nbsp;&nbsp;';
-     $scrout.=&Apache::lonmeta::selectbox('show',
+     my $countselect = &Apache::lonmeta::selectbox('show',
- 			$ENV{'form.show'},
+                                                   $env{'form.show'},
- 			undef,
+                                                   undef,
- 			(10,20,50,100,1000,10000));
+                                                   (10,20,50,100,1000,10000));
-     $scrout.="</td></tr></table>\n\n";
+     $scrout .= ('&nbsp;'x2).&mt('[_1] Records per Page',$countselect).
+         '</nobr>'.$/;
      return $scrout;
  }
- Line 793  sub viewoptions {
+ Line 1123  sub viewoptions {
  =pod
- =item &get_persistent_form_data
+ =item searchhelp()
+ Inputs: none
+ Outputs: return little blurb on how to enter searches
+ =cut
+ ######################################################################
+ ######################################################################
+ sub searchhelp {
+     return &mt('Enter words and quoted phrases');
+ }
+ ######################################################################
+ ######################################################################
+ =pod
+ =item &get_persistent_form_data()
  Inputs: filename of database
- Line 801  Outputs: returns undef on database error
+ Line 1150  Outputs: returns undef on database error
  This function is the reverse of &make_persistent() for form data.
  Retrieve persistent data from %persistent_db.  Retrieved items will have their
- values unescaped.  If a form value already exists in $ENV, it will not be
+ values unescaped.  If a form value already exists in $env, it will not be
  overwritten.  Form values that are array references may have values appended
  to them.
- Line 823  sub get_persistent_form_data {
+ Line 1172  sub get_persistent_form_data {
          next if ($name !~ /^form./);
          # Kludgification begins!
          if ($name eq 'form.domains' &&
-             $ENV{'form.searchmode'} eq 'basic' &&
+             $env{'form.searchmode'} eq 'basic' &&
-             $ENV{'form.phase'} ne 'disp_basic') {
+             $env{'form.phase'} ne 'disp_basic') {
              next;
          }
          # End kludge (hopefully)
-         next if (exists($ENV{$name}));
+         next if (exists($env{$name}));
          my @values = map {
              &Apache::lonnet::unescape($_);
          } split(',',$persistent_db{$name});
          next if (@values <1);
          if ($arrays_allowed{$name}) {
-             $ENV{$name} = [@values];
+             $env{$name} = [@values];
          } else {
-             $ENV{$name} = $values[0] if ($values[0]);
+             $env{$name} = $values[0] if ($values[0]);
          }
      }
      untie (%persistent_db);
- Line 848  sub get_persistent_form_data {
+ Line 1197  sub get_persistent_form_data {
  =pod
- =item &get_persistent_data
+ =item &get_persistent_data()
  Inputs: filename of database, ref to array of values to recover.
- Line 899  Inputs: Hash of values to save, filename
+ Line 1248  Inputs: Hash of values to save, filename
  Store variables away to the %persistent_db.
  Values will be escaped.  Values that are array pointers will have their
- elements escaped and concatenated in a comma seperated string.
+ elements escaped and concatenated in a comma separated string.
  =cut
- Line 931  Inputs: filename of persistent database.
+ Line 1280  Inputs: filename of persistent database.
  Store most form variables away to the %persistent_db.
  Values will be escaped.  Values that are array pointers will have their
- elements escaped and concatenated in a comma seperated string.
+ elements escaped and concatenated in a comma separated string.
  =cut
- Line 941  sub make_form_data_persistent {
+ Line 1290  sub make_form_data_persistent {
      my $r = shift;
      my $filename = shift;
      my %save;
-     foreach (keys(%ENV)) {
+     foreach (keys(%env)) {
          next if (!/^form/ || /submit/);
-         $save{$_} = $ENV{$_};
+         $save{$_} = $env{$_};
      }
      return &make_persistent(\%save,$filename);
  }
- Line 975  Parse advanced search form and return th
+ Line 1324  Parse advanced search form and return th
  ######################################################################
  sub parse_advanced_search {
      my ($r,$closebutton,$hidden_fields)=@_;
+     my @BasicFields = ('title','author','subject','keywords','url','version',
+                        'notes','abstract','extension','owner','authorspace',
+ #                       'custommetadata','customshow',
+                        'modifyinguser','standards','mime');
+     my @StatsFields = &statfields();
+     my @EvalFields = &evalfields();
      my $fillflag=0;
-     my $pretty_search_string = "<br />\n";
+     my $pretty_search_string = "";
      # Clean up fields for safety
-     for my $field ('title','author','subject','keywords','url','version',
+     for my $field (@BasicFields,
- 		   'creationdatestart_month','creationdatestart_day',
+                    'creationdatestart_month','creationdatestart_day',
  		   'creationdatestart_year','creationdateend_month',
  		   'creationdateend_day','creationdateend_year',
  		   'lastrevisiondatestart_month','lastrevisiondatestart_day',
  		   'lastrevisiondatestart_year','lastrevisiondateend_month',
- 		   'lastrevisiondateend_day','lastrevisiondateend_year',
+ 		   'lastrevisiondateend_day','lastrevisiondateend_year') {
- 		   'notes','abstract','extension','language','owner',
+ 	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g;
- 		   'custommetadata','customshow','category') {
- 	$ENV{"form.$field"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
      }
      foreach ('mode','form','element') {
  	# is this required?  Hmmm.
- 	next unless (exists($ENV{"form.$_"}));
+ 	next if (! exists($env{'form.'.$_}));
- 	$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
+ 	$env{'form.'.$_}=&Apache::lonnet::unescape($env{'form.'.$_});
- 	$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
+ 	$env{'form.'.$_}=~s/[^\w\/\s\(\)\=\-\"\']//g;
      }
      # Preprocess the category form element.
-     $ENV{'form.category'} = 'any' if (! defined($ENV{'form.category'}) ||
+     $env{'form.category'} = 'any' if (! defined($env{'form.category'}) ||
-                                       ref($ENV{'form.category'}));
+                                       ref($env{'form.category'}));
      #
      # Check to see if enough information was filled in
-     for my $field ('title','author','subject','keywords','url','version',
+     foreach my $field (@BasicFields) {
- 		   'notes','abstract','category','extension','language',
+ 	if (&filled($env{'form.'.$field})) {
-                    'owner','custommetadata') {
- 	if (&filled($ENV{"form.$field"})) {
  	    $fillflag++;
  	}
      }
-     unless ($fillflag) {
+     foreach my $field (@StatsFields,@EvalFields) {
- 	&output_blank_field_error($r,$closebutton,'phase=disp_adv',$hidden_fields);
+         if (&filled($env{'form.'.$field.'_max'})) {
+             $fillflag++;
+         }
+         if (&filled($env{'form.'.$field.'_min'})) {
+             $fillflag++;
+         }
+     }
+     for my $field ('lowestgradelevel','highestgradelevel') {
+         if ( $env{'form.'.$field} =~ /^\d+$/ &&
+              $env{'form.'.$field} > 0) {
+             $fillflag++;
+         }
+     }
+     if (! $fillflag) {
+ 	&output_blank_field_error($r,$closebutton,
+                                   'phase=disp_adv',$hidden_fields);
  	return ;
      }
      # Turn the form input into a SQL-based query
- Line 1016  sub parse_advanced_search {
+ Line 1383  sub parse_advanced_search {
      my @queries;
      my $font = '<font color="#800000" face="helvetica">';
      # Evaluate logical expression AND/OR/NOT phrase fields.
-     foreach my $field ('title','author','subject','notes','abstract','url',
+     foreach my $field (@BasicFields) {
- 		       'keywords','version','owner','standards') {
+ 	next if (!defined($env{'form.'.$field}) || $env{'form.'.$field} eq '');
- 	if ($ENV{'form.'.$field}) {
+         my ($error,$SQLQuery) =
-             my $searchphrase = $ENV{'form.'.$field};
+             &process_phrase_input($env{'form.'.$field},
-             $pretty_search_string .= $font."$field</font> contains <b>".
+                                   $env{'form.'.$field.'_related'},$field);
-                 $searchphrase."</b>";
+         if (defined($error)) {
-             if ($ENV{'form.'.$field.'_related'}) {
+             &output_unparsed_phrase_error($r,$closebutton,'phase=disp_adv',
-                 my @New_Words;
+                                          $hidden_fields,$field);
-                 ($searchphrase,@New_Words) = &related_version($searchphrase);
+             return;
-                 if (@New_Words) {
+         } else {
-                     $pretty_search_string .= " with related words: ".
+             $pretty_search_string .=
-                         "<b>@New_Words</b>.";
+                 $font.$field.'</font>: '.$env{'form.'.$field};
+             if ($env{'form.'.$field.'_related'}) {
+                 my @Words =
+                     &Apache::loncommon::get_related_words
+                     ($env{'form.'.$field});
+                 if (@Words) {
+                     $pretty_search_string.= ' with related words: '.
+                         join(', ',@Words[0..4]);
                  } else {
-                     $pretty_search_string .= " with no related words.";
+                     $pretty_search_string.= ' with related words.';
                  }
              }
-             $pretty_search_string .= "<br />\n";
+             $pretty_search_string .= '<br />';
- 	    push @queries,&build_SQL_query($field,$searchphrase);
+             push (@queries,$SQLQuery);
          }
      }
      #
      # Make the 'mime' from 'form.category' and 'form.extension'
      #
      my $searchphrase;
-     if (exists($ENV{'form.category'})    &&
+     if (exists($env{'form.category'})    &&
-         $ENV{'form.category'} !~ /^\s*$/ &&
+         $env{'form.category'} !~ /^\s*$/ &&
-         $ENV{'form.category'} ne 'any')     {
+         $env{'form.category'} ne 'any')     {
          my @extensions = &Apache::loncommon::filecategorytypes
-                                                    ($ENV{'form.category'});
+                                                    ($env{'form.category'});
          if (scalar(@extensions) > 0) {
              $searchphrase = join(' OR ',@extensions);
          }
      }
-     if (exists($ENV{'form.extension'}) && $ENV{'form.extension'} !~ /^\s*$/) {
-         $searchphrase .= ' OR ' if (defined($searchphrase));
-         my @extensions = split(/,/,$ENV{'form.extension'});
-         $searchphrase .= join(' OR ',@extensions);
-     }
      if (defined($searchphrase)) {
-         push @queries,&build_SQL_query('mime',$searchphrase);
+         my ($error,$SQLsearch) = &process_phrase_input($searchphrase,0,'mime');
+         push @queries,$SQLsearch;
          $pretty_search_string .=$font.'mime</font> contains <b>'.
              $searchphrase.'</b><br />';
      }
-     #####
+     #
      # Evaluate option lists
-     if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {
+     if ($env{'form.lowestgradelevel'}        &&
- 	push @queries,"(language like \"$ENV{'form.language'}\")";
+         $env{'form.lowestgradelevel'} ne '0' &&
+         $env{'form.lowestgradelevel'} =~ /^\d+$/) {
+ 	push(@queries,
+              '(lowestgradelevel>='.$env{'form.lowestgradelevel'}.')');
+         $pretty_search_string.="lowestgradelevel>=".
+             $env{'form.lowestgradelevel'}."<br />\n";
+     }
+     if ($env{'form.highestgradelevel'}        &&
+         $env{'form.highestgradelevel'} ne '0' &&
+         $env{'form.highestgradelevel'} =~ /^\d+$/) {
+ 	push(@queries,
+              '(highestgradelevel<='.$env{'form.highestgradelevel'}.')');
+         $pretty_search_string.="highestgradelevel<=".
+             $env{'form.highestgradelevel'}."<br />\n";
+     }
+     if ($env{'form.language'} and $env{'form.language'} ne 'any') {
+ 	push @queries,"(language like \"$env{'form.language'}\")";
          $pretty_search_string.=$font."language</font>= ".
-             &Apache::loncommon::languagedescription($ENV{'form.language'}).
+             &Apache::loncommon::languagedescription($env{'form.language'}).
                  "<br />\n";
      }
-     if ($ENV{'form.copyright'} and $ENV{'form.copyright'} ne 'any') {
+     if ($env{'form.copyright'} and $env{'form.copyright'} ne 'any') {
- 	push @queries,"(copyright like \"$ENV{'form.copyright'}\")";
+ 	push @queries,"(copyright like \"$env{'form.copyright'}\")";
          $pretty_search_string.=$font."copyright</font> = ".
-             &Apache::loncommon::copyrightdescription($ENV{'form.copyright'}).
+             &Apache::loncommon::copyrightdescription($env{'form.copyright'}).
-                 "<br \>\n";
+                 "<br />\n";
+     }
+     #
+     # Statistics
+     foreach my $field (@StatsFields,@EvalFields) {
+         my ($min,$max);
+         if (exists($env{'form.'.$field.'_min'}) &&
+             $env{'form.'.$field.'_min'} ne '') {
+             $min = $env{'form.'.$field.'_min'};
+         }
+         if (exists($env{'form.'.$field.'_max'}) &&
+             $env{'form.'.$field.'_max'} ne '') {
+             $max = $env{'form.'.$field.'_max'};
+         }
+         next if (! defined($max) && ! defined($min));
+         if (defined($min) && defined($max)) {
+             ($min,$max) = sort {$a <=>$b} ($min,$max);
+         }
+         if (defined($min) && $min =~ /^(\d+\.\d+|\d+|\.\d+)$/) {
+             push(@queries,'('.$field.'>'.$min.')');
+             $pretty_search_string.=$font.$field.'</font>&gt;'.$min.'<br />';
+         }
+         if (defined($max) && $max =~ /^(\d+\.\d+|\d+|\.\d+)$/) {
+             push(@queries,'('.$field.'<'.$max.')');
+             $pretty_search_string.=$font.$field.'</font>&lt;'.$max.'<br />';
+         }
      }
      #
      # Evaluate date windows
-     my $datequery=&build_date_queries(
+     my $cafter =
- 			$ENV{'form.creationdatestart_month'},
+         &Apache::lonhtmlcommon::get_date_from_form('creationdate1');
- 			$ENV{'form.creationdatestart_day'},
+     my $cbefore =
- 			$ENV{'form.creationdatestart_year'},
+         &Apache::lonhtmlcommon::get_date_from_form('creationdate2');
- 			$ENV{'form.creationdateend_month'},
+     if ($cafter > $cbefore) {
- 			$ENV{'form.creationdateend_day'},
+         my $tmp = $cafter;
- 			$ENV{'form.creationdateend_year'},
+         $cafter = $cbefore;
- 			$ENV{'form.lastrevisiondatestart_month'},
+         $cbefore = $tmp;
- 			$ENV{'form.lastrevisiondatestart_day'},
+     }
- 			$ENV{'form.lastrevisiondatestart_year'},
+     my $mafter =
- 			$ENV{'form.lastrevisiondateend_month'},
+         &Apache::lonhtmlcommon::get_date_from_form('revisiondate1');
- 			$ENV{'form.lastrevisiondateend_day'},
+     my $mbefore =
- 			$ENV{'form.lastrevisiondateend_year'},
+         &Apache::lonhtmlcommon::get_date_from_form('revisiondate2');
- 			);
+     if ($mafter > $mbefore) {
-     # Test to see if date windows are legitimate
+         my $tmp = $mafter;
-     if ($datequery=~/^Incorrect/) {
+         $mafter = $mbefore;
- 	&output_date_error($r,$datequery,$closebutton,$hidden_fields);
+         $mbefore = $tmp;
- 	return ;
+     }
-     } elsif ($datequery) {
+     my ($datequery,$error,$prettydate)=&build_date_queries($cafter,$cbefore,
+                                                            $mafter,$mbefore);
+     if (defined($error)) {
+         &output_date_error($r,$error,$closebutton,$hidden_fields);
+     } elsif (defined($datequery)) {
          # Here is where you would set up pretty_search_string to output
          # date query information.
+         $pretty_search_string .= '<br />'.$prettydate.'<br />';
  	push @queries,$datequery;
      }
+     #
      # Process form information for custom metadata querying
      my $customquery=undef;
- #    if ($ENV{'form.custommetadata'}) {
+     ##
- #        $pretty_search_string .=$font."Custom Metadata Search</font>: <b>".
+     ## The custom metadata search was removed q long time ago mostly
- #            $ENV{'form.custommetadata'}."</b><br />\n";
+     ## because I was unable to figureout exactly how it worked and could
- #	$customquery=&build_custommetadata_query('custommetadata',
+     ## not imagine people actually using it.  MH
- #				      $ENV{'form.custommetadata'});
+     ##
- #    }
+     # if ($env{'form.custommetadata'}) {
+     #    $pretty_search_string .=$font."Custom Metadata Search</font>: <b>".
+     #    $env{'form.custommetadata'}."</b><br />\n";
+     #    $customquery=&build_custommetadata_query('custommetadata',
+     #                                             $env{'form.custommetadata'});
+     # }
      my $customshow=undef;
- #    if ($ENV{'form.customshow'}) {
+     # if ($env{'form.customshow'}) {
- #        $pretty_search_string .=$font."Custom Metadata Display</font>: <b>".
+     # $pretty_search_string .=$font."Custom Metadata Display</font>: <b>".
- #            $ENV{'form.customshow'}."</b><br />\n";
+     #                         $env{'form.customshow'}."</b><br />\n";
- #	$customshow=$ENV{'form.customshow'};
+     #    $customshow=$env{'form.customshow'};
- #	$customshow=~s/[^\w\s]//g;
+     #    $customshow=~s/[^\w\s]//g;
- #	my @fields=split(/\s+/,$customshow);
+     #    my @fields=split(/\s+/,$customshow);
- #	$customshow=join(" ",@fields);
+     #    $customshow=join(" ",@fields);
- #    }
+     # }
-     ## ---------------------------------------------------------------
+     ##
      ## Deal with restrictions to given domains
      ##
-     my ($libraries_to_query,$pretty_domains_string) =
+     my ($libraries_to_query,$pretty_domains_string,$domain_sql_restriction) =
          &parse_domain_restrictions();
+     push(@queries,$domain_sql_restriction);
      $pretty_search_string .= $pretty_domains_string."<br />\n";
      #
      if (@queries) {
- 	$query=join(" AND ",@queries);
+ 	$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
- 	$query="select * from metadata where $query";
      } elsif ($customquery) {
          $query = '';
      }
+     #&Apache::lonnet::logthis('advanced query = '.$/.$query);
      return ($query,$customquery,$customshow,$libraries_to_query,
              $pretty_search_string);
  }
  sub parse_domain_restrictions {
      my $libraries_to_query = undef;
-     # $ENV{'form.domains'} can be either a scalar or an array reference.
+     # $env{'form.domains'} can be either a scalar or an array reference.
      # We need an array.
-     if (! exists($ENV{'form.domains'})) {
+     if (! exists($env{'form.domains'}) || $env{'form.domains'} eq '') {
-         return (undef,'');
+         return (undef,'',undef);
-     }
-     my @allowed_domains;
-     if (ref($ENV{'form.domains'})) {
-         @allowed_domains =  @{$ENV{'form.domains'}};
-     } else {
-         @allowed_domains = ($ENV{'form.domains'});
      }
+     my @allowed_domains = &Apache::loncommon::get_env_multiple('form.domains');
+     #
      my %domain_hash = ();
      my $pretty_domains_string;
+     my $domain_sql_restriction;
      foreach (@allowed_domains) {
          $domain_hash{$_}++;
      }
      if ($domain_hash{'any'}) {
          $pretty_domains_string = "In all LON-CAPA domains.";
+         $domain_sql_restriction = undef;
      } else {
          if (@allowed_domains > 1) {
              $pretty_domains_string = "In LON-CAPA domains:";
          } else {
              $pretty_domains_string = "In LON-CAPA domain ";
          }
+         $domain_sql_restriction =
+             '(domain="'.join('" OR domain="',@allowed_domains).'")';
          foreach (sort @allowed_domains) {
              $pretty_domains_string .= "<b>".$_."</b> ";
          }
- Line 1167  sub parse_domain_restrictions {
+ Line 1590  sub parse_domain_restrictions {
              }
          }
      }
-     return ($libraries_to_query,$pretty_domains_string);
+     return ($libraries_to_query,
+             $pretty_domains_string,
+             $domain_sql_restriction);
  }
  ######################################################################
- Line 1185  Parse the basic search form and return a
+ Line 1610  Parse the basic search form and return a
  ######################################################################
  sub parse_basic_search {
      my ($r,$closebutton)=@_;
+     #
      # Clean up fields for safety
      for my $field ('basicexp') {
- 	$ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g;
+ 	$env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-]//g;
      }
      foreach ('mode','form','element') {
  	# is this required?  Hmmm.
- 	next unless (exists($ENV{"form.$_"}));
+ 	next unless (exists($env{"form.$_"}));
- 	$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
+ 	$env{"form.$_"}=&Apache::lonnet::unescape($env{"form.$_"});
- 	$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
+ 	$env{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
      }
-     my ($libraries_to_query,$pretty_domains_string) =
+     my ($libraries_to_query,$pretty_domains_string,$domain_sql_restriction) =
          &parse_domain_restrictions();
-     # Check to see if enough is filled in
+     #
-     unless (&filled($ENV{'form.basicexp'})) {
+     # Check to see if enough of a query is filled in
+     my $search_string = $env{'form.basicexp'};
+     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 $pretty_search_string=$search_string;
-     my $search_string = $ENV{'form.basicexp'};
+     my @Queries;
-     if ($ENV{'form.related'}) {
+     my $searchfield = 'concat_ws(" ",'.join(',',
-         my @New_Words;
+                                             ('title','author','subject',
-         ($search_string,@New_Words) = &related_version($ENV{'form.basicexp'});
+                                              'notes','abstract','keywords')
-         if (@New_Words) {
+                                             ).')';
-             $pretty_search_string .= " with related words: <b>@New_Words</b>.";
+     my ($error,$SQLQuery) = &process_phrase_input($search_string,
-         } else {
+                                                     $env{'form.related'},
-             $pretty_search_string .= " with no related words.";
+                                                     $searchfield);
-         }
+     if ($error) {
+         &output_unparsed_phrase_error($r,$closebutton,'phase=disp_basic',
+                                       '','basicexp');
+         return;
      }
-     # Build SQL query string based on form page
+     push(@Queries,$SQLQuery);
-     my $query='';
+     if (defined($domain_sql_restriction) && $domain_sql_restriction ne '') {
-     my $concatarg=join(',',
+         push(@Queries,$domain_sql_restriction);
- 		       ('title', 'author', 'subject', 'notes', 'abstract',
+     }
-                         'keywords'));
+     #foreach my $q (@Queries) {
-     $concatarg='title' if $ENV{'form.titleonly'};
+     #    &Apache::lonnet::logthis('    '.$q);
-     $query=&build_SQL_query('concat_ws(" ",'.$concatarg.')',$search_string);
+     #}
+     my $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
+     #
      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;
+     $pretty_search_string =~ s:^<br /> and ::;
- #    &Apache::lonnet::logthis($final_query);
+     #&Apache::lonnet::logthis('simple search final query = '.$/.$final_query);
      return ($final_query,$pretty_search_string,
              $libraries_to_query);
  }
+ ###############################################################
+ ###############################################################
+ my @Phrases;
+ sub concat {
+     my ($item) = @_;
+     my $results = '';
+     foreach (@$item) {
+         if (ref($_) eq 'ARRAY') {
+             $results .= join(' ',@$_);
+         }
+     }
+     return $results;
+ }
+ sub process_phrase_input {
+     my ($phrase,$related,$field)=@_;
+     #&Apache::lonnet::logthis('phrase = :'.$phrase.':');
+     my $grammar = <<'ENDGRAMMAR';
+     searchphrase:
+         expression /^\Z/ {
+             # &Apache::lonsearchcat::print_item(\@item,0);
+             [@item];
+         }
+     expression:
+         phrase(s)   {
+             [@item];
+         }
+     phrase:
+         orword {
+             [@item];
+         }
+       | andword {
+             [@item];
+         }
+       | minusword {
+             unshift(@::Phrases,$item[1]->[0]);
+             unshift(@::Phrases,$item[1]->[1]);
+             [@item];
+         }
+       | word {
+             unshift(@::Phrases,$item[1]);
+             [@item];
+         }
+     #
+     orword:
+         word 'OR' phrase {
+             unshift(@::Phrases,'OR');
+             unshift(@::Phrases,$item[1]);
+             [@item];
+         }
+         | word 'or' phrase {
+             unshift(@::Phrases,'OR');
+             unshift(@::Phrases,$item[1]);
+             [@item];
+         }
+         | minusword 'OR' phrase {
+             unshift(@::Phrases,'OR');
+             unshift(@::Phrases,$item[1]->[0]);
+             unshift(@::Phrases,$item[1]->[1]);
+             [@item];
+         }
+         | minusword 'or' phrase {
+             unshift(@::Phrases,'OR');
+             unshift(@::Phrases,$item[1]->[0]);
+             unshift(@::Phrases,$item[1]->[1]);
+             [@item];
+         }
+     andword:
+         word phrase {
+             unshift(@::Phrases,'AND');
+             unshift(@::Phrases,$item[1]);
+             [@item];
+         }
+         | minusword phrase {
+             unshift(@::Phrases,'AND');
+             unshift(@::Phrases,$item[1]->[0]);
+             unshift(@::Phrases,$item[1]->[1]);
+             [@item];
+         }
+     #
+     minusword:
+         '-' word {
+             [$item[2],'NOT'];
+         }
+     word:
+         "'" term(s) "'" {
+           &Apache::lonsearchcat::concat(\@item);
+         }
+       | '"' term(s) '"' {
+           &Apache::lonsearchcat::concat(\@item);
+         }
+       | term {
+             $item[1];
+         }
+     term:
+         /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ {
+             $item[1];
+         }
+ ENDGRAMMAR
+     #
+     # The end result of parsing the phrase with the grammar is an array
+     # @::Phrases.
+     # $phrase = "gene splicing" or cat -> "gene splicing","OR","cat"
+     # $phrase = "genetic engineering" -dna ->
+     #                      "genetic engineering","AND","NOT","dna"
+     # $phrase = cat or dog -poodle -> "cat","OR","dog","AND","NOT","poodle"
+     undef(@::Phrases);
+     my $p = new Parse::RecDescent($grammar);
+     if (! defined($p->searchphrase($phrase))) {
+         &Apache::lonnet::logthis('lonsearchcat:unable to process:'.$phrase);
+         return 'Unable to process phrase '.$phrase;
+     }
+     #
+     # Go through the phrases and make sense of them.
+     # Apply modifiers NOT OR and AND to the phrases.
+     my @NewPhrases;
+     while(@::Phrases) {
+         my $phrase = shift(@::Phrases);
+         # &Apache::lonnet::logthis('phrase = '.$phrase);
+         my $phrasedata;
+         if ($phrase =~ /^(NOT|OR|AND)$/) {
+             if ($phrase eq 'OR') {
+                 $phrasedata->{'or'}++;
+                 if (! @::Phrases) { $phrasedata = undef; last; }
+                 $phrase = shift(@::Phrases);
+             } elsif ($phrase eq 'AND') {
+                 $phrasedata->{'and'}++;
+                 if (! @::Phrases) { $phrasedata = undef; last; }
+                 $phrase = shift(@::Phrases);
+             }
+             if ($phrase eq 'NOT') {
+                 $phrasedata->{'negate'}++;
+                 if (! @::Phrases) { $phrasedata = undef; last; }
+                 $phrase = shift(@::Phrases);
+             }
+         }
+         $phrasedata->{'phrase'} = $phrase;
+         if ($related) {
+             my @NewWords;
+             (undef,@NewWords) = &related_version($phrasedata->{'phrase'});
+             $phrasedata->{'related_words'} = \@NewWords;
+         }
+         push(@NewPhrases,$phrasedata);
+     }
+     #
+     # Actually build the sql query from the phrases
+     my $SQLQuery;
+     foreach my $phrase (@NewPhrases) {
+         my $query;
+         if ($phrase->{'negate'}) {
+             $query .= $field.' NOT LIKE "%'.$phrase->{'phrase'}.'%"';
+         } else {
+             $query .= $field.' LIKE "%'.$phrase->{'phrase'}.'%"';
+         }
+         foreach my $related (@{$phrase->{'related_words'}}) {
+             if ($phrase->{'negate'}) {
+                 $query .= ' AND '.$field.' NOT LIKE "%'.$related.'%"';
+             } else {
+                 $query .= ' OR '.$field.' LIKE "%'.$related.'%"';
+             }
+         }
+         if ($SQLQuery) {
+             if ($phrase->{'or'}) {
+                 $SQLQuery .= ' OR ('.$query.')';
+             } else {
+                 $SQLQuery .= ' AND ('.$query.')';
+             }
+         } else {
+             $SQLQuery = '('.$query.')';
+         }
+     }
+     #
+     # &Apache::lonnet::logthis("SQLQuery = $SQLQuery");
+     #
+     return undef,$SQLQuery;
+ }
  ######################################################################
  ######################################################################
  =pod
- =item &related_version
+ =item &related_version()
  Modifies an input string to include related words.  Words in the string
  are replaced with parenthesized lists of 'OR'd words.  For example
- Line 1249  Note: Using this twice on a string is pr
+ Line 1861  Note: Using this twice on a string is pr
  ######################################################################
  ######################################################################
  sub related_version {
-     my $search_string = shift;
+     my ($word) = @_;
-     my $result = $search_string;
+     return (undef) if (lc($word) =~ /\b(or|and|not)\b/);
-     my %New_Words = ();
+     my @Words = &Apache::loncommon::get_related_words($word);
-     while ($search_string =~ /(\w+)/cg) {
+     # Only use 4 related words
-         my $word = $1;
+     @Words = ($#Words>4? @Words[0..4] : @Words);
-         next if (lc($word) =~ /\b(or|and|not)\b/);
+     my $result = join " OR ", ($word,@Words);
-         my @Words = &Apache::loncommon::get_related_words($word);
+     return $result,sort(@Words);
-         @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));
  }
- ######################################################################
- ######################################################################
- =pod
- =item &build_SQL_query()
- Builds a SQL query string from a logical expression with AND/OR keywords
- using Text::Query and &recursive_SQL_query_builder()
- =cut
- ######################################################################
- ######################################################################
- sub build_SQL_query {
-     my ($field_name,$logic_statement)=@_;
-     my $q=new Text::Query('abc',
- 			  -parse => 'Text::Query::ParseAdvanced',
- 			  -build => 'Text::Query::Build');
-     $q->prepare($logic_statement);
-     my $matchexp=${$q}{'matchexp'}; chomp $matchexp;
-     my $sql_query=&recursive_SQL_query_build($field_name,$matchexp);
-     return $sql_query;
- }
  ######################################################################
  ######################################################################
- Line 1322  sub build_custommetadata_query {
+ Line 1904  sub build_custommetadata_query {
      return $matchexp;
  }
- ######################################################################
- ######################################################################
- =pod
- =item &recursive_SQL_query_build()
- Recursively constructs an SQL query.  Takes as input $dkey and $pattern.
- =cut
- ######################################################################
- ######################################################################
- sub recursive_SQL_query_build {
-     my ($dkey,$pattern)=@_;
-     my @matches=($pattern=~/(\[[^\]|\[]*\])/g);
-     return $pattern unless @matches;
-     foreach my $match (@matches) {
-         $match=~/\[ (\w+)\s(.*) \]/;
-         my ($key,$value)=($1,$2);
-         my $replacement='';
-         if ($key eq 'literal') {
-             $replacement="($dkey LIKE \"\%$value\%\")";
-         } elsif (lc($key) eq 'not') {
-             $value=~s/LIKE/NOT LIKE/;
- #          $replacement="($dkey not like $value)";
-             $replacement="$value";
-         } elsif ($key eq 'and') {
-             $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
-             $replacement="($1 AND $2)";
- 	} elsif ($key eq 'or') {
-             $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
-             $replacement="($1 OR $2)";
- 	}
- 	substr($pattern,
-                index($pattern,$match),
-                length($match),
-                $replacement);
-     }
-     &recursive_SQL_query_build($dkey,$pattern);
- }
  ######################################################################
  ######################################################################
- Line 1379  Also reports errors (check for /^Incorre
+ Line 1920  Also reports errors (check for /^Incorre
  ######################################################################
  ######################################################################
  sub build_date_queries {
-     my ($cmonth1,$cday1,$cyear1,$cmonth2,$cday2,$cyear2,
+     my ($cafter,$cbefore,$mafter,$mbefore) = @_;
- 	$lmonth1,$lday1,$lyear1,$lmonth2,$lday2,$lyear2)=@_;
+     my ($result,$error,$pretty_string);
-     my @queries;
+     #
-     if ($cmonth1 or $cday1 or $cyear1 or $cmonth2 or $cday2 or $cyear2) {
+     # Verify the input
- 	unless ($cmonth1 and $cday1 and $cyear1 and
+     if (! defined($cafter) && ! defined($cbefore) &&
- 		$cmonth2 and $cday2 and $cyear2) {
+         ! defined($mafter) && ! defined($mbefore)) {
- 	    return "Incorrect entry for the creation date.  You must specify ".
+         # This is an okay situation, so return undef for the error
- 		   "a starting month, day, and year and an ending month, ".
+         return (undef,undef,undef);
- 		   "day, and year.";
+     }
- 	}
+     if ((defined($cafter)  && ! defined($cbefore)) ||
- 	my $cnumeric1=sprintf("%d%2d%2d",$cyear1,$cmonth1,$cday1);
+         (defined($cbefore) && ! defined($cafter))) {
- 	$cnumeric1+=0;
+         # This is bad, so let them know
- 	my $cnumeric2=sprintf("%d%2d%2d",$cyear2,$cmonth2,$cday2);
+         $error = &mt('Incorrect entry for the creation date.  '.
- 	$cnumeric2+=0;
+                     'You must specify both the beginning and ending dates.');
- 	if ($cnumeric1>$cnumeric2) {
+     }
- 	    return "Incorrect entry for the creation date.  The starting ".
+     if (! defined($error) &&
- 		   "date must occur before the ending date.";
+         ((defined($mafter)  && ! defined($mbefore)) ||
- 	}
+         (defined($mbefore) && ! defined($mafter)))) {
- 	my $cquery="(creationdate BETWEEN '$cyear1-$cmonth1-$cday1' AND '".
+         # This is also bad, so let them know
- 	           "$cyear2-$cmonth2-$cday2 23:59:59')";
+         $error = &mt('Incorrect entry for the last revision date.  '.
- 	push @queries,$cquery;
+                      'You must specify both the beginning and ending dates.');
-     }
-     if ($lmonth1 or $lday1 or $lyear1 or $lmonth2 or $lday2 or $lyear2) {
- 	unless ($lmonth1 and $lday1 and $lyear1 and
- 		$lmonth2 and $lday2 and $lyear2) {
- 	    return "Incorrect entry for the last revision date.  You must ".
- 		   "specify a starting month, day, and year and an ending ".
- 		   "month, day, and year.";
- 	}
- 	my $lnumeric1=sprintf("%d%2d%2d",$lyear1,$lmonth1,$lday1);
- 	$lnumeric1+=0;
- 	my $lnumeric2=sprintf("%d%2d%2d",$lyear2,$lmonth2,$lday2);
- 	$lnumeric2+=0;
- 	if ($lnumeric1>$lnumeric2) {
- 	    return "Incorrect entry for the last revision date.  The ".
- 		   "starting date must occur before the ending date.";
- 	}
- 	my $lquery="(lastrevisiondate BETWEEN '$lyear1-$lmonth1-$lday1' AND '".
- 	           "$lyear2-$lmonth2-$lday2 23:59:59')";
- 	push @queries,$lquery;
      }
-     if (@queries) {
+     if (! defined($error)) {
- 	return join(" AND ",@queries);
+         #
+         # Build the queries
+         my @queries;
+         if (defined($cbefore) && defined($cafter)) {
+             my (undef,undef,undef,$caday,$camon,$cayear) = localtime($cafter);
+             my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore);
+             # Correct for year being relative to 1900
+             $cayear+=1900; $cbyear+=1900;
+             my $cquery=
+                 '(creationdate BETWEEN '.
+                 "'".$cayear.'-'.$camon.'-'.$caday."'".
+                 ' AND '.
+                 "'".$cbyear.'-'.$cbmon.'-'.$cbday." 23:59:59')";
+             $pretty_string .= '<br />' if (defined($pretty_string));
+             $pretty_string .=
+                 &mt('created between [_1] and [_2]',
+                     &Apache::lonlocal::locallocaltime($cafter),
+                     &Apache::lonlocal::locallocaltime($cbefore+24*60*60-1));
+             push(@queries,$cquery);
+             $pretty_string =~ s/ 00:00:00//g;
+         }
+         if (defined($mbefore) && defined($mafter)) {
+             my (undef,undef,undef,$maday,$mamon,$mayear) = localtime($mafter);
+             my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore);
+             # Correct for year being relative to 1900
+             $mayear+=1900; $mbyear+=1900;
+             my $mquery=
+                 '(lastrevisiondate BETWEEN '.
+                 "'".$mayear.'-'.$mamon.'-'.$maday."'".
+                 ' AND '.
+                 "'".$mbyear.'-'.$mbmon.'-'.$mbday." 23:59:59')";
+             push(@queries,$mquery);
+             $pretty_string .= '<br />' if (defined($pretty_string));
+             $pretty_string .=
+                 &mt('last revised between [_1] and [_2]',
+                     &Apache::lonlocal::locallocaltime($mafter),
+                     &Apache::lonlocal::locallocaltime($mbefore+24*60*60-1));
+             $pretty_string =~ s/ 00:00:00//g;
+         }
+         if (@queries) {
+             $result .= join(" AND ",@queries);
+         }
      }
-     return '';
+     return ($result,$error,$pretty_string);
  }
  ######################################################################
- Line 1433  sub build_date_queries {
+ Line 1996  sub build_date_queries {
  =item &copyright_check()
+ Inputs: $Metadata, a hash pointer of metadata for a resource.
+ Returns: 1 if the resource is available to the user making the query,
+otherwise.
  =cut
  ######################################################################
- Line 1444  sub copyright_check {
+ Line 2012  sub copyright_check {
                                                $Metadata->{'url'});
      # Check for priv
      if (($Metadata->{'copyright'} eq 'priv') &&
-         (($ENV{'user.name'} ne $resname) &&
+         (($env{'user.name'} ne $resname) &&
-          ($ENV{'user.domain'} ne $resdom))) {
+          ($env{'user.domain'} ne $resdom))) {
          return 0;
      }
      # Check for domain
      if (($Metadata->{'copyright'} eq 'domain') &&
-         ($ENV{'user.domain'} ne $resdom)) {
+         ($env{'user.domain'} ne $resdom)) {
          return 0;
      }
      return 1;
  }
  ######################################################################
  ######################################################################
  =pod
- =item &ensure_db_and_table
+ =item &ensure_db_and_table()
  Ensure we can get lonmysql to connect to the database and the table we
  need exists.
- Line 1518  sub ensure_db_and_table {
+ Line 2085  sub ensure_db_and_table {
  =pod
- =item &print_sort_form
+ =item &print_sort_form()
+ The sort feature is not implemented at this time.  This form just prints
+ a link to change the search query.
  =cut
- Line 1526  sub ensure_db_and_table {
+ Line 2096  sub ensure_db_and_table {
  ######################################################################
  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'} ne 'groupsearch');
      ##
      my %SortableFields=&Apache::lonlocal::texthash(
           id        => 'Default',
- Line 1544  sub print_sort_form {
+ Line 2118  sub print_sort_form {
           lastrevisiondate => 'Revision Date'
       );
      ##
-     my $table = $ENV{'form.table'};
+     my $table = $env{'form.table'};
      return if (! &ensure_db_and_table($r,$table));
      ##
      ## Get the number of results
- Line 1558  sub print_sort_form {
+ Line 2132  sub print_sort_form {
          return;
      }
      my $result;
+     my $html=&Apache::lonxml::xmlbegin();
      $result.=<<END;
- <html>
+ $html
  <head>
  <script>
      function change_sort() {
          var newloc = "/adm/searchcat?phase=results";
-         newloc += "&persistent_db_id=$ENV{'form.persistent_db_id'}";
+         newloc += "&persistent_db_id=$env{'form.persistent_db_id'}";
          newloc += "&sortby=";
          newloc += document.forms.statusform.elements.sortby.value;
          parent.resultsframe.location= newloc;
- Line 1579  END
+ Line 2154  END
  #<h2>Sort Results</h2>
  #Sort by: <select size="1" name="sortby" onchange="javascript:change_sort();">
- #    $ENV{'form.sortby'} = 'id' if (! defined($ENV{'form.sortby'}));
+ #    $env{'form.sortby'} = 'id' if (! defined($env{'form.sortby'}));
  #    foreach (keys(%SortableFields)) {
  #        $result.="<option name=\"$_\"";
- #        if ($_ eq $ENV{'form.sortby'}) {
+ #        if ($_ eq $env{'form.sortby'}) {
  #            $result.=" selected ";
  #        }
  #        $result.=" >$SortableFields{$_}</option>\n";
- Line 1619  the following format:
+ Line 2194  the following format:
  #####################################################################
  #####################################################################
+ #
- my @Datatypes =
+ # These should probably be scoped but I don't have time right now...
-     ( { name => 'id',
+ #
-         type => 'MEDIUMINT',
+ my @Datatypes;
-         restrictions => 'UNSIGNED NOT NULL',
+ my @Fullindicies;
-         primary_key  => 'yes',
-         auto_inc     => 'yes' },
-       { name => 'title',     type=>'TEXT'},
-       { name => 'author',    type=>'TEXT'},
-       { name => 'subject',   type=>'TEXT'},
-       { name => 'url',       type=>'TEXT', restrictions => 'NOT NULL' },
-       { name => 'keywords',  type=>'TEXT'},
-       { name => 'version',   type=>'TEXT'},
-       { name => 'notes',     type=>'TEXT'},
-       { name => 'abstract',  type=>'TEXT'},
-       { name => 'mime',      type=>'TEXT'},
-       { name => 'language',  type=>'TEXT'},
-       { name => 'owner',     type=>'TEXT'},
-       { name => 'copyright', type=>'TEXT'},
-       { name => 'dependencies',     type=>'TEXT'},
-       { name => 'modifyinguser', type=>'TEXT'},
-       { name => 'authorspace', type=>'TEXT'},
-       { name => 'lowestgradelevel',  type=>'INT'},
-       { name => 'highestgradelevel', type=>'INT'},
-       { name => 'standards', type=>'TEXT'},
-       { name => 'count',     type=>'INT'},
-       { name => 'course', type=>'INT'},
-       { name => 'course_list',  type=>'TEXT'},
-       { name => 'goto', type=>'INT'},
-       { name => 'goto_list',  type=>'TEXT'},
-       { name => 'comefrom', type=>'INT'},
-       { name => 'comefrom_list',  type=>'TEXT'},
-       { name => 'sequsage', type=>'INT'},
-       { name => 'sequsage_list',  type=>'TEXT'},
-       { name => 'stdno', type=>'INT'},
-       { name => 'stdno_list',  type=>'TEXT'},
-       { name => 'avetries', type=>'FLOAT'},
-       { name => 'avetries_list',  type=>'TEXT'},
-       { name => 'difficulty', type=>'FLOAT'},
-       { name => 'difficulty_list',  type=>'TEXT'},
-       { name => 'clear',  type=>'FLOAT'},
-       { name => 'technical',  type=>'FLOAT'},
-       { name => 'correct',  type=>'FLOAT'},
-       { name => 'helpful',  type=>'FLOAT'},
-       { name => 'depth',  type=>'FLOAT'},
-       { name => 'hostname', type=> 'TEXT'},
-       #--------------------------------------------------
-       { name => 'creationdate',     type=>'DATETIME'},
-       { name => 'lastrevisiondate', type=>'DATETIME'},
-       #--------------------------------------------------
-       );
- my @Fullindicies =
-     qw/title/;
- #    qw/title author subject abstract mime language owner copyright/;
  ######################################################################
  ######################################################################
- Line 1683  my @Fullindicies =
+ Line 2208  my @Fullindicies =
  =item &create_results_table()
  Creates the table of search results by calling lonmysql.  Stores the
- table id in $ENV{'form.table'}
+ table id in $env{'form.table'}
  Inputs: none.
- Line 1693  Returns: the identifier of the table on
+ Line 2218  Returns: the identifier of the table on
  ######################################################################
  ######################################################################
+ sub set_up_table_structure {
+     my ($datatypes,$fullindicies) =
+         &LONCAPA::lonmetadata::describe_metadata_storage();
+     # Copy the table description before modifying it...
+     @Datatypes = @{$datatypes};
+     unshift(@Datatypes,{name => 'id',
+         type => 'MEDIUMINT',
+         restrictions => 'UNSIGNED NOT NULL',
+         primary_key  => 'yes',
+         auto_inc     => 'yes' });
+     @Fullindicies = @{$fullindicies};
+     return;
+ }
  sub create_results_table {
+     &set_up_table_structure();
      my $table = &Apache::lonmysql::create_table
          ( { columns => \@Datatypes,
              FULLTEXT => [{'columns' => \@Fullindicies},],
          } );
      if (defined($table)) {
-         $ENV{'form.table'} = $table;
+         $env{'form.table'} = $table;
          return $table;
      }
      return undef; # Error...
- Line 1750  sub update_status {
+ Line 2290  sub update_status {
      $r->rflush();
  }
+ {
+     my $max_time  = 300;  # seconds for the search to complete
+     my $start_time = 0;
+     my $last_time = 0;
+ sub reset_timing {
+     $start_time = 0;
+     $last_time = 0;
+ }
+ sub time_left {
+     if ($start_time == 0) {
+         $start_time = time;
+     }
+     my $time_left = $max_time - (time - $start_time);
+     $time_left = 0 if ($time_left < 0);
+     return $time_left;
+ }
  sub update_seconds {
-     my ($r,$text) = @_;
+     my ($r) = @_;
-     $text =~ s/\'/\\\'/g;
+     my $time = &time_left();
-     $r->print
+     if (($last_time-$time) > 0) {
-         ("<script>document.statusform.seconds.value = ' $text'</script>\n");
+         $r->print("<script>".
-     $r->rflush();
+                   "document.statusform.seconds.value = '$time'".
+                   "</script>\n");
+         $r->rflush();
+     }
+     $last_time = $time;
+ }
  }
  ######################################################################
- Line 1763  sub update_seconds {
+ Line 2328  sub update_seconds {
  =pod
- =item &revise_button
+ =item &revise_button()
  Inputs: None
- Line 1775  Returns: html string for a 'revise searc
+ Line 2340  Returns: html string for a 'revise searc
  ######################################################################
  sub revise_button {
      my $revise_phase = 'disp_basic';
-     $revise_phase = 'disp_adv' if ($ENV{'form.searchmode'} eq 'advanced');
+     $revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced');
      my $newloc = '/adm/searchcat'.
-         '?persistent_db_id='.$ENV{'form.persistent_db_id'}.
+         '?persistent_db_id='.$env{'form.persistent_db_id'}.
              '&cleargroupsort=1'.
              '&phase='.$revise_phase;
      my $result = qq{<input type="button" value="Revise search" name="revise"} .
- Line 1790  sub revise_button {
+ Line 2355  sub revise_button {
  =pod
- =item &run_search
+ =item &run_search()
+ Executes a search query by sending it the the other servers and putting the
+ results into MySQL.
  =cut
- Line 1799  sub revise_button {
+ Line 2367  sub revise_button {
  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.catalogmode'} ne 'groupsearch');
      my $connection = $r->connection;
      #
-     # Timing variables
-     #
-     my $starttime = time;
-     my $max_time  = 30;  # seconds for the search to complete
-     #
      # Print run_search header
      #
+     my $html=&Apache::lonxml::xmlbegin();
      $r->print(<<END);
- <html>
+ $html
- <head><title>Search Status</title></head>
+ <head>
+ <title>Search Status</title></head>
  $bodytag
  <form name="statusform" action="" method="post">
  <input type="hidden" name="Queue" value="" />
  END
-     # Check to see if $pretty_string has more than one carriage return.
+     # Remove leading and trailing <br />
-     # Assume \n s are following <br /> s and truncate the value.
+     $pretty_string =~ s:^\s*<br />::i;
-     # (there is probably a better way)...
+     $pretty_string =~ s:(<br />)*\s*$::im;
-     my @Lines = split /<br \/>/,$pretty_string;
+     my @Lines = split("<br />",$pretty_string);
+     # I keep getting blank items at the end of the list, hence the following:
+     while ($Lines[-1] =~ /^\s*$/ && @Lines) {
+         pop(@Lines);
+     }
      if (@Lines > 2) {
-         $pretty_string = join '<br \>',(@Lines[0..2],'....<br />');
+         $pretty_string = join '<br />',(@Lines[0..2],'....<br />');
      }
-     $r->print(&mt("Search").": ".$pretty_string);
+     $r->print(&mt("Search: [_1]",$pretty_string));
      $r->rflush();
      #
      # Determine the servers we need to contact.
-     #
      my @Servers_to_contact;
      if (defined($serverlist)) {
          if (ref($serverlist) eq 'ARRAY') {
- Line 1838  END
+ Line 2409  END
          @Servers_to_contact = sort(keys(%Apache::lonnet::libserv));
      }
      my %Server_status;
-     my $table =$ENV{'form.table'};
+     #
+     # Check on the mysql table we will use to store results.
+     my $table =$env{'form.table'};
      if (! defined($table) || $table eq '' || $table =~ /\D/ ) {
          $r->print("Unable to determine table id to store search results in.".
                    "The search has been aborted.</body></html>");
- Line 1848  END
+ Line 2421  END
      if (! defined($table_status)) {
          $r->print("Unable to determine status of table.</body></html>");
          &Apache::lonnet::logthis("Bogus table id of $table for ".
-                                  "$ENV{'user.name'} @ $ENV{'user.domain'}");
+                                  "$env{'user.name'} @ $env{'user.domain'}");
          &Apache::lonnet::logthis("lonmysql error = ".
                                   &Apache::lonmysql::get_error());
          return;
      }
      if (! $table_status) {
+         &Apache::lonnet::logthis("lonmysql error = ".
+                                  &Apache::lonmysql::get_error());
+         &Apache::lonnet::logthis("lonmysql debug = ".
+                                  &Apache::lonmysql::get_debug());
+         &Apache::lonnet::logthis('table status = "'.$table_status.'"');
          $r->print("The table id,$table, we tried to use is invalid.".
                    "The search has been aborted.</body></html>");
          return;
      }
      ##
      ## Prepare for the big loop.
-     ##
      my $hitcountsum;
      my $server;
      my $status;
- Line 1869  END
+ Line 2446  END
  <table>
  <tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr>
  <tr>
- <td><input type="text" name="status"  value="" size="30" /></td>
+ <td><input type="text" name="status"  value="" size="50" /></td>
  <td><input type="text" name="count"   value="" size="10" /></td>
  <td><input type="text" name="seconds" value="" size="8" /></td>
  <td>$revise</td>
- Line 1878  END
+ Line 2455  END
  </form>
  END
      $r->rflush();
-     my $time_remaining = $max_time - (time - $starttime) ;
+     &reset_timing();
-     my $last_time = $time_remaining;
+     &update_seconds($r);
-     &update_seconds($r,$time_remaining);
+     &update_status($r,&mt('contacting [_1]',$Servers_to_contact[0]));
-     &update_status($r,'contacting '.$Servers_to_contact[0]);
+     while (&time_left() &&
-     while (($time_remaining > 0) &&
             ((@Servers_to_contact) || keys(%Server_status))) {
-         # Send out a search request if it needs to be done.
+         &update_seconds($r);
+         #
+         # Send out a search request
          if (@Servers_to_contact) {
              # Contact one server
              my $server = shift(@Servers_to_contact);
-             &update_status($r,&mt('contacting').' '.$server);
+             &update_status($r,&mt('contacting [_1]',$server));
              my $reply=&Apache::lonnet::metadata_query($query,$customquery,
                                                        $customshow,[$server]);
              ($server) = keys(%$reply);
- Line 1900  END
+ Line 2478  END
              # left to contact.
              if (scalar (keys(%Server_status))) {
                  &update_status($r,
-                        &mt('waiting on').' '.(join(' ',keys(%Server_status))));
+                        &mt('waiting on [_1]',join(' ',keys(%Server_status))));
              }
              sleep(1);
          }
          #
-         #
          # Loop through the servers we have contacted but do not
          # have results from yet, looking for results.
-         while (my ($server,$status) = each(%Server_status)) {
+         foreach my $server (keys(%Server_status)) {
              last if ($connection->aborted());
+             &update_seconds($r);
+             my $status = $Server_status{$server};
              if ($status eq 'con_lost') {
                  delete ($Server_status{$server});
                  next;
              }
-             $status=~/^([\.\w]+)$/;
+             $status=~s|/||g;
-        	    my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;
+        	    my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$status;
              if (-e $datafile && ! -e "$datafile.end") {
-                 &update_status($r,&mt('Receiving results from').' '.$server);
+                 &update_status($r,&mt('Receiving results from [_1]',$server));
                  next;
              }
              last if ($connection->aborted());
              if (-e "$datafile.end") {
-                 &update_status($r,&mt('Reading results from').' '.$server);
+                 &update_status($r,&mt('Reading results from [_1]',$server));
                  if (-z "$datafile") {
                      delete($Server_status{$server});
                      next;
- Line 1937  END
+ Line 2516  END
                  # Read in the whole file.
                  while (my $result = <$fh>) {
                      last if ($connection->aborted());
-                     # handle custom fields?  Someday we will!
+                     #
+                     # Records are stored one per line
                      chomp($result);
-                     next unless $result;
+                     next if (! $result);
+                     #
                      # Parse the result.
                      my %Fields = &parse_raw_result($result,$server);
                      $Fields{'hostname'} = $server;
+                     #
+                     # Skip if external and we did not want that
+                     next if ((! $env{'form.inclext'}) && ($Fields{'url'}=~/^\/ext\//));
+                     # Skip based on copyright
                      next if (! &copyright_check(\%Fields));
+                     #
                      # Store the result in the mysql database
                      my $result = &Apache::lonmysql::store_row($table,\%Fields);
                      if (! defined($result)) {
                          $r->print(&Apache::lonmysql::get_error());
                      }
-                     # $r->print(&Apache::lonmysql::get_debug());
+                     #
                      $hitcountsum ++;
-                     $time_remaining = $max_time - (time - $starttime) ;
+                     &update_seconds($r);
-                     if ($last_time - $time_remaining > 0) {
-                         &update_seconds($r,$time_remaining);
-                         $last_time = $time_remaining;
-                     }
                      if ($hitcountsum % 50 == 0) {
                          &update_count_status($r,$hitcountsum);
                      }
-                 } # End of foreach (@results)
+                 }
                  $fh->close();
                  # $server is only deleted if the results file has been
                  # found and (successfully) opened.  This may be a bad idea.
- Line 1969  END
+ Line 2552  END
              &update_count_status($r,$hitcountsum);
          }
          last if ($connection->aborted());
-         # Finished looping through the servers
+         &update_seconds($r);
-         $starttime = time if (@Servers_to_contact);
-         $time_remaining = $max_time - (time - $starttime) ;
-         if ($last_time - $time_remaining > 0) {
-             $last_time = $time_remaining;
-             &update_seconds($r,$time_remaining);
-         }
      }
-     &update_status($r,&mt('Search Complete').$server);
+     &update_status($r,&mt('Search Complete [_1]',$server));
-     &update_seconds($r,0);
+     &update_seconds($r);
-     &Apache::lonmysql::disconnect_from_db();
+     #
+     &Apache::lonmysql::disconnect_from_db(); # This is unneccessary
+     #
      # We have run out of time or run out of servers to talk to and
-     # results to get.
+     # 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'}';".
+                       "persistent_db_id=$env{'form.persistent_db_id'}';".
                    "</script>");
-     }
+ #    }
      return;
  }
  ######################################################################
  ######################################################################
  =pod
- =item &prev_next_buttons
+ =item &prev_next_buttons()
+ Returns html for the previous and next buttons on the search results page.
  =cut
- Line 2006  END
+ Line 2589  END
  sub prev_next_buttons {
      my ($current_min,$show,$total,$parms) = @_;
      return '' if ($show eq 'all'); # No links if you get them all at once.
-     my $links;
+     #
-     ##
+     # Create buttons
-     ## Prev
+     my $buttons = '<input type="submit" name="prev" value="'.&mt('Prev').'" ';
-     my $prev_min = $current_min - $show;
+     $buttons .= '/>';
-     $prev_min = 1 if $prev_min < 1;
+     $buttons .= '&nbsp;'x3;
-     if ($prev_min < $current_min) {
+     $buttons .= '<input type="submit" name="reload" '.
-         $links .= qq{
+         'value="'.&mt('Reload').'" />';
- <a href="/adm/searchcat?$parms&start=$prev_min&show=$show">prev</a>
+     $buttons .= '&nbsp;'x3;
- };
+     $buttons .= '<input type="submit" name="next" value="'.&mt('Next').'" ';
-     } else {
+     $buttons .= '/>';
-         $links .= 'prev';
+     return $buttons;
-     }
-     ##
-     ## Pages.... Someday.
-     ##
-     $links .= qq{ &nbsp;
- <a href="/adm/searchcat?$parms&start=$current_min&$show=$show">reload</a>
- };
-     ##
-     ## Next
-     my $next_min = $current_min + $show;
-     $next_min = $current_min if ($next_min > $total);
-     if ($next_min != $current_min) {
-         $links .= qq{ &nbsp;
- <a href="/adm/searchcat?$parms&start=$next_min&show=$show">next</a>
- };
-     } else {
-         $links .= '&nbsp;next';
-     }
-     return $links;
  }
  ######################################################################
  ######################################################################
  =pod
- =item &display_results
+ =item &display_results()
+ Prints the results out for selection and perusal.
  =cut
- Line 2055  sub display_results {
+ Line 2622  sub display_results {
      ##
      ## Set viewing function
      ##
-     my $viewfunction = $Views{$ENV{'form.viewselect'}};
+     my $viewfunction = $Views{$env{'form.viewselect'}};
      if (!defined($viewfunction)) {
          $r->print("Internal Error - Bad view selected.\n");
          $r->rflush();
- Line 2070  sub display_results {
+ Line 2637  sub display_results {
      ##
      my $action = "/adm/searchcat?phase=results";
      ##
-     ## Deal with groupsearch
+     ## Deal with groupsearch by opening the groupsearch db file.
-     ##
+     if ($env{'form.catalogmode'} eq 'groupsearch') {
-     if ($ENV{'form.catalogmode'} eq 'groupsearch') {
          if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
                    &GDBM_WRCREAT(),0640)) {
              $r->print('Unable to store import results.</form></body></html>');
- Line 2082  sub display_results {
+ Line 2648  sub display_results {
      }
      ##
      ## Prepare the table for querying
-     ##
+     my $table = $env{'form.table'};
-     my $table = $ENV{'form.table'};
      return if (! &ensure_db_and_table($r,$table));
      ##
      ## Get the number of results
-     ##
      my $total_results = &Apache::lonmysql::number_of_rows($table);
      if (! defined($total_results)) {
          $r->print("A MySQL error has occurred.</form></body></html>");
- Line 2098  sub display_results {
+ Line 2662  sub display_results {
      }
      ##
      ## Determine how many results we need to get
-     ##
+     $env{'form.start'} = 1  if (! exists($env{'form.start'}));
-     $ENV{'form.start'} = 1      if (! exists($ENV{'form.start'}));
+     $env{'form.show'}  = 20 if (! exists($env{'form.show'}));
-     $ENV{'form.show'}  = 'all'  if (! exists($ENV{'form.show'}));
+     if (exists($env{'form.prev'})) {
-     my $min = $ENV{'form.start'};
+         $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') {
+     if ($env{'form.show'} eq 'all') {
          $max = $total_results ;
      } else {
-         $max = $min + $ENV{'form.show'} - 1;
+         $max = $min + $env{'form.show'} - 1;
          $max = $total_results if ($max > $total_results);
      }
      ##
-     ## Output links (if necessary) for 'prev' and 'next' pages.
+     ## Output form elements
+     $r->print(&hidden_field('table').
+               &hidden_field('phase').
+               &hidden_field('persistent_db_id').
+               &hidden_field('start')
+               );
+     #
+     # Build sorting selector
+     my @fields =
+         (
+          {key=>'default' },
+          {key=>'title' },
+          {key =>'author' },
+          {key =>'subject'},
+          {key =>'url',desc=>'URL'},
+          {key =>'keywords'},
+          {key =>'language'},
+          {key =>'creationdate'},
+          {key =>'lastrevisiondate'},
+          {key =>'owner'},
+          {key =>'copyright'},
+          {key =>'authorspace'},
+          {key =>'lowestgradelevel'},
+          {key =>'highestgradelevel'},
+          {key =>'standards',desc=>'Standards'},
+          {key =>'count',desc=>'Number of accesses'},
+          {key =>'stdno',desc=>'Students Attempting'},
+          {key =>'avetries',desc=>'Average Number of Tries'},
+          {key =>'difficulty',desc=>'Mean Degree of Difficulty'},
+          {key =>'disc',desc=>'Mean Degree of Discrimination'},
+          {key =>'clear',desc=>'Evaluation: Clear'},
+          {key =>'technical',desc=>'Evaluation: Technically Correct'},
+          {key =>'correct',desc=>'Evaluation: Material is Correct'},
+          {key =>'helpful',desc=>'Evaluation: Material is Helpful'},
+          {key =>'depth',desc=>'Evaluation: Material has Depth'},
+          );
+     my %fieldnames = &Apache::lonmeta::fieldnames();
+     my @field_order;
+     foreach my $field_data (@fields) {
+         push(@field_order,$field_data->{'key'});
+         if (! exists($field_data->{'desc'})) {
+             $field_data->{'desc'}=$fieldnames{$field_data->{'key'}};
+         } else {
+             if (! defined($field_data->{'desc'})) {
+                 $field_data->{'desc'} = ucfirst($field_data->{'key'});
+             }
+             $field_data->{'desc'} = &mt($field_data->{'desc'});
+         }
+     }
+     my %sort_fields = map {$_->{'key'},$_->{'desc'}} @fields;
+     $sort_fields{'select_form_order'} = \@field_order;
+     $env{'form.sortorder'} = 'desc' if (! exists($env{'form.sortorder'}));
+     $env{'form.sortfield'} = 'count' if (! exists($env{'form.sortfield'}));
+     if (! exists($env{'form.sortorder'})) {
+ 	if ($env{'form.sortfield'}=~/^(count|stdno|disc|clear|technical|correct|helpful)$/) {
+ 	    $env{'form.sortorder'}='desc';
+ 	} else {
+ 	    $env{'form.sortorder'}='asc';
+ 	}
+     }
+     my $sortform = &mt('Sort by [_1] [_2]',
+                        &Apache::loncommon::select_form($env{'form.sortfield'},
+                                                       'sortfield',
+                                                       %sort_fields),
+                        &Apache::loncommon::select_form($env{'form.sortorder'},
+                                                       'sortorder',
+                                                       (asc =>&mt('Ascending'),
+                                                        desc=>&mt('Descending')
+                                                        ))
+                        );
      ##
+     ## Output links (if necessary) for 'prev' and 'next' pages.
      $r->print
-         ('<center>'.
+         ('<table width="100%"><tr><td width="25%" align="right">'.
-          &prev_next_buttons($min,$ENV{'form.show'},$total_results,
+          '<nobr>'.$sortform.'</nobr>'.
-                             "table=".$ENV{'form.table'}.
+          '</td><td width="25%" align="right">'.
-                             "&phase=results".
+          &prev_next_buttons($min,$env{'form.show'},$total_results).
-                             "&persistent_db_id=".$ENV{'form.persistent_db_id'})
+          '</td><td align="right">'.
-          ."</center>\n"
+          &viewoptions().'</td></tr></table>'
           );
      if ($total_results == 0) {
-         $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="1">'.
+         $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2">'.
                    '<h3>'.&mt('There are currently no results').'.</h3>'.
                    "</form></body></html>");
          return;
      } else {
-         $r->print
+         $r->print('<center>'.
-             ("<center>Results $min to $max out of $total_results</center>\n");
+                   mt('Results [_1] to [_2] out of [_3]',
+                      $min,$max,$total_results).
+                   "</center>\n");
      }
      ##
      ## Get results from MySQL table
-     ##
+     my $sort_command  = 'id>='.$min.' AND id<='.$max;
-     my @Results = &Apache::lonmysql::get_rows($table,
+     my $order;
-                                               'id>='.$min.' AND id<='.$max);
+     if (exists($env{'form.sortorder'})) {
+         if ($env{'form.sortorder'} eq 'asc') {
+             $order = 'ASC';
+         } elsif ($env{'form.sortorder'} eq 'desc') {
+             $order = 'DESC';
+         } else {
+             $order = '';
+         }
+     } else {
+         $order = '';
+     }
+     if ($env{'form.sortfield'} ne 'default' &&
+         exists($sort_fields{$env{'form.sortfield'}})) {
+         $sort_command = $env{'form.sortfield'}.' IS NOT NULL '.
+             'ORDER BY '.$env{'form.sortfield'}.' '.$order.
+             '  LIMIT '.($min-1).','.($max-$min+1);
+     }
+     my @Results = &Apache::lonmysql::get_rows($table,$sort_command);
      ##
      ## Loop through the results and output them.
-     ##
      foreach my $row (@Results) {
          if ($connection->aborted()) {
              &cleanup();
- Line 2144  sub display_results {
+ Line 2802  sub display_results {
          }
          my %Fields = %{&parse_row(@$row)};
          my $output="<p>\n";
+         if (! defined($Fields{'title'}) || $Fields{'title'} eq '') {
+             $Fields{'title'} = 'Untitled';
+         }
          my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'},
                                         $Fields{'id'},$checkbox_num++);
          # Render the result into html
- Line 2157  sub display_results {
+ Line 2818  sub display_results {
      } else {
          $r->print
              ('<center>'.
-              &prev_next_buttons($min,$ENV{'form.show'},$total_results,
+              &prev_next_buttons($min,$env{'form.show'},$total_results,
-                                 "table=".$ENV{'form.table'}.
+                                 "table=".$env{'form.table'}.
                                  "&phase=results".
                                  "&persistent_db_id=".
-                                 $ENV{'form.persistent_db_id'})
+                                 $env{'form.persistent_db_id'})
               ."</center>\n"
               );
      }
- Line 2179  sub display_results {
+ Line 2840  sub display_results {
  =item &catalogmode_output($title,$url,$fnum,$checkbox_num)
  Returns html needed for the various catalog modes.  Gets inputs from
- $ENV{'form.catalogmode'}.  Stores data in %groupsearch_db.
+ $env{'form.catalogmode'}.  Stores data in %groupsearch_db.
  =cut
- Line 2188  $ENV{'form.catalogmode'}.  Stores data i
+ Line 2849  $ENV{'form.catalogmode'}.  Stores data i
  sub catalogmode_output {
      my $output = '';
      my ($title,$url,$fnum,$checkbox_num) = @_;
-     if ($ENV{'form.catalogmode'} eq 'interactive') {
+     if ($env{'form.catalogmode'} eq 'interactive') {
          $title=~ s/\'/\\\'/g;
-         if ($ENV{'form.catalogmode'} eq 'interactive') {
+         if ($env{'form.catalogmode'} eq 'interactive') {
              $output.=<<END
  <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
  onClick="javascript:select_data('$title','$url')">
  </font>
  END
          }
-     } elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
+     } elsif ($env{'form.catalogmode'} eq 'groupsearch') {
          $groupsearch_db{"pre_${fnum}_link"}=$url;
          $groupsearch_db{"pre_${fnum}_title"}=$title;
          $output.=<<END;
- Line 2214  END
+ Line 2875  END
  =pod
- =item &parse_row
+ =item &parse_row()
  Parse a row returned from the database.
- Line 2225  Parse a row returned from the database.
+ Line 2886  Parse a row returned from the database.
  sub parse_row {
      my @Row = @_;
      my %Fields;
+     if (! scalar(@Datatypes)) {
+         &set_up_table_structure();
+     }
      for (my $i=0;$i<=$#Row;$i++) {
          $Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]);
      }
- Line 2260  The 'title' field is set to "Untitled" i
+ Line 2924  The 'title' field is set to "Untitled" i
  ###########################################################
  sub parse_raw_result {
      my ($result,$hostname) = @_;
- # conclude from self to others regarding fields
+     # conclude from self to others regarding fields
-     my %Fields=&Apache::lonmeta::metadata_col_to_hash(
+     my %Fields=&LONCAPA::lonmetadata::metadata_col_to_hash
- 						map {
+         (map {
- 						 &Apache::lonnet::unescape($_);
+             &Apache::lonnet::unescape($_);
- 						} (split(/\,/,$result))
+         } (split(/\,/,$result)) );
- 						      );
      return %Fields;
  }
- Line 2285  sub handle_custom_fields {
+ Line 2948  sub handle_custom_fields {
      my $customshow='';
      my $extrashow='';
      my @customfields;
-     if ($ENV{'form.customshow'}) {
+     if ($env{'form.customshow'}) {
-         $customshow=$ENV{'form.customshow'};
+         $customshow=$env{'form.customshow'};
          $customshow=~s/[^\w\s]//g;
          my @fields=map {
              "<font color=\"#008000\">$_:</font><!-- $_ -->";
- Line 2315  sub handle_custom_fields {
+ Line 2978  sub handle_custom_fields {
  =pod
- =item &search_results_header
+ =item &search_results_header()
  Output the proper html headers and javascript code to deal with different
  calling modes.
- Takes most inputs directly from %ENV, except $mode.
+ Takes most inputs directly from %env, except $mode.
  =over 4
- Line 2365  sub search_results_header {
+ Line 3028  sub search_results_header {
      # output beginning of search page
      # conditional output of script functions dependent on the mode in
      # which the search was invoked
-     if ($ENV{'form.catalogmode'} eq 'interactive'){
+     if ($env{'form.catalogmode'} eq 'interactive'){
- 	if (! exists($ENV{'form.mode'}) || $ENV{'form.mode'} ne 'edit') {
+ 	if (! exists($env{'form.mode'}) || $env{'form.mode'} ne 'edit') {
              $result.=<<SCRIPT;
  <script type="text/javascript">
      function select_data(title,url) {
- Line 2386  sub search_results_header {
+ Line 3049  sub search_results_header {
      }
  </script>
  SCRIPT
-         } elsif ($ENV{'form.mode'} eq 'edit') {
+         } elsif ($env{'form.mode'} eq 'edit') {
-             my $form = $ENV{'form.form'};
+             my $form = $env{'form.form'};
-             my $element = $ENV{'form.element'};
+             my $element = $env{'form.element'};
-             my $titleelement = $ENV{'form.titleelement'};
+             my $titleelement = $env{'form.titleelement'};
  	    my $changetitle;
  	    if (!$titleelement) {
  		$changetitle='function changeTitle(val) {}';
- Line 2426  function changeURL(val) {
+ Line 3089  function changeURL(val) {
  SCRIPT
          }
      }
-     $result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch';
+     $result.=<<SCRIPT if $env{'form.catalogmode'} eq 'groupsearch';
  <script type="text/javascript">
      function queue(checkbox_num,val) {
          if (document.forms.results.returnvalues.length != "undefined" &&
- Line 2446  SCRIPT
+ Line 3109  SCRIPT
      }
      function select_group() {
  	parent.window.location=
-     "/adm/groupsort?mode=$ENV{'form.mode'}&catalogmode=groupsearch&acts="+
+     "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=groupsearch&acts="+
  	    parent.statusframe.document.forms.statusform.elements.Queue.value;
      }
  </script>
- Line 2454  SCRIPT
+ Line 3117  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
- Line 2465  END
+ Line 3128  END
  ######################################################################
  sub search_status_header {
      my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+     my $html=&Apache::lonxml::xmlbegin();
      return <<ENDSTATUS;
- <html><head><title>Search Status</title></head>
+ $html
+ <head>
+ <title>Search Status</title></head>
  $bodytag
  <h3>Search Status</h3>
  Sending search request to LON-CAPA servers.<br />
- Line 2474  ENDSTATUS
+ Line 3140  ENDSTATUS
  }
  sub results_link {
-     my $basic_link   = "/adm/searchcat?"."&table=".$ENV{'form.table'}.
+     my $basic_link   = "/adm/searchcat?"."&table=".$env{'form.table'}.
-         "&persistent_db_id=".$ENV{'form.persistent_db_id'};
+         "&persistent_db_id=".$env{'form.persistent_db_id'};
      my $results_link = $basic_link."&phase=results".
          "&pause=1"."&start=1";
      return $results_link;
- Line 2485  sub results_link {
+ Line 3151  sub results_link {
  ######################################################################
  sub print_frames_interface {
      my $r = shift;
-     my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}.
+     my $basic_link = "/adm/searchcat?"."&table=".$env{'form.table'}.
-         "&persistent_db_id=".$ENV{'form.persistent_db_id'};
+         "&persistent_db_id=".$env{'form.persistent_db_id'};
      my $run_search_link = $basic_link."&phase=run_search";
      my $results_link = &results_link();
+     my $html=&Apache::lonxml::xmlbegin();
      my $result = <<"ENDFRAMES";
- <html>
+ $html
  <head>
  <script>
  var targetwin = opener;
- Line 2512  ENDFRAMES
+ Line 3179  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
  Output is a HTML-ified string.
  Input arguments are title, author, subject, url, keywords, version,
  notes, short abstract, mime, language, creation date,
  last revision date, owner, copyright, hostname, and
- Line 2532  extra custom metadata to show.
+ Line 3235  extra custom metadata to show.
  ######################################################################
  sub detailed_citation_view {
      my ($prefix,%values) = @_;
-     my $icon=&Apache::loncommon::icon($values{'url'});
+     my $result;
-     my $result=<<END;
+     my $jumpurl=$values{'url'};
- <b>$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
+     $jumpurl=~s/^\/ext\//http\:\/\//;
-     target='search_preview'>$values{'title'}</a></b>
+     $result .= '<b>'.$prefix.
- <p>
+         '<img src="'.&Apache::loncommon::icon($values{'url'}).' " />'.'&nbsp;'.
- <b>$values{'author'}</b>, <i>$values{'owner'}</i><br />
+         '<a href="'.$jumpurl.'" '.
+         'target="search_preview">'.$values{'title'}."</a></b>\n";
- <b>Subject:       </b> $values{'subject'}<br />
+     $result .= "<p>\n";
- <b>Keyword(s):    </b> $values{'keywords'}<br />
+     $result .= '<b>'.$values{'author'}.'</b>,'.
- <b>Notes:         </b> $values{'notes'}<br />
+         ' <i>'.$values{'owner'}.'</i><br />';
- <b>MIME Type:     </b> $values{'mimetag'}<br />
+     foreach my $field
- <b>Language:      </b> $values{'language'}<br />
+         (
- <b>Copyright/Distribution:</b> $values{'copyrighttag'}<br />
+          { name=>'url',
- </p>
+            translate => '<b>URL:</b>&nbsp;[_1]',
- $values{'extrashow'}
+            special => 'url link',},
- <p>
+          { name=>'subject',
- $values{'shortabstract'}
+            translate => '<b>Subject:</b>&nbsp;[_1]',},
- </p>
+          { name=>'keywords',
- <hr align='left' width='200' noshade />
+            translate => '<b>Keywords:</b>&nbsp;[_1]',},
- END
+          { 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=>'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',
+            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',},
+          ) {
+         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="'.$jumpurl.'">'.$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="'.$jumpurl.'" '.
+                          'target="search_preview">'.
+                          $values{$field->{'name'}}.
+                          '</a>');
+             } else {
+                 $result.= &mt($field->{'translate'},
+                               $values{$field->{'name'}});
+             }
+             $result .= "<br />\n";
+         }
+     }
+     $result .= "</p>";
+     if (exists($values{'extrashow'}) && $values{'extrashow'} ne '') {
+         $result .= '<p>'.$values{'extrashow'}.'</p>';
+     }
+     if (exists($values{'shortabstract'}) && $values{'shortabstract'} ne '') {
+         $result .= '<p>'.$values{'shortabstract'}.'</p>';
+     }
+     $result .= '<hr align="left" width="200" noshade />'."\n";
      return $result;
  }
- Line 2568  END
+ Line 3355  END
  sub summary_view {
      my ($prefix,%values) = @_;
      my $icon=&Apache::loncommon::icon($values{'url'});
-     my $result=<<END;
+     my $result=qq{$prefix<img src="$icon" />};
- $prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
+     if (exists($env{'form.sortfield'}) &&
-    target='search_preview'>$values{'author'}</a><br />
+         $env{'form.sortfield'} !~ /^(default|
- $values{'title'}<br />
+                                      author|
- $values{'owner'} -- $values{'lastrevisiondate'}<br />
+                                      url|
+                                      title|
+                                      owner|
+                                      lastrevisiondate|
+                                      copyright)$/x) {
+         my $tmp = $values{$env{'form.sortfield'}};
+         if (! defined($tmp)) { $tmp = 'undefined'; }
+         $result .= '&nbsp;'.$tmp.'&nbsp;';
+     }
+     my $jumpurl=$values{'url'};
+     $jumpurl=~s/^\/ext\//http\:\/\//;
+     $result.=<<END;
+ <a href="$jumpurl"
+    target='search_preview'>$values{'title'}</a><br />
+ $values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
  $values{'copyrighttag'}<br />
  $values{'extrashow'}
  </p>
- Line 2594  END
+ Line 3396  END
  ######################################################################
  sub compact_view {
      my ($prefix,%values) = @_;
-     my $icon=&Apache::loncommon::icon($values{'url'});
+     my $jumpurl=$values{'url'};
-     my $result=<<END;
+     $jumpurl=~s/^\/ext\//http\:\/\//;
- $prefix <img src="$icon" /> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"  target='search_preview'>
- $values{'title'}</a>
+     my $result =
- <b>$values{'author'}</b><br />
+         $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">';
- END
+     if (exists($env{'form.sortfield'}) &&
+         $env{'form.sortfield'} !~ /^(default|author|url|title)$/) {
+         my $tmp = $values{$env{'form.sortfield'}};
+         if (! defined($tmp)) { $tmp = 'undefined'; }
+         $result .= '&nbsp;'.$tmp.'&nbsp;';
+     }
+     $result.='&nbsp;<a href="'.$jumpurl.'" target="search_preview">'.
+         $values{'title'}.'</a>'.('&nbsp;'x2).
+         '<b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />';
      return $result;
  }
- Line 2618  END
+ Line 3428  END
  sub fielded_format_view {
      my ($prefix,%values) = @_;
      my $icon=&Apache::loncommon::icon($values{'url'});
+     my %Translated = &Apache::lonmeta::fieldnames();
+     my $jumpurl=$values{'url'};
+     $jumpurl=~s/^\/ext\//http\:\/\//;
      my $result=<<END;
  $prefix <img src="$icon" />
- <b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
+ <dl>
-               target='search_preview'>$values{'url'}</a>
+ <dt>URL:</dt>
- <br />
+     <dd><a href="$jumpurl"
- <b>Title:</b> $values{'title'}<br />
+          target='search_preview'>$values{'url'}</a></dd>
- <b>Author(s):</b> $values{'author'}<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>Creation Date:</b> $values{'creationdate'}<br />
- <b>Last Revision Date:</b> $values{'lastrevisiondate'}<br />
- <b>Publisher/Owner:</b> $values{'owner'}<br />
- <b>Copyright/Distribution:</b> $values{'copyrighttag'}<br />
- <b>Repository Location:</b> $values{'hostname'}<br />
- <b>Abstract:</b> $values{'shortabstract'}<br />
- $values{'extrashow'}
- </p>
- <hr align='left' width='200' noshade />
  END
+     foreach my $field ('title','author','domain','subject','keywords','notes',
+                        'mimetag','language','creationdate','lastrevisiondate',
+                        'owner','copyrighttag','hostname','abstract') {
+         $result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n".
+             (' 'x8).'<dd>'.$values{$field}.'</dd>'."\n";
+     }
+     if (&has_stat_data(\%values)) {
+         foreach my $field (&statfields()) {
+             $result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n".
+                 (' 'x8).'<dd>'.$values{$field}.'</dd>'."\n";
+         }
+     }
+     if (&has_eval_data(\%values)) {
+         foreach my $field (&evalfields()) {
+             $result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n".
+                 (' 'x8).'<dd>'.$values{$field}.'</dd>'."\n";
+         }
+     }
+     $result .= "</dl>\n";
+     $result .= $values{'extrashow'};
+     $result .= '<hr align="left" width="200" noshade />'."\n";
      return $result;
  }
- Line 2658  END
+ Line 3478  END
  ######################################################################
  sub xml_sgml_view {
      my ($prefix,%values) = @_;
+     my $xml = '<LonCapaResource>'."\n";
+     # The usual suspects
+     foreach my $field ('url','title','author','subject','keywords','notes','domain') {
+         $xml .= qq{<$field>$values{$field}</$field>}."\n";
+     }
+     #
+     $xml .= "<mimeInfo>\n";
+     foreach my $field ('mime','mimetag') {
+         $xml .= qq{<$field>$values{$field}</$field>}."\n";
+     }
+     $xml .= "</mimeInfo>\n";
+     #
+     $xml .= "<languageInfo>\n";
+     foreach my $field ('language','languagetag') {
+         $xml .= qq{<$field>$values{$field}</$field>}."\n";
+     }
+     $xml .= "</languageInfo>\n";
+     #
+     foreach my $field ('creationdate','lastrevisiondate','owner') {
+         $xml .= qq{<$field>$values{$field}</$field>}."\n";
+     }
+     #
+     $xml .= "<copyrightInfo>\n";
+     foreach my $field ('copyright','copyrighttag') {
+         $xml .= qq{<$field>$values{$field}</$field>}."\n";
+     }
+     $xml .= "</copyrightInfo>\n";
+     $xml .= qq{<repositoryLocation>$values{'hostname'}</repositoryLocation>}.
+         "\n";
+     $xml .= qq{<shortabstract>$values{'shortabstract'}</shortabstract>}."\n";
+     #
+     if (&has_stat_data(\%values)){
+         $xml .= "<problemstatistics>\n";
+         foreach my $field (&statfields()) {
+             $xml .= qq{<$field>$values{$field}</$field>}."\n";
+         }
+         $xml .= "</problemstatistics>\n";
+     }
+     #
+     if (&has_eval_data(\%values)) {
+         $xml .= "<evaluation>\n";
+         foreach my $field (&evalfields) {
+             $xml .= qq{<$field>$values{$field}</$field>}."\n";
+         }
+         $xml .= "</evaluation>\n";
+     }
+     #
+     $xml .= "</LonCapaResource>\n";
+     $xml = &HTML::Entities::encode($xml,'<>&');
      my $result=<<END;
  $prefix
  <pre>
- &lt;LonCapaResource&gt;
+ $xml
- &lt;url&gt;$values{'url'}&lt;/url&gt;
- &lt;title&gt;$values{'title'}&lt;/title&gt;
- &lt;author&gt;$values{'author'}&lt;/author&gt;
- &lt;subject&gt;$values{'subject'}&lt;/subject&gt;
- &lt;keywords&gt;$values{'keywords'}&lt;/keywords&gt;
- &lt;notes&gt;$values{'notes'}&lt;/notes&gt;
- &lt;mimeInfo&gt;
- &lt;mime&gt;$values{'mime'}&lt;/mime&gt;
- &lt;mimetag&gt;$values{'mimetag'}&lt;/mimetag&gt;
- &lt;/mimeInfo&gt;
- &lt;languageInfo&gt;
- &lt;language&gt;$values{'language'}&lt;/language&gt;
- &lt;languagetag&gt;$values{'languagetag'}&lt;/languagetag&gt;
- &lt;/languageInfo&gt;
- &lt;creationdate&gt;$values{'creationdate'}&lt;/creationdate&gt;
- &lt;lastrevisiondate&gt;$values{'lastrevisiondate'}&lt;/lastrevisiondate&gt;
- &lt;owner&gt;$values{'owner'}&lt;/owner&gt;
- &lt;copyrightInfo&gt;
- &lt;copyright&gt;$values{'copyright'}&lt;/copyright&gt;
- &lt;copyrighttag&gt;$values{'copyrighttag'}&lt;/copyrighttag&gt;
- &lt;/copyrightInfo&gt;
- &lt;repositoryLocation&gt;$values{'hostname'}&lt;/repositoryLocation&gt;
- &lt;shortabstract&gt;$values{'shortabstract'}&lt;/shortabstract&gt;
- &lt;/LonCapaResource&gt;
  </pre>
  $values{'extrashow'}
  <hr align='left' width='200' noshade />
- Line 2707  END
+ Line 3552  END
  sub filled {
      my ($field)=@_;
      if ($field=~/\S/ && $field ne 'any') {
- 	return 1;
+         return 1;
+     } else {
+         return 0;
      }
-     else {
+ }
- 	return 0;
+ ######################################################################
+ ######################################################################
+ =pod
+ =item &output_unparsed_phrase_error()
+ =cut
+ ######################################################################
+ ######################################################################
+ sub output_unparsed_phrase_error {
+     my ($r,$closebutton,$parms,$hidden_fields,$field)=@_;
+     my $errorstring;
+     if ($field eq 'basicexp') {
+         $errorstring = &mt('Unable to understand the search phrase <i>[_1]</i>.  Please modify your search.',$env{'form.basicexp'});
+     } else {
+         $errorstring = &mt('Unable to understand the search phrase <b>[_1]</b>:<i>[_2]</i>.',$field,$env{'form.'.$field});
      }
+     my $bodytag = &Apache::loncommon::bodytag('Search');
+     my $heading = &mt('Unparsed Field');
+     my $revise  = &mt('Revise search request');
+     # make query information persistent to allow for subsequent revision
+     my $html=&Apache::lonxml::xmlbegin();
+     $r->print(<<ENDPAGE);
+ $html
+ <head>
+ <title>The LearningOnline Network with CAPA</title>
+ </head>
+ $bodytag
+ <form method="post" action="/adm/searchcat">
+ $hidden_fields
+ $closebutton
+ <hr />
+ <h2>$heading</h2>
+ <p>
+ $errorstring
+ </p>
+ <p>
+ <a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>
+ </p>
+ </body>
+ </html>
+ ENDPAGE
  }
  ######################################################################
- Line 2736  $parms is extra information to include i
+ Line 3626  $parms is extra information to include i
  ######################################################################
  sub output_blank_field_error {
      my ($r,$closebutton,$parms,$hidden_fields)=@_;
-     my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+     my $bodytag=&Apache::loncommon::bodytag('Search');
-     # make query information persistent to allow for subsequent revision
+     my $errormsg = &mt('You did not fill in enough information for the search to be started.  You need to fill in relevant fields on the search page in order for a query to be processed.');
-     $r->print(<<BEGINNING);
+     my $revise = &mt('Revise Search Request');
- <html>
+     my $heading = &mt('Unactionable Search Queary');
+     my $html=&Apache::lonxml::xmlbegin();
+     $r->print(<<ENDPAGE);
+ $html
  <head>
  <title>The LearningOnline Network with CAPA</title>
- BEGINNING
-     $r->print(<<RESULTS);
  </head>
  $bodytag
- <img align='right' src='/adm/lonIcons/lonlogos.gif' />
- <h1>Search Catalog</h1>
  <form method="post" action="/adm/searchcat">
  $hidden_fields
- <a href="/adm/searchcat?$parms&persistent_db_id=$ENV{'form.persistent_db_id'}"
- >Revise search request</a>&nbsp;
  $closebutton
  <hr />
- <h3>Unactionable search query.</h3>
+ <h2>$heading</h2>
  <p>
- You did not fill in enough information for the search to be started.
+ $errormsg
- You need to fill in relevant fields on the search page in order
+ </p>
- for a query to be processed.
+ <p>
+ <a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>&nbsp;
  </p>
  </body>
  </html>
- RESULTS
+ ENDPAGE
+     return;
  }
  ######################################################################
- Line 2788  sub output_date_error {
+ Line 3677  sub output_date_error {
      my ($r,$message,$closebutton,$hidden_fields)=@_;
      # make query information persistent to allow for subsequent revision
      my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+     my $html=&Apache::lonxml::xmlbegin();
      $r->print(<<RESULTS);
- <html>
+ $html
  <head>
  <title>The LearningOnline Network with CAPA</title>
  </head>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.200
changed lines
	Added in v.1.250