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

Diff for /loncom/interface/lonsearchcat.pm between versions 1.146 and 1.147

version 1.146, 2002/07/29 21:53:57 version 1.147, 2002/07/30 18:30:56
Line 191  sub handler { Line 191  sub handler {
     ##     this once, so the pause indicator is deleted      ##     this once, so the pause indicator is deleted
     ##      ##
     if (exists($ENV{'form.pause'})) {      if (exists($ENV{'form.pause'})) {
         sleep(5);          sleep(3);
         delete($ENV{'form.pause'});          delete($ENV{'form.pause'});
     }      }
     ##      ##
Line 204  sub handler { Line 204  sub handler {
     # set the name of the persistent database      # 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.persistent_db_id'} = time;          $ENV{'form.persistent_db_id'} = time;
     }      }
     my $persistent_db_file = "/home/httpd/perl/tmp/".      my $persistent_db_file = "/home/httpd/perl/tmp/".
Line 212  sub handler { Line 213  sub handler {
             '_'.&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';
     ##      ##
     &get_persistent_form_data($r,$persistent_db_file);      if (! &get_persistent_form_data($r,$persistent_db_file)) {
           &write_status($r,"Unable to get persistent data");
       }
     ##      ##
     ## Clear out old values from groupsearch database      ## Clear out old values from groupsearch database
     ##      ##
Line 280  END Line 283  END
             ($ENV{'form.phase'} eq 'adv_search')) {              ($ENV{'form.phase'} eq 'adv_search')) {
         # Set up table          # Set up table
         if (! defined(&create_results_table())) {          if (! defined(&create_results_table())) {
             # Unable to make table to store results in.                my $error = &Apache::lonmysql::get_error();
             # Definately abort search.              $r->print(<<END);
   <html><head><title>Search Error</title></head>
   <body>
   Unable to create table in which to store search results.  
   The search has been aborted.
   <pre>
   ERROR:
   $error
   </pre>
   </body>
   </html>
   END
               return OK;
         }          }
           delete($ENV{'form.launch'});
         if (! &make_form_data_persistent($r,$persistent_db_file)) {          if (! &make_form_data_persistent($r,$persistent_db_file)) {
             # Unable to store persistent data.              $r->print(<<END);
             # Probably should bail out.  <html><head><title>Search Error</title></head>
   <body>
   Unable to properly store search information.  The search has been aborted.
   </body>
   </html>
   END
               return OK;
         }          }
         #          #
         # We are running a search          # We are running a search
Line 299  END Line 321  END
                 = &parse_advanced_search($r,$closebutton);                  = &parse_advanced_search($r,$closebutton);
             return OK if (! defined($query));              return OK if (! defined($query));
         }          }
         &write_status($r,"query         = $query");  
         &write_status($r,"customquery   = $customquery");  
         &write_status($r,"customshow    = $customshow");  
         &write_status($r,"libraries     = $libraries");  
         &write_status($r,"pretty_string = $pretty_string");  
         &make_persistent($r,          &make_persistent($r,
                          { query => $query,                           { query => $query,
                            customquery => $customquery,                             customquery => $customquery,
Line 608  to them. Line 625  to them.
 sub get_persistent_form_data {  sub get_persistent_form_data {
     my $r = shift;      my $r = shift;
     my $filename = shift;      my $filename = shift;
     return undef if (! -e $filename);      return 0 if (! -e $filename);
     return undef if (! tie(%persistent_db,'GDBM_File',$filename,      return undef if (! tie(%persistent_db,'GDBM_File',$filename,
                            &GDBM_READER,0640));                             &GDBM_READER,0640));
     #      #
Line 637  sub get_persistent_form_data { Line 654  sub get_persistent_form_data {
                 $ENV{$name} = $values[0] if ($values[0]);                  $ENV{$name} = $values[0] if ($values[0]);
             }              }
         }          }
         &write_status($r,"Reconstructed $name = $ENV{$name}");  
     }      }
     untie (%persistent_db);      untie (%persistent_db);
     return 1;      return 1;
Line 717  sub make_persistent { Line 733  sub make_persistent {
         # We handle array references, but not recursively.          # We handle array references, but not recursively.
         my $store = join(',', map { &Apache::lonnet::escape($_); } @values );          my $store = join(',', map { &Apache::lonnet::escape($_); } @values );
         $persistent_db{$name} = $store;          $persistent_db{$name} = $store;
         &write_status($r,"Stored $name = $store");  
     }      }
     untie(%persistent_db);      untie(%persistent_db);
     return 1;      return 1;
Line 1527  the following format: Line 1542  the following format:
 ##    columns of type 'enum' cannot be used for FULLTEXT.  ##    columns of type 'enum' cannot be used for FULLTEXT.
 ##  ##
 my @DataOrder = qw/id title author subject url keywords version notes  my @DataOrder = qw/id title author subject url keywords version notes
     abstract mime lang owner copyright creationdate lastrevisiondate hostname      abstract mime lang owner copyright creationdate lastrevisiondate hostname/;
     idx_title idx_author idx_subject idx_abstract idx_mime idx_language   
     idx_owner idx_copyright/;  
   
 my %Datatypes =   my %Datatypes = 
     ( id        =>{ type         => 'INT',      ( id        =>{ type         => 'INT',
Line 1555  my %Datatypes = Line 1568  my %Datatypes =
       creationdate     =>{ type=>'DATETIME'},        creationdate     =>{ type=>'DATETIME'},
       lastrevisiondate =>{ type=>'DATETIME'},        lastrevisiondate =>{ type=>'DATETIME'},
       #--------------------------------------------------        #--------------------------------------------------
       idx_title     =>{ type=>'FULLTEXT', target=>'title'},  
       idx_author    =>{ type=>'FULLTEXT', target=>'author'},  
       idx_subject   =>{ type=>'FULLTEXT', target=>'subject'},  
       idx_abstract  =>{ type=>'FULLTEXT', target=>'abstract'},  
       idx_mime      =>{ type=>'FULLTEXT', target=>'mime'},  
       idx_language  =>{ type=>'FULLTEXT', target=>'lang'},  
       idx_owner     =>{ type=>'FULLTEXT', target=>'owner'},  
       idx_copyright =>{ type=>'FULLTEXT', target=>'copyright'},  
       );        );
   
   my @Fullindicies = 
       qw/title author subject abstract mime language owner copyright/;
       
 ######################################################################  ######################################################################
 ######################################################################  ######################################################################
   
Line 1587  sub create_results_table { Line 1595  sub create_results_table {
     my $table = &Apache::lonmysql::create_table      my $table = &Apache::lonmysql::create_table
         ( { columns => \%Datatypes,          ( { columns => \%Datatypes,
             column_order => \@DataOrder,              column_order => \@DataOrder,
               fullindex => \@Fullindicies,
         } );          } );
     if (defined($table)) {      if (defined($table)) {
         $ENV{'form.table'} = $table;          $ENV{'form.table'} = $table;
Line 1649  sub run_search { Line 1658  sub run_search {
     }      }
     my %Server_status;      my %Server_status;
     my $table =$ENV{'form.table'};      my $table =$ENV{'form.table'};
     if (! defined($table)) {      if (! defined($table) || $table eq '') {
         # What do I do now?  Print out an error page.          $r->print("Unable to determine table id to store search results in.".
         &Apache::lonnet::logthis("lonmysql attempted to create a table ".                    "The search has been aborted.");
                                  "and this was the result:".          return;
       }
       my $table_status = &Apache::lonmysql::check_table($table);
       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'}");
           &Apache::lonnet::logthis("lonmysql error = ".
                                  &Apache::lonmysql::get_error());                                   &Apache::lonmysql::get_error());
         $r->print("An internal error occured with the database.<br />".          return;
                   "The error has been logged, but you should probably alert".      }
                   " your system administrator.");      if (! $table_status) {
           $r->print("The table id,$table, we tried to use is invalid.".
                     "The search has been aborted.");
         return;          return;
     }      }
     ##      ##
Line 1665  sub run_search { Line 1683  sub run_search {
     my $hitcountsum;      my $hitcountsum;
     my $server;       my $server; 
     my $status;      my $status;
       $r->print("Searching");
     while ((time - $starttime < $max_time) &&       while ((time - $starttime < $max_time) && 
            ((@Servers_to_contact) || keys(%Server_status))) {             ((@Servers_to_contact) || keys(%Server_status))) {
         # Send out a search request if it needs to be done.          # Send out a search request if it needs to be done.
Line 1676  sub run_search { Line 1695  sub run_search {
             ($server) = keys(%$reply);              ($server) = keys(%$reply);
             $Server_status{$server} = $reply->{$server};              $Server_status{$server} = $reply->{$server};
             # $r->print("Contacted:$server:reply:$Server_status{$server}");              # $r->print("Contacted:$server:reply:$Server_status{$server}");
             if ($max_time - (time - $starttime) < 20) {              $r->print(" .");
                 # If there are less than 20 seconds to go in the search,              $r->rflush();
                 # give the newly contacted servers 20 more seconds to   
                 # respond....  
                 $max_time += 20;  
             }  
         } else {          } else {
             sleep(1); # wait a sec. to give time for files to be written              sleep(1); # wait a sec. to give time for files to be written
         }          }
Line 1744  sub run_search { Line 1759  sub run_search {
     #      #
     # We have run out of time or run out of servers to talk to and      # We have run out of time or run out of servers to talk to and
     # results to get.        # results to get.  
     $r->print("<h1>Search completed.</h1>");      $r->print("<br /><b>Search Completed</b><br />");
     if ($hitcountsum) {      if ($hitcountsum) {
         $r->print($hitcountsum." successful matches to your query.<br />");          $r->print($hitcountsum." successful matches were found.<br />");
     } else {      } else {
         $r->print("There were no successful matches to your query.<br />");          $r->print("There were no successful matches to your query.<br />");
     }      }
Line 1826  sub display_results { Line 1841  sub display_results {
     ##      ##
     my $action = "/adm/searchcat?phase=results";      my $action = "/adm/searchcat?phase=results";
     ##      ##
     ##      ## Deal with groupsearch
     ##      ##
     if ($ENV{'form.catalogmode'} eq 'groupsearch') {      if ($ENV{'form.catalogmode'} eq 'groupsearch') {
         if (! tie(%groupsearch_db,'GDBM_File',$diropendb,          if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
Line 1920  sub display_results { Line 1935  sub display_results {
     }      }
     if (@Results < 1) {      if (@Results < 1) {
         $r->print("There were no results matching your query");          $r->print("There were no results matching your query");
       } else {
           $r->print
               ('<br /><center>'.
                &prev_next_buttons($min,$ENV{'form.show'},$total_results,
                                   "table=".$ENV{'form.table'}.
                                   "&phase=results".
                                   "&persistent_db_id=".
                                   $ENV{'form.persistent_db_id'})
                ."</center><br />\n"
                );
     }      }
     $r->print("</body></html>");      $r->print("</body></html>");
     $r->rflush();      $r->rflush();
Removed from v.1.146  
changed lines
  Added in v.1.147

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