--- loncom/metadata_database/searchcat.pl	2006/09/26 15:15:19	1.69
+++ loncom/metadata_database/searchcat.pl	2007/01/02 09:12:51	1.74
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.69 2006/09/26 15:15:19 raeburn Exp $
+# $Id: searchcat.pl,v 1.74 2007/01/02 09:12:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -234,18 +234,18 @@ foreach my $dom (@domains) {
     foreach my $uname (keys(%portusers)) {
         my $urlstart = '/uploaded/'.$dom.'/'.$uname;
         my $pathstart = &propath($dom,$uname).'/userfiles';
-        my $is_course = &check_for_course($dom,$uname);
+        my $is_course = &Apache::lonnet::is_course($dom,$uname);
         my $curr_perm = &Apache::lonnet::get_portfile_permissions($dom,$uname);
         my %access = &Apache::lonnet::get_access_controls($curr_perm);
         foreach my $file (keys(%access)) { 
             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});
@@ -322,17 +322,6 @@ sub descend_tree {
     } 
 }
 
-sub check_for_course {
-    my ($cdom,$cnum) = @_;
-    my %courses = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,
-                                                undef,'.');
-    if (exists($courses{$cdom.'_'.$cnum})) {
-        return 1;
-    }
-    return 0;
-}
-
-
 sub process_portfolio_access_data {
     my ($url,$access_hash) = @_;
     foreach my $key (keys(%{$access_hash})) {
@@ -341,11 +330,12 @@ 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);
+            $acc_data->{end} = &LONCAPA::lonmetadata::sqltime($end);
         }
-        $acc_data->{start} = &sqltime($start);
+        $acc_data->{start} = &LONCAPA::lonmetadata::sqltime($start);
         if (! $simulate) {
             my ($count,$err) =
               &LONCAPA::lonmetadata::store_metadata($dbh,
@@ -623,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;
         } 
@@ -703,8 +693,10 @@ sub getfiledates {
         $ref->{'lastrevisiondate'} =~ /^\s*$/) {
         $ref->{'lastrevisiondate'} = (stat($target))[9];
     }
-    $ref->{'creationdate'}     = &sqltime($ref->{'creationdate'});
-    $ref->{'lastrevisiondate'} = &sqltime($ref->{'lastrevisiondate'});
+    $ref->{'creationdate'}     = 
+        &LONCAPA::lonmetadata::sqltime($ref->{'creationdate'});
+    $ref->{'lastrevisiondate'} = 
+        &LONCAPA::lonmetadata::sqltime($ref->{'lastrevisiondate'});
 }
 
 ########################################################
@@ -899,41 +891,6 @@ sub propath {
 } 
 
 ##
-## &sqltime($timestamp)
-##
-## Convert perl $timestamp to MySQL time.  MySQL expects YYYY-MM-DD HH:MM:SS
-##
-sub sqltime {
-    my ($time) = @_;
-    my $mysqltime;
-    if ($time =~ 
-        /(\d+)-(\d+)-(\d+) # YYYY-MM-DD
-        \s                 # a space
-        (\d+):(\d+):(\d+)  # HH:MM::SS
-        /x ) { 
-        # Some of the .meta files have the time in mysql
-        # format already, so just make sure they are 0 padded and
-        # pass them back.
-        $mysqltime = sprintf('%04d-%02d-%02d %02d:%02d:%02d',
-                             $1,$2,$3,$4,$5,$6);
-    } elsif ($time =~ /^\d+$/) {
-        my @TimeData = gmtime($time);
-        # Alter the month to be 1-12 instead of 0-11
-        $TimeData[4]++;
-        # Alter the year to be from 0 instead of from 1900
-        $TimeData[5]+=1900;
-        $mysqltime = sprintf('%04d-%02d-%02d %02d:%02d:%02d',
-                             @TimeData[5,4,3,2,1,0]);
-    } elsif (! defined($time) || $time == 0) {
-        $mysqltime = 0;
-    } else {
-        &log(0,"    sqltime:Unable to decode time ".$time);
-        $mysqltime = 0;
-    }
-    return $mysqltime;
-}
-
-##
 ## &declutter($filename)
 ##   Given a filename, returns a url for the filename.
 sub declutter {