--- loncom/lonsql	2003/07/25 17:07:06	1.56
+++ loncom/lonsql	2004/05/11 20:03:05	1.59
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.56 2003/07/25 17:07:06 bowersj2 Exp $
+# $Id: lonsql,v 1.59 2004/05/11 20:03:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,42 +41,6 @@ Note that a lonsql.pid file contains the
 
 =head1 OVERVIEW
 
-The SQL database in LON-CAPA is used for catalog searches against
-resource metadata only. The authoritative version of the resource
-metadata is an XML-file on the normal file system (same file name as
-resource plus ".meta"). The SQL-database is a cache of these files,
-and can be reconstructed from the XML files at any time.
-
-The current database is implemented assuming a non-adjustable
-architecture involving these data fields (specific to each version of
-a resource).
-
-=over 4
-
-=item * title
-
-=item * author
-
-=item * subject
-
-=item * notes
-
-=item * abstract
-
-=item * mime
-
-=item * language
-
-=item * creationdate
-
-=item * lastrevisiondate
-
-=item * owner
-
-=item * copyright 
-
-=back 
-
 =head2 Purpose within LON-CAPA
 
 LON-CAPA is meant to distribute A LOT of educational content to A LOT
@@ -139,6 +103,7 @@ use strict;
 
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
+use LONCAPA::lonmetadata();
 
 use IO::Socket;
 use Symbol;
@@ -251,6 +216,11 @@ unless ($dbh = DBI->connect("DBI:mysql:l
     my $subj="LON: $perlvar{'lonHostID'} Cannot connect to database!";
     system("echo 'Cannot connect to MySQL database!' |".
            " mailto $emailto -s '$subj' > /dev/null");
+
+    open(SMP,'>/home/httpd/html/lon-status/mysql.txt');
+    print SMP 'time='.time.'&mysql=defunct'."\n";
+    close(SMP);
+
     exit 1;
 } else {
     $dbh->disconnect;
@@ -312,7 +282,7 @@ my $execdir=$perlvar{'lonDaemons'};
 open (PIDSAVE,">$execdir/logs/lonsql.pid");
 print PIDSAVE "$$\n";
 close(PIDSAVE);
-&logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>");
+&logthis("<font color='red'>CRITICAL: ---------- Starting ----------</font>");
 
 #
 # Ignore signals generated during initial startup
@@ -383,7 +353,7 @@ sub make_new_child {
                                     $perlvar{'lonSqlAccess'},
                                     { RaiseError =>0,PrintError=>0})) { 
             sleep(10+int(rand(20)));
-            &logthis("<font color=blue>WARNING: Couldn't connect to database".
+            &logthis("<font color='blue'>WARNING: Couldn't connect to database".
                      ": $@</font>");
                      #  "($st secs): $@</font>");
             print "database handle error\n";
@@ -451,7 +421,7 @@ sub make_new_child {
         #
         # close the database handle
 	$dbh->disconnect
-            or &logthis("<font color=blue>WARNING: Couldn't disconnect".
+            or &logthis("<font color='blue'>WARNING: Couldn't disconnect".
                         " from database  $DBI::errstr : $@</font>");
         # this exit is VERY important, otherwise the child will become
         # a producer of more and more children, forking yourself into
@@ -506,8 +476,9 @@ sub do_sql_query {
         #prepare and execute the query
         my $sth = $dbh->prepare($query);
         unless ($sth->execute()) {
-            &logthis("<font color=blue>WARNING: ".
-                     "Could not retrieve from database: $@</font>");
+            &logthis('<font color="blue">'.
+                     'WARNING: Could not retrieve from database:'.
+                     $sth->errstr().'</font>');
         } else {
             my $aref=$sth->fetchall_arrayref;
             foreach my $row (@$aref) {
@@ -939,7 +910,7 @@ sub HUNTSMAN {                      # si
     kill 'INT' => keys %children;
     my $execdir=$perlvar{'lonDaemons'};
     unlink("$execdir/logs/lonsql.pid");
-    &logthis("<font color=red>CRITICAL: Shutting down</font>");
+    &logthis("<font color='red'>CRITICAL: Shutting down</font>");
     $unixsock = "mysqlsock";
     my $port="$perlvar{'lonSockDir'}/$unixsock";
     unlink($port);
@@ -950,7 +921,7 @@ sub HUPSMAN {                      # sig
     local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children
     kill 'INT' => keys %children;
     close($server);                # free up socket
-    &logthis("<font color=red>CRITICAL: Restarting</font>");
+    &logthis("<font color='red'>CRITICAL: Restarting</font>");
     my $execdir=$perlvar{'lonDaemons'};
     $unixsock = "mysqlsock";
     my $port="$perlvar{'lonSockDir'}/$unixsock";
@@ -960,23 +931,12 @@ sub HUPSMAN {                      # sig
 
 sub DISCONNECT {
     $dbh->disconnect or 
-    &logthis("<font color=blue>WARNING: Couldn't disconnect from database ".
+    &logthis("<font color='blue'>WARNING: Couldn't disconnect from database ".
              " $DBI::errstr : $@</font>");
     exit;
 }
 
 
-
-
-
-
-
-
-
-
-
-# ----------------------------------- POD (plain old documentation, CPAN style)
-
 =pod
 
 =back