[LON-CAPA-cvs] cvs: loncom /interface lonsearchcat.pm

[www]

www		Fri Mar  7 22:24:59 2003 EDT

  Modified files:              
    /loncom/interface	lonsearchcat.pm 
  Log:
  Continued work on course search
  
  
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.167 loncom/interface/lonsearchcat.pm:1.168
--- loncom/interface/lonsearchcat.pm:1.167	Fri Mar  7 20:43:12 2003
+++ loncom/interface/lonsearchcat.pm	Fri Mar  7 22:24:58 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.167 2003/03/08 01:43:12 www Exp $
+# $Id: lonsearchcat.pm,v 1.168 2003/03/08 03:24:58 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -428,7 +428,7 @@
    &tiehash();
    foreach (keys %hash) {
        if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
-           &checkonthis($r,$hash{$_},0,$hash{'title_'.$1},@allwords,$fulltext);
+           &checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,@allwords);
        }
    }
    &untiehash();
@@ -456,7 +456,7 @@
 # =============================== This pulls up a resource and its dependencies
 
 sub checkonthis {
-    my ($r,$url,$level,$title,@allwords,$fulltext)=@_;
+    my ($r,$url,$level,$title,$fulltext,@allwords)=@_;
     $alreadyseen{$url}=1;
     $r->rflush();
     my $result=&Apache::lonnet::metadata($url,'title').' '.
@@ -464,7 +464,7 @@
                &Apache::lonnet::metadata($url,'abstract').' '.
                &Apache::lonnet::metadata($url,'keywords');
     if (($url) && ($fulltext)) {
-	$result.=&Apache::lonnet::ssibody($url);
+	$result.=&Apache::lonnet::ssi_body($url);
     }
     $result=~s/\s+/ /gs;
     my $applies=0;
@@ -490,7 +490,7 @@
                 &Apache::lonnet::metadata($url,'dependencies');
     foreach (split(/\,/,$dependencies)) {
        if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {
-          &checkonthis($r,$_,$level+1,'',@allwords,$fulltext);
+          &checkonthis($r,$_,$level+1,'',$fulltext,@allwords);
        }
     }
 }