[LON-CAPA-cvs] cvs: loncom / lonsql

[matthew]

matthew		Fri Aug 20 12:42:41 2004 EDT

  Modified files:              
    /loncom	lonsql 
  Log:
  Removed some commented out code, specify full path to parse_activity_log.pl,
  additional logging code is intentional.
  
  
Index: loncom/lonsql
diff -u loncom/lonsql:1.63 loncom/lonsql:1.64
--- loncom/lonsql:1.63	Wed Jul 28 16:46:28 2004
+++ loncom/lonsql	Fri Aug 20 12:42:41 2004
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.63 2004/07/28 20:46:28 matthew Exp $
+# $Id: lonsql,v 1.64 2004/08/20 16:42:41 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -211,31 +211,14 @@
 if (! -e $conf_file) {
     if (open MYCNF, ">$conf_file") {
         print MYCNF <<"ENDMYCNF";
-# Generated by LON-CAPA
-#
-# This file is edited automatically 
-# Put your configuration below the LON-CAPA configuration code
-#
-# BEGIN LON-CAPA Specific configuration code
 [client]
 user=www
 password=$perlvar{'lonSqlAccess'}
-# END LON-CAPA Specific configuration code 
-# 
-# Place your own configuration code below the next line
-#-------------------------------------------------
 ENDMYCNF
-
         close MYCNF;
     } else {
         warn "Unable to write $conf_file, continuing";
     }
-} else {
-    # it exists.  FIXME: Need to ensure we have current password in it...
-    # my @Original = `cat $conf_file`;
-    # if ($Original[0] =~ /^\# Generated by LON-CAPA/ ) {
-    # if (! open MYCNF, ">$conf_file") {
-    # }
 }
 
 
@@ -460,9 +443,11 @@
                 }
             } elsif ($query eq 'prepare activity log') {
                 my ($cid,$domain) = map {&unescape($_);} ($arg1,$arg2);
+                &logthis('preparing activity log tables for '.$cid);
                 my $command = 
-                    qq{parse_activity_log.pl -course=$cid -domain=$domain};
+                    qq{$perlvar{'lonDaemons'}/parse_activity_log.pl -course=$cid -domain=$domain};
                 system($command);
+                &logthis($command);
                 my $returnvalue = $?>>8;
                 if ($returnvalue) {
                     $result = 'error: parse_activity_log.pl returned '.
@@ -524,6 +509,7 @@
 
 sub do_sql_query {
     my ($query,$custom,$customshow) = @_;
+    &logthis('doing query '.$query);
     $custom     = &unescape($custom);
     $customshow = &unescape($customshow);
     #