--- loncom/metadata_database/searchcat.pl	2003/06/19 19:34:27	1.33
+++ loncom/metadata_database/searchcat.pl	2003/12/23 15:47:26	1.44
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.33 2003/06/19 19:34:27 matthew Exp $
+# $Id: searchcat.pl,v 1.44 2003/12/23 15:47:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,7 +76,34 @@ use POSIX qw(strftime mktime);
 
 my @metalist;
 
+$simplestatus='';
+my %countext=();
 
+sub writesimple {
+    open(SMP,'>/home/httpd/html/lon-status/mysql.txt');
+    print SMP $simplestatus."\n";
+    close(SMP);
+}
+
+sub writecount {
+    open(RSMP,'>/home/httpd/html/lon-status/rescount.txt');
+    foreach (keys %countext) {
+	print RSMP $_.'='.$countext{$_}.'&';
+    }
+    print RSMP 'time='.time."\n";
+    close(RSMP);
+}
+
+sub count {
+    my $file=shift;
+    $file=~/\.(\w+)$/;
+    my $ext=lc($1);
+    if (defined($countext{$ext})) {
+	$countext{$ext}++;
+    } else {
+	$countext{$ext}=1;
+    }
+}
 # ----------------------------------------------------- Un-Escape Special Chars
 
 sub unescape {
@@ -97,82 +124,87 @@ sub escape {
 # ------------------------------------------- Code to evaluate dynamic metadata
 
 sub dynamicmeta {
-
     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_READER(),0640)) &&
-        (tie(%newevaldata,'GDBM_File',
-             $prodir.'/nohist_new_resevaldata.db',&GDBM_WRCREAT(),0640))) {
-        my %sum=();
-        my %cnt=();
-        my %listitems=('count'        => 'add',
-                       'course'       => 'add',
-                       'avetries'     => 'avg',
-                       'stdno'        => 'add',
-                       'difficulty'   => 'avg',
-                       'clear'        => 'avg',
-                       'technical'    => 'avg',
-                       'helpful'      => 'avg',
-                       'correct'      => 'avg',
-                       'depth'        => 'avg',
-                       'comments'     => 'app',
-                       'usage'        => 'cnt'
-                       );
-        my $regexp=$url;
-        $regexp=~s/(\W)/\\$1/g;
-        $regexp='___'.$regexp.'___([a-z]+)$';
-        foreach (keys %evaldata) {
-            my $key=&unescape($_);
-            if ($key=~/$regexp/) {
-                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 {
-                        $sum{$ctype}=''.$evaldata{$_};
-                    }
-                }
-                if ($ctype ne 'count') {
-                    $newevaldata{$_}=$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';
-            $newevaldata{$newkey}=$returnhash{'count'};
-        }
-        untie(%evaldata);
-        untie(%newevaldata);
+# Get metadata except counts
+    if (tie(%evaldata,'GDBM_File',
+            $prodir.'/nohist_resevaldata.db',&GDBM_READER(),0640)) {
+	my %sum=();
+	my %cnt=();
+	my %concat=();
+	my %listitems=(
+		       'course'       => 'add',
+		       'goto'         => 'add',
+		       'comefrom'     => 'add',
+		       'avetries'     => 'avg',
+		       'stdno'        => 'add',
+		       'difficulty'   => 'avg',
+		       'clear'        => 'avg',
+		       'technical'    => 'avg',
+		       'helpful'      => 'avg',
+		       'correct'      => 'avg',
+		       'depth'        => 'avg',
+		       'comments'     => 'app',
+		       'usage'        => 'cnt'
+		       );
+	
+	my $regexp=$url;
+	$regexp=~s/(\W)/\\$1/g;
+	$regexp='___'.$regexp.'___([a-z]+)$';
+	while (my ($esckey,$value)=each %evaldata) {
+	    $key=&unescape($esckey);
+	    if ($key=~/$regexp/) {
+		my ($item,$purl,$cat)=split(/___/,$_);
+		if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
+		unless ($listitems{$cat} eq 'app') {
+		    if (defined($sum{$cat})) {
+			$sum{$cat}+=$evaldata{$_};
+			$concat{$cat}.=','.$item;
+		    } else {
+			$sum{$cat}=$evaldata{$_};
+			$concat{$cat}=$item;
+		    }
+		} else {
+		    if (defined($sum{$cat})) {
+			if ($evaldata{$_}) {
+			    $sum{$cat}.='<hr>'.$evaldata{$_};
+			}
+		    } else {
+			$sum{$cat}=''.$evaldata{$_};
+		    }
+		}
+	    }
+	}
+	untie(%evaldata);
+    }
+# construct the return hash for non-count data
+    my %returnhash=();
+    while ($_=each(%cnt)) {
+	if ($listitems{$_} eq 'avg') {
+	    $returnhash{$_}=int(($sum{$_}/$cnt{$_})*100.0+0.5)/100.0;
+	} elsif ($listitems{$_} eq 'cnt') {
+	    $returnhash{$_}=$cnt{$_};
+	} else {
+	    $returnhash{$_}=$sum{$_};
+	}
+	$returnhash{$_.'_list'}=$concat{$_};
+    }
+# get count
+    if (tie(%evaldata,'GDBM_File',
+            $prodir.'/nohist_accesscount.db',&GDBM_READER(),0640)) {
+	if (! exists($evaldata{$uri})) {
+	    $returnhash{'count'}='Not Available';
+	} else {
+	    $returnhash{'count'}=$evaldata{$uri};
+	}
+	untie %evaldata;
     }
     return %returnhash;
 }
-
+  
 # ----------------- Code to enable 'find' subroutine listing of the .meta files
 require "find.pl";
 sub wanted {
@@ -207,6 +239,7 @@ if ($wwwid!=$<) {
 
 open(LOG,'>'.$perlvar{'lonDaemons'}.'/logs/searchcat.log');
 print LOG '==== Searchcat Run '.localtime()."====\n\n";
+$simplestatus='time='.time.'&';
 my $dbh;
 # ------------------------------------- Make sure that database can be accessed
 {
@@ -214,8 +247,11 @@ my $dbh;
 	    $dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
 	    ) { 
 	print LOG "Cannot connect to database!\n";
+	$simplestatus.='mysql=defunct';
+	&writesimple();
 	exit;
     }
+
     my $make_metadata_table = "CREATE TABLE IF NOT EXISTS metadata (".
         "title TEXT, author TEXT, subject TEXT, url TEXT, keywords TEXT, ".
         "version TEXT, notes TEXT, abstract TEXT, mime TEXT, language TEXT, ".
@@ -237,11 +273,34 @@ my @homeusers = grep {
     &ishome("$perlvar{'lonDocRoot'}/res/$perlvar{'lonDefDomain'}/$_")
     } grep {!/^\.\.?$/} readdir(RESOURCES);
 closedir RESOURCES;
+
+#
+# Create the statement handlers we need
+my $delete_sth = $dbh->prepare
+    ("DELETE FROM metadata WHERE url LIKE BINARY ?");
+
+my $insert_sth = $dbh->prepare
+    ("INSERT INTO metadata VALUES (".
+     "?,".   # title
+     "?,".   # author
+     "?,".   # subject
+     "?,".   # m2???
+     "?,".   # version
+     "?,".   # current
+     "?,".   # notes
+     "?,".   # abstract
+     "?,".   # mime
+     "?,".   # language
+     "?,".   # creationdate
+     "?,".   # revisiondate
+     "?,".   # owner
+     "?)"    # copyright
+     );
+
 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=();
@@ -255,44 +314,41 @@ foreach my $user (@homeusers) {
         my $m2='/res/'.&declutter($m);
         $m2=~s/\.meta$//;
         &dynamicmeta($m2);
-        my $q2="select * from metadata where url like binary '$m2'";
-        my $sth = $dbh->prepare($q2);
-        $sth->execute();
-        my $r1=$sth->fetchall_arrayref;
-        if (@$r1) {
-            $sth=$dbh->prepare("delete from metadata where url like binary '$m2'");
-            $sth->execute();
-        }
-        $sth=$dbh->prepare('insert into metadata values ('.
-                           '"'.delete($ref->{'title'}).'"'.','.
-                           '"'.delete($ref->{'author'}).'"'.','.
-                           '"'.delete($ref->{'subject'}).'"'.','.
-                           '"'.$m2.'"'.','.
-                           '"'.delete($ref->{'keywords'}).'"'.','.
-                           '"'.'current'.'"'.','.
-                           '"'.delete($ref->{'notes'}).'"'.','.
-                           '"'.delete($ref->{'abstract'}).'"'.','.
-                           '"'.delete($ref->{'mime'}).'"'.','.
-                           '"'.delete($ref->{'language'}).'"'.','.
-                           '"'.sqltime(delete($ref->{'creationdate'})).'"'.','.
-                           '"'.sqltime(delete($ref->{'lastrevisiondate'})).'"'.','.
-                           '"'.delete($ref->{'owner'}).'"'.','.
-                           '"'.delete($ref->{'copyright'}).'"'.')');
-        $sth->execute();
+ 	if ($ref->{'obsolete'}) { print LOG "obsolete\n"; next; }
+	if ($ref->{'copyright'} eq 'private') { print LOG "private\n"; next; }
+	&count($m2);
+        $delete_sth->execute($m2);
+        $insert_sth->execute($ref->{'title'},
+                             $ref->{'author'},
+                             $ref->{'subject'},
+                             $m2,
+                             $ref->{'keywords'},
+                             'current',
+                             $ref->{'notes'},
+                             $ref->{'abstract'},
+                             $ref->{'mime'},
+                             $ref->{'language'},
+                             sqltime($ref->{'creationdate'}),
+                             sqltime($ref->{'lastrevisiondate'}),
+                             $ref->{'owner'},
+                             $ref->{'copyright'});
+#        if ($dbh->err()) {
+#            print STDERR "Error:".$dbh->errstr()."\n";
+#        }
+        $ref = undef;
     }
     
     # --------------------------------------------------- Clean up database
     # 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);
+&writesimple();
+&writecount();
 exit 0;