--- loncom/metadata_database/searchcat.pl	2002/10/08 16:59:26	1.22
+++ loncom/metadata_database/searchcat.pl	2003/01/04 19:23:31	1.27
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.22 2002/10/08 16:59:26 www Exp $
+# $Id: searchcat.pl,v 1.27 2003/01/04 19:23:31 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,7 @@ use IO::File;
 use HTML::TokeParser;
 use DBI;
 use GDBM_File;
+use POSIX qw(strftime mktime);
 
 my @metalist;
 
@@ -69,22 +70,16 @@ sub escape {
 # ------------------------------------------- Code to evaluate dynamic metadata
 
 sub dynamicmeta {
-#
-#
-# Do nothing for now ...
-#
-#
-    return;
-#
-# ..., but stuff below already works
-#
+
     my $url=&declutter(shift);
     $url=~s/\.meta$//;
     my %returnhash=();
     my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
     my $prodir=&propath($adomain,$aauthor);
-    if (tie(%evaldata,'GDBM_File',
-            $prodir.'/nohist_resevaldata.db',&GDBM_WRCREAT,0640)) {
+    if ((tie(%evaldata,'GDBM_File',
+            $prodir.'/nohist_resevaldata.db',&GDBM_READER(),0640)) &&
+        (tie(%newevaldata,'GDBM_File',
+            $prodir.'/nohist_new_resevaldata.db',&GDBM_WRCREAT(),0640))) {
        my %sum=();
        my %cnt=();
        my %listitems=('count'        => 'add',
@@ -127,9 +122,9 @@ sub dynamicmeta {
 	             $sum{$ctype}=''.$evaldata{$_};
 	       }
 	    }
-	    if ($ctype eq 'count') {
-	       delete($evaldata{$_});
-            }
+	    if ($ctype ne 'count') {
+	       $newevaldata{$_}=$evaldata{$_};
+	   }
 	 }
       }
       foreach (keys %cnt) {
@@ -143,9 +138,10 @@ sub dynamicmeta {
      }
      if ($returnhash{'count'}) {
          my $newkey=$$.'_'.time.'_searchcat___'.&escape($url).'___count';
-         $evaldata{$newkey}=$returnhash{'count'};
+         $newevaldata{$newkey}=$returnhash{'count'};
      }
      untie(%evaldata);
+     untie(%newevaldata);
    }
    return %returnhash;
 }
@@ -168,13 +164,29 @@ delete $perlvar{'lonReceipt'}; # remove
 # ------------------------------------- Only run if machine is a library server
 exit unless $perlvar{'lonRole'} eq 'library';
 
+# ----------------------------- Make sure this process is running from user=www
+
+my $wwwid=getpwnam('www');
+if ($wwwid!=$<) {
+   $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+   $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
+   system("echo 'User ID mismatch. searchcat.pl must be run as user www.' |\
+ mailto $emailto -s '$subj' > /dev/null");
+   exit 1;
+}
+
+
+# ---------------------------------------------------------- We are in business
+
+open(LOG,'>'.$perlvar{'lonDaemons'}.'/logs/searchcat.log');
+print LOG '==== Searchcat Run '.localtime()."====\n\n";
 my $dbh;
 # ------------------------------------- Make sure that database can be accessed
 {
     unless (
 	    $dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
 	    ) { 
-	print "Cannot connect to database!\n";
+	print LOG "Cannot connect to database!\n";
 	exit;
     }
     my $make_metadata_table = "CREATE TABLE IF NOT EXISTS metadata (".
@@ -199,13 +211,20 @@ my @homeusers=grep
           grep {!/^\.\.?$/} readdir(RESOURCES);
 closedir RESOURCES;
 foreach my $user (@homeusers) {
+    print LOG "\n=== User: ".$user."\n\n";
+# Remove left-over db-files from potentially crashed searchcat run
+    my $prodir=&propath($perlvar{'lonDefDomain'},$user);
+    unlink($prodir.'/nohist_new_resevaldata.db');
+# Use find.pl
+    undef @metalist;
+    @metalist=();
     &find("$perlvar{'lonDocRoot'}/res/$perlvar{'lonDefDomain'}/$user");
-}
 
 # -- process each file to get metadata and put into search catalog SQL database
 # Also, check to see if already there.
 # I could just delete (without searching first), but this works for now.
 foreach my $m (@metalist) {
+    print LOG "- ".$m."\n";
     my $ref=&metadata($m);
     my $m2='/res/'.&declutter($m);
     $m2=~s/\.meta$//;
@@ -240,8 +259,17 @@ foreach my $m (@metalist) {
 # Need to, perhaps, remove stale SQL database records.
 # ... not yet implemented
 
+
+# -------------------------------------------------- Copy over the new db-files
+    system('mv '.$prodir.'/nohist_new_resevaldata.db '.
+	         $prodir.'/nohist_resevaldata.db');
+}
 # --------------------------------------------------- Close database connection
 $dbh->disconnect;
+print LOG "\n==== Searchcat completed ".localtime()." ====\n";
+close(LOG);
+exit 0;
+# =============================================================================
 
 # ---------------------------------------------------------------- Get metadata
 # significantly altered from subroutine present in lonnet
@@ -335,7 +363,30 @@ sub propath {
 # ---------------------------- convert 'time' format into a datetime sql format
 sub sqltime {
     my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-	localtime(@_[0]);
+	localtime(&unsqltime(@_[0]));
     $mon++; $year+=1900;
     return "$year-$mon-$mday $hour:$min:$sec";
 }
+
+sub maketime {
+    my %th=@_;
+    return POSIX::mktime(
+        ($th{'seconds'},$th{'minutes'},$th{'hours'},
+         $th{'day'},$th{'month'}-1,$th{'year'}-1900,0,0,$th{'dlsav'}));
+}
+
+
+#########################################
+#
+# Retro-fixing of un-backward-compatible time format
+
+sub unsqltime {
+    my $timestamp=shift;
+    if ($timestamp=~/^(\d+)\-(\d+)\-(\d+)\s+(\d+)\:(\d+)\:(\d+)$/) {
+       $timestamp=&maketime(
+	   'year'=>$1,'month'=>$2,'day'=>$3,
+           'hours'=>$4,'minutes'=>$5,'seconds'=>$6);
+    }
+    return $timestamp;
+}
+