--- loncom/metadata_database/searchcat.pl	2001/04/16 13:45:20	1.11
+++ loncom/metadata_database/searchcat.pl	2002/05/11 21:28:20	1.17
@@ -1,13 +1,46 @@
 #!/usr/bin/perl
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
-
-# 04/14/2001 Scott Harrison
+#
+# $Id: searchcat.pl,v 1.17 2002/05/11 21:28:20 harris41 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+# YEAR=2001
+# 04/14/2001, 04/16/2001 Scott Harrison
+#
+# YEAR=2002
+# 05/11/2002 Scott Harrison
+#
+###
 
 # This script goes through a LON-CAPA resource
 # directory and gathers metadata.
 # The metadata is entered into a SQL database.
 
+use lib '/home/httpd/lib/perl/';
+use LONCAPA::Configuration;
+
 use IO::File;
 use HTML::TokeParser;
 use DBI;
@@ -22,17 +55,14 @@ sub wanted {
     push(@metalist,"$dir/$_");
 }
 
-# ------------------------------------ Read httpd access.conf and get variables
-open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
+# ------------------------- Read access.conf and loncapa.conf and get variables
+my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
+my %perlvar=%{$perlvarref};
+undef $perlvarref; # remove since sensitive and not needed
+delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
 
-while ($configline=<CONFIG>) {
-    if ($configline =~ /PerlSetVar/) {
-	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-        chomp($varvalue);
-        $perlvar{$varname}=$varvalue;
-    }
-}
-close(CONFIG);
+# ------------------------------------- Only run if machine is a library server
+exit unless $perlvar{'lonRole'} eq 'library';
 
 my $dbh;
 # ------------------------------------- Make sure that database can be accessed
@@ -61,27 +91,28 @@ foreach my $user (@homeusers) {
 foreach my $m (@metalist) {
     my $ref=&metadata($m);
     my $m2='/res/'.&declutter($m);
-    my $q2="select * from metadata where url like binary '/res/$m2'";
+    $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 '/res/$m2'");
+	$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'}).'"'.','.
-			  '"/res/'.$m2.'"'.','.
+			  '"'.$m2.'"'.','.
 			  '"'.delete($ref->{'keywords'}).'"'.','.
 			  '"'.'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();
@@ -182,3 +213,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";
+}