[BACK]Return to lonsearchcat.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsearchcat.pm between versions 1.236 and 1.238

version 1.236, 2005/02/02 21:08:23 version 1.238, 2005/02/17 08:29:43
Line 195  sub handler { Line 195  sub handler {
                 &Apache::lonnet::logthis('lonsearchcat:'.                  &Apache::lonnet::logthis('lonsearchcat:'.
                                          'Unable to recover data from '.                                           'Unable to recover data from '.
                                          $persistent_db_file);                                           $persistent_db_file);
                 $r->print(<<END);   my $html=&Apache::lonxml::xmlbegin();
 <html>   $r->print(<<END);
 <head><title>LON-CAPA Search Error</title></head>  $html
   <head>
   <title>LON-CAPA Search Error</title></head>
 $bodytag  $bodytag
 We were unable to retrieve data describing your search.  This is a serious  We were unable to retrieve data describing your search.  This is a serious
 error and has been logged.  Please alert your LON-CAPA administrator.  error and has been logged.  Please alert your LON-CAPA administrator.
Line 224  END Line 226  END
  } else {   } else {
             # This is a stupid error to give to the user.                # This is a stupid error to give to the user.  
             # It really tells them nothing.              # 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>');                        'Unable to tie hash to db file</body></html>');
     return OK;      return OK;
  }   }
Line 368  END Line 371  END
             &Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '.              &Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '.
                                      'needed table.  lonmysql error:'.                                       'needed table.  lonmysql error:'.
                                      $errorstring);                                       $errorstring);
       my $html=&Apache::lonxml::xmlbegin();
             $r->print(<<END);              $r->print(<<END);
 <html><head><title>Search Error</title></head>  $html
   <head>
   <title>Search Error</title></head>
 $bodytag  $bodytag
 Unable to create table in which to store search results.    Unable to create table in which to store search results.  
 The search has been aborted.  The search has been aborted.
Line 380  END Line 386  END
         }          }
         delete($ENV{'form.launch'});          delete($ENV{'form.launch'});
         if (! &make_form_data_persistent($r,$persistent_db_file)) {          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  $bodytag
 Unable to properly store search information.  The search has been aborted.  Unable to properly store search information.  The search has been aborted.
 </body>  </body>
Line 477  sub course_search { Line 486  sub course_search {
     my $discuss=$ENV{'form.crsdiscuss'};      my $discuss=$ENV{'form.crsdiscuss'};
     my @allwords=($search_string,@New_Words);      my @allwords=($search_string,@New_Words);
     $totalfound=0;      $totalfound=0;
     $r->print('<html><head><title>LON-CAPA Course Search</title></head>'.      my $html=&Apache::lonxml::xmlbegin();
       $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 />');        $bodytag.'<hr /><center><font size="+2" face="arial">'.$pretty_search_string.'</font></center><hr /><b>'.&mt('Course content').':</b><br />');
     $r->rflush();      $r->rflush();
 # ======================================================= Go through the course  # ======================================================= Go through the course
Line 625  sub checkonthis { Line 635  sub checkonthis {
 # Check also the dependencies of this one  # Check also the dependencies of this one
     my $dependencies=      my $dependencies=
                 &Apache::lonnet::metadata($url,'dependencies');                  &Apache::lonnet::metadata($url,'dependencies');
     foreach (split(/\,/,$dependencies) && (!$alreadyseen{$id})) {      foreach (split(/\,/,$dependencies)) {
        if (($_=~/^\/res\//)) {         if (($_=~/^\/res\//) && (!$alreadyseen{$id})) { 
           &checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords);            &checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords);
        }         }
     }      }
Line 653  sub untiehash { Line 663  sub untiehash {
 } # End of course search scoping  } # End of course search scoping
   
 sub search_html_header {  sub search_html_header {
       my $html=&Apache::lonxml::xmlbegin();
     my $Str = <<ENDHEADER;      my $Str = <<ENDHEADER;
 <html>  $html
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 </head>  </head>
Line 2111  sub print_sort_form { Line 2122  sub print_sort_form {
         return;          return;
     }      }
     my $result;      my $result;
       my $html=&Apache::lonxml::xmlbegin();
     $result.=<<END;      $result.=<<END;
 <html>  $html
 <head>  <head>
 <script>  <script>
     function change_sort() {      function change_sort() {
Line 2352  sub run_search { Line 2364  sub run_search {
     #      #
     # Print run_search header      # Print run_search header
     #      #
       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<END);      $r->print(<<END);
 <html>  $html
 <head><title>Search Status</title></head>  <head>
   <title>Search Status</title></head>
 $bodytag  $bodytag
 <form name="statusform" action="" method="post">  <form name="statusform" action="" method="post">
 <input type="hidden" name="Queue" value="" />  <input type="hidden" name="Queue" value="" />
Line 3087  END Line 3101  END
 ######################################################################  ######################################################################
 sub search_status_header {  sub search_status_header {
     my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);      my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
       my $html=&Apache::lonxml::xmlbegin();
     return <<ENDSTATUS;      return <<ENDSTATUS;
 <html><head><title>Search Status</title></head>  $html
   <head>
   <title>Search Status</title></head>
 $bodytag  $bodytag
 <h3>Search Status</h3>  <h3>Search Status</h3>
 Sending search request to LON-CAPA servers.<br />  Sending search request to LON-CAPA servers.<br />
Line 3111  sub print_frames_interface { Line 3128  sub print_frames_interface {
         "&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 $run_search_link = $basic_link."&phase=run_search";
     my $results_link = &results_link();      my $results_link = &results_link();
       my $html=&Apache::lonxml::xmlbegin();
     my $result = <<"ENDFRAMES";      my $result = <<"ENDFRAMES";
 <html>  $html
 <head>  <head>
 <script>  <script>
 var targetwin = opener;  var targetwin = opener;
Line 3508  sub output_unparsed_phrase_error { Line 3526  sub output_unparsed_phrase_error {
     my $heading = &mt('Unparsed Field');      my $heading = &mt('Unparsed Field');
     my $revise  = &mt('Revise search request');      my $revise  = &mt('Revise search request');
     # make query information persistent to allow for subsequent revision      # make query information persistent to allow for subsequent revision
       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDPAGE);      $r->print(<<ENDPAGE);
 <html>  $html
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 </head>  </head>
Line 3556  sub output_blank_field_error { Line 3575  sub output_blank_field_error {
     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.');      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.');
     my $revise = &mt('Revise Search Request');      my $revise = &mt('Revise Search Request');
     my $heading = &mt('Unactionable Search Queary');      my $heading = &mt('Unactionable Search Queary');
       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDPAGE);      $r->print(<<ENDPAGE);
 <html>  $html
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 </head>  </head>
Line 3602  sub output_date_error { Line 3622  sub output_date_error {
     my ($r,$message,$closebutton,$hidden_fields)=@_;      my ($r,$message,$closebutton,$hidden_fields)=@_;
     # make query information persistent to allow for subsequent revision      # make query information persistent to allow for subsequent revision
     my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);      my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<RESULTS);      $r->print(<<RESULTS);
 <html>  $html
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 </head>  </head>
Removed from v.1.236  
changed lines
  Added in v.1.238

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