--- loncom/metadata_database/searchcat.pl	2002/10/08 15:09:36	1.21
+++ loncom/metadata_database/searchcat.pl	2002/10/18 13:54:31	1.24
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.21 2002/10/08 15:09:36 www Exp $
+# $Id: searchcat.pl,v 1.24 2002/10/18 13:54: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;
 
@@ -57,6 +58,14 @@ sub unescape {
     return $str;
 }
 
+# -------------------------------------------------------- Escape Special Chars
+
+sub escape {
+    my $str=shift;
+    $str =~ s/(\W)/"%".unpack('H2',$1)/eg;
+    return $str;
+}
+
 
 # ------------------------------------------- Code to evaluate dynamic metadata
 
@@ -76,7 +85,7 @@ sub dynamicmeta {
     my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
     my $prodir=&propath($adomain,$aauthor);
     if (tie(%evaldata,'GDBM_File',
-            $prodir.'/nohist_resevaldata.db',&GDBM_READER,0640)) {
+            $prodir.'/nohist_resevaldata.db',&GDBM_WRCREAT(),0640)) {
        my %sum=();
        my %cnt=();
        my %listitems=('count'        => 'add',
@@ -98,32 +107,44 @@ sub dynamicmeta {
        foreach (keys %evaldata) {
 	 my $key=&unescape($_);
 	 if ($key=~/$regexp/) {
-            if (defined($cnt{$1})) { $cnt{$1}++; } else { $cnt{$1}=1; }
-            unless ($listitems{$1} eq 'app') {
-                  if (defined($sum{$1})) {
-                     $sum{$1}+=$evaldata{$_};
-   	          } else {
-                     $sum{$1}=$evaldata{$_};
+	    my $ctype=$1;
+            if (defined($cnt{$ctype})) { 
+               $cnt{$ctype}++; 
+            } else { 
+               $cnt{$ctype}=1; 
+            }
+            unless ($listitems{$ctype} eq 'app') {
+               if (defined($sum{$ctype})) {
+                  $sum{$ctype}+=$evaldata{$_};
+   	       } else {
+                  $sum{$ctype}=$evaldata{$_};
+	       }
+            } else {
+               if (defined($sum{$ctype})) {
+                  if ($evaldata{$_}) {
+                     $sum{$ctype}.='<hr>'.$evaldata{$_};
 	          }
-             } else {
-                  if (defined($sum{$1})) {
-                     if ($evaldata{$_}) {
-                        $sum{$1}.='<hr>'.$evaldata{$_};
-	             }
- 	          } else {
-	             $sum{$1}=''.$evaldata{$_};
-	          }
-	      }
-          }
-          foreach (keys %cnt) {
-             if ($listitems{$_} eq 'avg') {
-	         $returnhash{$_}=int(($sum{$_}/$cnt{$_})*100.0+0.5)/100.0;
-             } elsif ($listitems{$_} eq 'cnt') {
-                 $returnhash{$_}=$cnt{$_};
-             } else {
-                 $returnhash{$_}=$sum{$_};
-             }
-          }
+ 	       } else {
+	             $sum{$ctype}=''.$evaldata{$_};
+	       }
+	    }
+	    if ($ctype eq 'count') {
+	       delete($evaldata{$_});
+            }
+	 }
+      }
+      foreach (keys %cnt) {
+         if ($listitems{$_} eq 'avg') {
+	     $returnhash{$_}=int(($sum{$_}/$cnt{$_})*100.0+0.5)/100.0;
+         } elsif ($listitems{$_} eq 'cnt') {
+             $returnhash{$_}=$cnt{$_};
+         } else {
+             $returnhash{$_}=$sum{$_};
+         }
+     }
+     if ($returnhash{'count'}) {
+         my $newkey=$$.'_'.time.'_searchcat___'.&escape($url).'___count';
+         $evaldata{$newkey}=$returnhash{'count'};
      }
      untie(%evaldata);
    }
@@ -315,7 +336,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;
+}
+