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

version 1.271, 2006/06/29 16:08:43 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 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 3341  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.271  
changed lines
  Added in v.1.273


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