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

Diff for /loncom/interface/lonsearchcat.pm between versions 1.270 and 1.273

version 1.270, 2006/06/19 09:40:18 version 1.273, 2006/07/17 19:47:20
Line 1540  sub parse_domain_restrictions { Line 1540  sub parse_domain_restrictions {
         $domain_hash{$_}++;          $domain_hash{$_}++;
     }      }
     if ($domain_hash{'any'}) {      if ($domain_hash{'any'}) {
         $pretty_domains_string = "In all LON-CAPA domains.";          $pretty_domains_string = &mt("in all LON-CAPA domains.");
     } else {      } else {
         if (@allowed_domains > 1) {          if (@allowed_domains > 1) {
             $pretty_domains_string = "In LON-CAPA domains:";              $pretty_domains_string = &mt("in LON-CAPA domains:");
         } else {          } else {
             $pretty_domains_string = "In LON-CAPA domain ";              $pretty_domains_string = &mt("in LON-CAPA domain ");
         }          }
         foreach (sort @allowed_domains) {          foreach (sort @allowed_domains) {
             $pretty_domains_string .= "<b>".$_."</b> ";              $pretty_domains_string .= "<b>".$_."</b> ";
Line 1614  sub parse_basic_search { Line 1614  sub parse_basic_search {
     #}      #}
     my $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);      my $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
     #      #
       if ($env{'form.related'}) {
    $pretty_search_string.=' '.&mt('(including related words)');
       }
     if (defined($pretty_domains_string) && $pretty_domains_string ne '') {      if (defined($pretty_domains_string) && $pretty_domains_string ne '') {
         $pretty_search_string .= ' '.$pretty_domains_string;          $pretty_search_string .= ' '.$pretty_domains_string;
     }      }
Line 2104  sub print_sort_form { Line 2107  sub print_sort_form {
 END  END
   
     my $start_page = &Apache::loncommon::start_page('Results',$js,      my $start_page = &Apache::loncommon::start_page('Results',$js,
     {'only_body' => 1});      {'no_title' => 1});
     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 2133  END Line 2136  END
 <p>  <p>
 There are $total_results matches to your query. $revise  There are $total_results matches to your query. $revise
 </p><p>  </p><p>
 Search:$pretty_query_string  Search: $pretty_query_string
 </p>  </p>
 </form>  </form>
 END  END
Line 2335  sub run_search { Line 2338  sub run_search {
     # Print run_search header      # Print run_search header
     #      #
     my $start_page = &Apache::loncommon::start_page('Search Status',undef,      my $start_page = &Apache::loncommon::start_page('Search Status',undef,
     {'only_body' => 1});      {'no_title' => 1});
     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 3093  END Line 3096  END
     return $result;      return $result;
 }  }
   
 ######################################################################  
 ######################################################################  
 sub search_status_header {  
     my $start_page = &Apache::loncommon::start_page('Search Status',undef,  
     {'only_body' => 1});  
     return <<ENDSTATUS;  
 $start_page  
 <h3>Search Status</h3>  
 Sending search request to LON-CAPA servers.<br />  
 ENDSTATUS  
 }  
   
 sub results_link {  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'};
Line 3353  sub summary_view { Line 3344  sub summary_view {
     my $jumpurl=$values{'url'};      my $jumpurl=$values{'url'};
     $jumpurl=~s/^\/ext\//http\:\/\//;      $jumpurl=~s/^\/ext\//http\:\/\//;
     my $link=&Apache::lonhtmlcommon::crumbs($jumpurl,      my $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
   (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),    (($env{'form.catalogmode'} eq 'import')?'':'preview'),
   '',    '',
   (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1);    (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1);
   
Removed from v.1.270  
changed lines
  Added in v.1.273

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