--- loncom/interface/lonsearchcat.pm	2004/09/27 14:58:01	1.234
+++ loncom/interface/lonsearchcat.pm	2004/12/17 21:44:19	1.235
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.234 2004/09/27 14:58:01 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.235 2004/12/17 21:44:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -445,10 +445,18 @@ sub hidden_field {
 {   # Scope the course search to avoid global variables
 #
 # Variables For course search
-my %alreadyseen;
 my %hash;
 my $totalfound;
 
+sub make_symb {
+    my ($id)=@_;
+    my ($mapid,$resid)=split(/\./,$id);
+    my $map=$hash{'map_id_'.$mapid};
+    my $res=$hash{'src_'.$id};
+    my $symb=&Apache::lonnet::encode_symb($map,$resid,$res);
+    return $symb;
+}
+
 sub course_search {
     my $r=shift;
     my $bodytag=&Apache::loncommon::bodytag('Course Search');
@@ -471,16 +479,18 @@ sub course_search {
 	      $bodytag.'<hr /><center><font size="+2" face="arial">'.$pretty_search_string.'</font></center><hr /><b>'.&mt('Course content').':</b><br />');
     $r->rflush();
 # ======================================================= Go through the course
-    undef %alreadyseen;
-    %alreadyseen=();
     my $c=$r->connection;
     if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
             &GDBM_READER(),0640)) {
-        foreach (keys %hash) {
+        foreach (sort(keys(%hash))) {
             if ($c->aborted()) { last; }
-            if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
-                &checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,
-                             @allwords);
+            if (($_=~/^src\_(.+)$/)) {
+		if ($hash{'randomout_'.$1} & !$ENV{'request.role.adv'}) {
+		    next; 
+		}
+		my $symb=&make_symb($1);
+                &checkonthis($r,$1,$hash{$_},0,&Apache::lonnet::gettitle($symb),
+			     $fulltext,$symb,@allwords);
             }
         }
         untie(%hash);
@@ -570,15 +580,20 @@ sub course_search {
 # =============================== This pulls up a resource and its dependencies
 
 sub checkonthis {
-    my ($r,$url,$level,$title,$fulltext,@allwords)=@_;
-    $alreadyseen{$url}=1;
+    my ($r,$id,$url,$level,$title,$fulltext,$symb,@allwords)=@_;
     $r->rflush();
-    my $result=&Apache::lonnet::metadata($url,'title').' '.
-               &Apache::lonnet::metadata($url,'subject').' '.
-               &Apache::lonnet::metadata($url,'abstract').' '.
-               &Apache::lonnet::metadata($url,'keywords');
-    if (($url) && ($fulltext)) {
-	$result.=&Apache::lonnet::ssi_body($url);
+    
+    my $result=$title.' ';
+    if ($ENV{'request.role.adv'} || !$hash{'encrypted_'.$id}) {
+	$result.=&Apache::lonnet::metadata($url,'title').' '.
+	    &Apache::lonnet::metadata($url,'subject').' '.
+	    &Apache::lonnet::metadata($url,'abstract').' '.
+	    &Apache::lonnet::metadata($url,'keywords');
+    }
+    my ($extension)=($url=~/\.(\w+)$/);
+    if (&Apache::loncommon::fileembstyle($extension) eq 'ssi' &&
+	($url) && ($fulltext)) {
+	$result.=&Apache::lonnet::ssi_body($url.'?symb='.&Apache::lonnet::escape($symb));
     }
     $result=~s/\s+/ /gs;
     my $applies = 0;
@@ -589,8 +604,15 @@ sub checkonthis {
        for (my $i=0;$i<=$level*5;$i++) {
            $r->print('&nbsp;');
        }
-       $r->print('<a href="'.$url.'" target="cat">'.
-		 ($title?$title:$url).'</a><br />');
+       my $href=$url;
+       if ($hash{'encrypted_'.$id} && !$ENV{'request.role.adv'}) {
+	   $href=&Apache::lonenc::encrypted($href)
+	       .'?symb='.&Apache::lonenc::encrypted($symb);
+       } else {
+	   $href.='?symb='.&Apache::lonnet::escape($symb);
+       }
+       $r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url).
+		 '</a><br />');
        $totalfound++;
     } elsif ($fulltext) {
        $r->print(' .');
@@ -600,8 +622,8 @@ sub checkonthis {
     my $dependencies=
                 &Apache::lonnet::metadata($url,'dependencies');
     foreach (split(/\,/,$dependencies)) {
-       if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {
-          &checkonthis($r,$_,$level+1,'',$fulltext,@allwords);
+       if (($_=~/^\/res\//)) {
+          &checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords);
        }
     }
 }