--- loncom/metadata_database/searchcat.pl	2006/01/27 15:53:49	1.66
+++ loncom/metadata_database/searchcat.pl	2007/01/02 12:52:22	1.75
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.66 2006/01/27 15:53:49 albertel Exp $
+# $Id: searchcat.pl,v 1.75 2007/01/02 12:52:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,9 +65,6 @@ and correct user experience.
 =cut
 
 use strict;
-BEGIN {
-    eval "use Apache2::compat();";
-};
 use DBI;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::lonmetadata;
@@ -121,8 +118,18 @@ if (defined($oneuser)) {
 
 ##
 ## Use variables for table names so we can test this routine a little easier
-my $oldname = 'metadata';
-my $newname = 'newmetadata'.$$; # append pid to have unique temporary table
+my %oldnames = (
+                 'metadata'    => 'metadata',
+                 'portfolio'   => 'portfolio_metadata',
+                 'access'      => 'portfolio_access',
+                 'addedfields' => 'portfolio_addedfields',
+               );
+
+my %newnames;
+# new table names -  append pid to have unique temporary tables
+foreach my $key (keys(%oldnames)) {
+    $newnames{$key} = 'new'.$oldnames{$key}.$$;
+}
 
 #
 # Only run if machine is a library server
@@ -158,16 +165,27 @@ if (! ($dbh = DBI->connect("DBI:mysql:lo
 }
 # This can return an error and still be okay, so we do not bother checking.
 # (perhaps it should be more robust and check for specific errors)
-$dbh->do('DROP TABLE IF EXISTS '.$newname);
+foreach my $key (keys(%newnames)) {
+    if ($newnames{$key} ne '') {
+        $dbh->do('DROP TABLE IF EXISTS '.$newnames{$key});
+    }
+}
+
 #
-# Create the new table
-my $request = &LONCAPA::lonmetadata::create_metadata_storage($newname);
-$dbh->do($request);
-if ($dbh->err) {
-    $dbh->disconnect();
-    &log(0,"MySQL Error Create: ".$dbh->errstr);
-    die $dbh->errstr;
+# Create the new metadata and portfolio tables
+foreach my $key (keys(%newnames)) {
+    if ($newnames{$key} ne '') { 
+        my $request =
+             &LONCAPA::lonmetadata::create_metadata_storage($newnames{$key},$oldnames{$key});
+        $dbh->do($request);
+        if ($dbh->err) {
+            $dbh->disconnect();
+            &log(0,"MySQL Error Create: ".$dbh->errstr);
+            die $dbh->errstr;
+        }
+    }
 }
+
 #
 # find out which users we need to examine
 my @domains = sort(&Apache::lonnet::current_machine_domains());
@@ -203,16 +221,57 @@ foreach my $dom (@domains) {
               no_chdir   => 1,
              }, join('/',($Apache::lonnet::perlvar{'lonDocRoot'},'res',$dom,$user)) );
     }
+    # Search for public portfolio files
+    my %portusers;
+    if ($oneuser) {
+        %portusers = (
+                        $oneuser => '',
+                       );
+    } else {
+        my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom;
+        &descend_tree($dir,0,\%portusers);
+    }
+    foreach my $uname (keys(%portusers)) {
+        my $urlstart = '/uploaded/'.$dom.'/'.$uname;
+        my $pathstart = &propath($dom,$uname).'/userfiles';
+        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;
+                $url = $urlstart.'/groups/'.$group.'/portfolio'.$path;
+            } else {
+                $fullpath = $pathstart.'/portfolio'.$file;
+                $url = $urlstart.'/portfolio'.$file;
+            }
+            if (ref($access{$file}) eq 'HASH') {
+                my %portaccesslog = 
+                    &LONCAPA::lonmetadata::process_portfolio_access_data($dbh,
+                           $simulate,\%newnames,$url,$fullpath,$access{$file});
+                &portfolio_logging(%portaccesslog);
+            }
+            my %portmetalog = &LONCAPA::lonmetadata::process_portfolio_metadata($dbh,$simulate,\%newnames,$url,$fullpath,$is_course,$dom,$uname,$group);
+            &portfolio_logging(%portmetalog);
+        }
+    }
 }
+
 #
