--- loncom/metadata_database/searchcat.pl	2003/07/30 16:49:27	1.36
+++ loncom/metadata_database/searchcat.pl	2003/10/07 17:51:38	1.41
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.36 2003/07/30 16:49:27 www Exp $
+# $Id: searchcat.pl,v 1.41 2003/10/07 17:51:38 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -77,6 +77,7 @@ use POSIX qw(strftime mktime);
 my @metalist;
 
 $simplestatus='';
+my %countext=();
 
 sub writesimple {
     open(SMP,'>/home/httpd/html/lon-status/mysql.txt');
@@ -84,6 +85,25 @@ sub writesimple {
     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 {
@@ -118,6 +138,8 @@ sub dynamicmeta {
        my %cnt=();
        my %listitems=('count'        => 'add',
                       'course'       => 'add',
+		      'goto'         => 'add',
+		      'comefrom'     => 'add',
                       'avetries'     => 'avg',
                       'stdno'        => 'add',
                       'difficulty'   => 'avg',
@@ -290,6 +312,9 @@ foreach my $user (@homeusers) {
         my $m2='/res/'.&declutter($m);
         $m2=~s/\.meta$//;
         &dynamicmeta($m2);
+ 	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'},
@@ -316,14 +341,18 @@ foreach my $user (@homeusers) {
     # ... not yet implemented
         
     # ------------------------------------------- Copy over the new db-files
-    system('mv '.$prodir.'/nohist_new_resevaldata.db '.
-           $prodir.'/nohist_resevaldata.db');
+    #
+
+	    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;