--- loncom/metadata_database/searchcat.pl	2001/04/16 12:46:37	1.8
+++ loncom/metadata_database/searchcat.pl	2001/04/16 20:45:42	1.14
@@ -18,7 +18,7 @@ require "find.pl";
 sub wanted {
     (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) &&
     -f _ &&
-    /^.*\.meta$/ &&
+    /^.*\.meta$/ && !/^.+\.\d+\.[^\.]+\.meta$/ &&
     push(@metalist,"$dir/$_");
 }
 
@@ -56,21 +56,33 @@ foreach my $user (@homeusers) {
 }
 
 # -- 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) {
     my $ref=&metadata($m);
-    my $sth=$dbh->prepare('insert into metadata values ('.
+    my $m2='/res/'.&declutter($m);
+    $m2=~s/\.meta$//;
+    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'}).'"'.','.
-			  '"'.delete($ref->{'url'}).'"'.','.
+			  '"'.$m2.'"'.','.
 			  '"'.delete($ref->{'keywords'}).'"'.','.
-			  '"'.delete($ref->{'version'}).'"'.','.
+			  '"'.'current'.'"'.','.
 			  '"'.delete($ref->{'notes'}).'"'.','.
 			  '"'.delete($ref->{'abstract'}).'"'.','.
 			  '"'.delete($ref->{'mime'}).'"'.','.
 			  '"'.delete($ref->{'language'}).'"'.','.
-			  '"'.delete($ref->{'creationdate'}).'"'.','.
-			  '"'.delete($ref->{'lastrevisiondate'}).'"'.','.
+			  '"'.sqltime(delete($ref->{'creationdate'})).'"'.','.
+			  '"'.sqltime(delete($ref->{'lastrevisiondate'})).'"'.','.
 			  '"'.delete($ref->{'owner'}).'"'.','.
 			  '"'.delete($ref->{'copyright'}).'"'.')');
     $sth->execute();
@@ -171,3 +183,11 @@ sub propath {
     my $proname="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
     return $proname;
 } 
+
+# ---------------------------- convert 'time' format into a datetime sql format
+sub sqltime {
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+	localtime(@_[0]);
+    $mon++; $year+=1900;
+    return "$year-$mon-$mday $hour:$min:$sec";
+}