-# Rename the table
+# Rename the tables
 if (! $simulate) {
-    $dbh->do('DROP TABLE IF EXISTS '.$oldname);
-    if (! $dbh->do('RENAME TABLE '.$newname.' TO '.$oldname)) {
-        &log(0,"MySQL Error Rename: ".$dbh->errstr);
-        die $dbh->errstr;
-    } else {
-        &log(1,"MySQL table rename successful.");
+    foreach my $key (keys(%oldnames)) {
+        if (($oldnames{$key} ne '') && ($newnames{$key} ne '')) {
+            $dbh->do('DROP TABLE IF EXISTS '.$oldnames{$key});
+            if (! $dbh->do('RENAME TABLE '.$newnames{$key}.' TO '.$oldnames{$key})) {
+                &log(0,"MySQL Error Rename: ".$dbh->errstr);
+                die $dbh->errstr;
+            } else {
+                &log(1,"MySQL table rename successful for $key.");
+            }
+        }
     }
 }
 if (! $dbh->disconnect) {
@@ -246,6 +305,37 @@ sub log {
     }
 }
 
+sub portfolio_logging {
+    my (%portlog) = @_;
+    foreach my $key (keys(%portlog)) {
+        if (ref($portlog{$key}) eq 'HASH') {
+            foreach my $item (keys(%{$portlog{$key}})) {
+                &log(0,$portlog{$key}{$item});
+            }
+        }
+    }
+}
+
+sub descend_tree {
+    my ($dir,$depth,$alldomusers) = @_;
+    if (-d $dir) {
+        opendir(DIR,$dir);
+        my @contents = grep(!/^\./,readdir(DIR));
+        closedir(DIR);
+        $depth ++;
+        foreach my $item (@contents) {
+            if ($depth < 4) {
+                &descend_tree($dir.'/'.$item,$depth,$alldomusers);
+            } else {
+                if (-e $dir.'/'.$item.'/file_permissions.db') {
+                 
+                    $$alldomusers{$item} = '';
+                }
+            }       
+        }
+    } 
+}
+
 ########################################################
 ########################################################
 ###                                                  ###
@@ -265,7 +355,7 @@ sub only_meta_files {
     foreach my $file (@PossibleFiles) {
         if ( ($file =~ /\.meta$/ &&            # Ends in meta
               $file !~ /\.\d+\.[^\.]+\.meta$/  # is not for a prior version
-             ) || (-d $file )) { # directories are okay
+             ) || (-d $File::Find::dir."/".$file )) { # directories are okay
                  # but we do not want /. or /..
             push(@ChosenFiles,$file);
         }
@@ -296,7 +386,7 @@ sub log_metadata {
     return if (-d $fullfilename); # No need to do anything here for directories
     if ($debug) {
         &log(6,$fullfilename);
-        my $ref=&metadata($fullfilename);
+        my $ref = &metadata($fullfilename);
         if (! defined($ref)) {
             &log(6,"    No data");
             return;
@@ -320,7 +410,7 @@ sub process_meta_file {
     #
     &log(3,$filename) if ($debug);
     #
-    my $ref=&metadata($filename);
+    my $ref = &metadata($filename);
     #
     # $url is the original file url, not the metadata file
     my $target = $filename;
@@ -349,25 +439,17 @@ sub process_meta_file {
         %dyn=&get_dynamic_metadata($url);
         &count_type($url);
     }
+    &LONCAPA::lonmetadata::getfiledates($ref,$target);
     #
-    if (! defined($ref->{'creationdate'}) ||
-        $ref->{'creationdate'} =~ /^\s*$/) {
-        $ref->{'creationdate'} = (stat($target))[9];
-    }
-    if (! defined($ref->{'lastrevisiondate'}) ||
-        $ref->{'lastrevisiondate'} =~ /^\s*$/) {
-        $ref->{'lastrevisiondate'} = (stat($target))[9];
-    }
-    $ref->{'creationdate'}     = &sqltime($ref->{'creationdate'});
-    $ref->{'lastrevisiondate'} = &sqltime($ref->{'lastrevisiondate'});
     my %Data = (
                 %$ref,
                 %dyn,
                 'url'=>$url,
                 'version'=>'current');
     if (! $simulate) {
-        my ($count,$err) = &LONCAPA::lonmetadata::store_metadata($dbh,$newname,
-                                                                 \%Data);
+        my ($count,$err) = 
+          &LONCAPA::lonmetadata::store_metadata($dbh,$newnames{'metadata'},
+                                                'metadata',\%Data);
         if ($err) {
             &log(0,"MySQL Error Insert: ".$err);
         }
@@ -389,7 +471,7 @@ sub process_meta_file {
 ########################################################
 ########################################################
 sub metadata {
-    my ($uri)=@_;
+    my ($uri) = @_;
     my %metacache=();
     $uri=&declutter($uri);
     my $filename=$uri;
@@ -398,7 +480,8 @@ sub metadata {
     if ($filename !~ /\.meta$/) { 
         $filename.='.meta';
     }
-    my $metastring=&getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$filename);
+    my $metastring = 
+        &LONCAPA::lonmetadata::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$filename);
     return undef if (! defined($metastring));
     my $parser=HTML::TokeParser->new(\$metastring);
     my $token;
@@ -419,7 +502,7 @@ sub metadata {
             }
             foreach ( @{$token->[3]}) {
                 $metacache{$uri.''.$unikey.'.'.$_}=$token->[2]->{$_};
-            } 
+            }
             if (! ($metacache{$uri.''.$unikey}=$parser->get_text('/'.$entry))){
                 $metacache{$uri.''.$unikey} = 
                     $metacache{$uri.''.$unikey.'.default'};
@@ -429,23 +512,6 @@ sub metadata {
     return \%metacache;
 }
 
-##
-## &getfile($filename)
-##   Slurps up an entire file into a scalar.  
-##   Returns undef if the file does not exist
-sub getfile {
-    my $file = shift();
-    if (! -e $file ) { 
-        return undef; 
-    }
-    my $fh=IO::File->new($file);
-    my $contents = '';
-    while (<$fh>) { 
-        $contents .= $_;
-    }
-    return $contents;
-}
-
 ########################################################
 ########################################################
 ###                                                  ###
@@ -638,41 +704,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 {