--- loncom/metadata_database/searchcat.pl	2006/12/11 00:32:24	1.70
+++ loncom/metadata_database/searchcat.pl	2007/01/03 04:01:32	1.70.2.3
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.70 2006/12/11 00:32:24 albertel Exp $
+# $Id: searchcat.pl,v 1.70.2.3 2007/01/03 04:01:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -241,11 +241,11 @@ foreach my $dom (@domains) {
             my ($group,$url,$fullpath);
             if ($is_course) {
                 ($group, my ($path)) = ($file =~ /^(\w+)(\/.+)$/);
-                $fullpath = $pathstart.'/groups/'.$group.'/portfolio/'.$path;
+                $fullpath = $pathstart.'/groups/'.$group.'/portfolio'.$path;
                 $url = $urlstart.'/groups/'.$group.'/portfolio'.$path;
             } else {
                 $fullpath = $pathstart.'/portfolio'.$file;
-                $url .= $urlstart.'/portfolio'.$file;
+                $url = $urlstart.'/portfolio'.$file;
             }
             if (ref($access{$file}) eq 'HASH') {
                 &process_portfolio_access_data($url,$access{$file});
@@ -330,6 +330,7 @@ sub process_portfolio_access_data {
         $acc_data->{keynum} = $key;
         my ($num,$scope,$end,$start) =
                         ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+        next if (($scope ne 'public') && ($scope ne 'guest'));
         $acc_data->{scope} = $scope;
         if ($end != 0) {
             $acc_data->{end} = &sqltime($end);
@@ -612,7 +613,7 @@ sub portfolio_metadata {
         $metacache{'owner'} = $uname.':'.$dom;
         $metacache{'domain'} = $dom;
         $metacache{'mime'} = $mime;
-        if (defined($group)) {
+        if ($group ne '') {
             $metacache{'keys'} .= ',courserestricted';
             $metacache{'courserestricted'} = 'course.'.$dom.'_'.$uname;
         }