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

Diff for /loncom/interface/lonsearchcat.pm between versions 1.345 and 1.346

version 1.345, 2015/06/12 21:11:07 version 1.346, 2015/06/16 20:24:39
Line 144  sub handler { Line 144  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'})) {
         Time::HiRes::sleep(0.1);          sleep(0.1);
         delete($env{'form.pause'});          delete($env{'form.pause'});
     }      }
     ##      ##
Line 2051  sub print_sort_form { Line 2051  sub print_sort_form {
         &Apache::lonnet::logthis(&Apache::lonmysql::get_error());          &Apache::lonnet::logthis(&Apache::lonmysql::get_error());
         return;          return;
     }      }
     # update results      my $start_page = &Apache::loncommon::start_page('Results',undef);
     my $newloc = '/adm/searchcat?phase=results&persistent_db_id='.  
         $env{'form.persistent_db_id'};  
     my $js =<<END;  
 <script type="text/javascript">  
     var frame = parent.resultsframe;  
     var frameDoc = frame.document;  
     if (frameDoc.readyState  == 'complete')  
         frame.location = "$newloc";  
 </script>  
 END  
   
     my $start_page = &Apache::loncommon::start_page('Results',$js);  
     my $breadcrumbs=      my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',          &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
     $env{'form.catalogmode'} ne 'import');      $env{'form.catalogmode'} ne 'import');
Line 2233  sub reload_result_frame { Line 2221  sub reload_result_frame {
         $env{'form.persistent_db_id'};          $env{'form.persistent_db_id'};
     $r->print(<<SCRIPT);      $r->print(<<SCRIPT);
 <script type="text/javascript">  <script type="text/javascript">
     var frame = parent.resultsframe;      parent.update_results("$newloc");
     var frameDoc = frame.document;  
     if (frameDoc.readyState  == 'complete')  
         frame.location = "$newloc";  
 </script>  </script>
 SCRIPT  SCRIPT
   
Line 2472  END Line 2457  END
                 &update_status($r,                  &update_status($r,
                        &mt('waiting on [_1]',join(' ',keys(%Server_status))));                         &mt('waiting on [_1]',join(' ',keys(%Server_status))));
             }              }
             Time::HiRes::sleep(0.1);              sleep(0.1);
         }          }
         #          #
         # Loop through the servers we have contacted but do not          # Loop through the servers we have contacted but do not
Line 3176  SCRIPT Line 3161  SCRIPT
 </script>  </script>
 SCRIPT  SCRIPT
   
       $js.=<<SCRIPT;
   <script type="text/javascript">
       \$(document).ready(function() {
           parent.done_loading_results();
       });
   </script>
   SCRIPT
   
     my $start_page  = &Apache::loncommon::start_page(undef,$js,      my $start_page  = &Apache::loncommon::start_page(undef,$js,
      {'only_body' =>1,       {'only_body' =>1,
                                                       'add_wishlist' =>1,                                                        'add_wishlist' =>1,
Line 3206  sub print_frames_interface { Line 3199  sub print_frames_interface {
     my $results_link = &results_link();      my $results_link = &results_link();
     my $js = <<JS;      my $js = <<JS;
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  
 var targetwin = opener;  var targetwin = opener;
 var queue = '';  var queue = '';
 // ]]>  
   var loading_results = true;
   var need_reloading = false;
   var new_location;
   function update_results(newloc) {
       if (loading_results) {
           need_reloading = true;
           new_location = newloc;
       } else {
           loading_results = true;
           resultsframe.location = newloc;
       }
   }
   function done_loading_results() {
       loading_results = false;
       if (need_reloading) {
           need_reloading = false;
           update_results(new_location);
       }
   }
 </script>  </script>
 JS  JS
   
Removed from v.1.345  
changed lines
  Added in v.1.346

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