--- loncom/lonsql 2003/07/30 16:49:27 1.57
+++ loncom/lonsql 2004/05/11 21:08:20 1.60
@@ -3,7 +3,7 @@
# The LearningOnline Network
# lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
#
-# $Id: lonsql,v 1.57 2003/07/30 16:49:27 www Exp $
+# $Id: lonsql,v 1.60 2004/05/11 21:08:20 matthew 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;
@@ -317,7 +282,7 @@ my $execdir=$perlvar{'lonDaemons'};
open (PIDSAVE,">$execdir/logs/lonsql.pid");
print PIDSAVE "$$\n";
close(PIDSAVE);
-&logthis("CRITICAL: ---------- Starting ----------");
+&logthis("CRITICAL: ---------- Starting ----------");
#
# Ignore signals generated during initial startup
@@ -388,7 +353,7 @@ sub make_new_child {
$perlvar{'lonSqlAccess'},
{ RaiseError =>0,PrintError=>0})) {
sleep(10+int(rand(20)));
- &logthis("WARNING: Couldn't connect to database".
+ &logthis("WARNING: Couldn't connect to database".
": $@");
# "($st secs): $@");
print "database handle error\n";
@@ -448,15 +413,13 @@ sub make_new_child {
# result does not need to be escaped because it has already been
# escaped.
#$result=&escape($result);
- # reply with result, append \n unless already there
- $result.="\n" unless ($result=~/\n$/);
&reply("queryreply:$queryid:$result",$conserver);
}
# tidy up gracefully and finish
#
# close the database handle
$dbh->disconnect
- or &logthis("WARNING: Couldn't disconnect".
+ or &logthis("WARNING: Couldn't disconnect".
" from database $DBI::errstr : $@");
# this exit is VERY important, otherwise the child will become
# a producer of more and more children, forking yourself into
@@ -511,8 +474,9 @@ sub do_sql_query {
#prepare and execute the query
my $sth = $dbh->prepare($query);
unless ($sth->execute()) {
- &logthis("WARNING: ".
- "Could not retrieve from database: $@");
+ &logthis(''.
+ 'WARNING: Could not retrieve from database:'.
+ $sth->errstr().'');
} else {
my $aref=$sth->fetchall_arrayref;
foreach my $row (@$aref) {
@@ -944,7 +908,7 @@ sub HUNTSMAN { # si
kill 'INT' => keys %children;
my $execdir=$perlvar{'lonDaemons'};
unlink("$execdir/logs/lonsql.pid");
- &logthis("CRITICAL: Shutting down");
+ &logthis("CRITICAL: Shutting down");
$unixsock = "mysqlsock";
my $port="$perlvar{'lonSockDir'}/$unixsock";
unlink($port);
@@ -955,7 +919,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("CRITICAL: Restarting");
+ &logthis("CRITICAL: Restarting");
my $execdir=$perlvar{'lonDaemons'};
$unixsock = "mysqlsock";
my $port="$perlvar{'lonSockDir'}/$unixsock";
@@ -965,23 +929,12 @@ sub HUPSMAN { # sig
sub DISCONNECT {
$dbh->disconnect or
- &logthis("WARNING: Couldn't disconnect from database ".
+ &logthis("WARNING: Couldn't disconnect from database ".
" $DBI::errstr : $@");
exit;
}
-
-
-
-
-
-
-
-
-
-# ----------------------------------- POD (plain old documentation, CPAN style)
-
=pod
=back