--- loncom/lonsql	2001/12/20 17:43:05	1.41
+++ loncom/lonsql	2002/06/18 19:39:13	1.47
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.41 2001/12/20 17:43:05 harris41 Exp $
+# $Id: lonsql,v 1.47 2002/06/18 19:39:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,8 @@
 # 03/22/2001 Scott Harrison
 # 8/30 Gerd Kortemeyer
 # 10/17,11/28,11/29,12/20 Scott Harrison
+# YEAR=2001
+# 5/11 Scott Harrison
 #
 ###
 
@@ -44,7 +46,7 @@
 ## ORGANIZATION OF THIS PERL SCRIPT                                          ##
 ## 1. Modules used                                                           ##
 ## 2. Enable find subroutine                                                 ##
-## 3. Read httpd access.conf and get variables                               ##
+## 3. Read httpd config files and get variables                              ##
 ## 4. Make sure that database can be accessed                                ##
 ## 5. Make sure this process is running from user=www                        ##
 ## 6. Check if other instance is running                                     ##
@@ -52,6 +54,9 @@
 ##                                                                           ##
 ###############################################################################
 
+use lib '/home/httpd/lib/perl/';
+use LONCAPA::Configuration;
+
 use IO::Socket;
 use Symbol;
 use POSIX;
@@ -75,17 +80,10 @@ sub wanted {
 $childmaxattempts=10;
 $run =0;#running counter to generate the query-id
 
-# ------------------------------------ Read httpd access.conf and get variables
-open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
-
-while ($configline=<CONFIG>) {
-    if ($configline =~ /PerlSetVar/) {
-	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-        chomp($varvalue);
-        $perlvar{$varname}=$varvalue;
-    }
-}
-close(CONFIG);
+# -------------------------------- Read loncapa_apache.conf and loncapa.conf
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
+                                                 'loncapa.conf');
+my %perlvar=%{$perlvarref};
 
 # ------------------------------------- Make sure that database can be accessed
 {
@@ -191,6 +189,76 @@ sub logthis {
     my $local=localtime($now);
     print $fh "$local ($$): $message\n";
 }
+
+# ------------------------------------------------------------------ Course log
+
+sub courselog {
+    my ($path,$command)=@_;
+    my %filters=();
+    foreach (split(/\:/,&unescape($command))) {
+	my ($name,$value)=split(/\=/,$_);
+        $filters{$name}=$value;
+    }
+    my @results=();
+    open(IN,$path.'/activity.log') or return ('file_error');
+    while ($line=<IN>) {
+        chomp($line);
+        my ($timestamp,$host,$log)=split(/\:/,$line);
+        foreach (split(/\&/,&unescape($log))) {
+	    my ($time,$res,$uname,$udom,$action,$values)=split(/\:/,$_);
+            my $include=1;
+            if (($filters{'username'}) && ($uname ne $filters{'username'})) 
+                                                               { $include=0; }
+            if (($filters{'domain'}) && ($udom ne $filters{'domain'})) 
+                                                               { $include=0; }
+            if (($filters{'url'}) && ($res!~/$filters{'url'}/)) 
+                                                               { $include=0; }
+            if (($filters{'start'}) && ($time<$filters{'start'})) 
+                                                               { $include=0; }
+            if (($filters{'end'}) && ($time>$filters{'end'})) 
+                                                               { $include=0; }
+            if (($filters{'action'} eq 'view') && ($action)) 
+                                                               { $include=0; }
+            if (($filters{'action'} eq 'submit') && ($action ne 'POST')) 
+                                                               { $include=0; }
+            if (($filters{'action'} eq 'grade') && ($action ne 'CSTORE')) 
+                                                               { $include=0; }
+            if ($include) {
+	       push(@results,$time.':'.$res.':'.$uname.':'.$udom.':'.
+                                            $action.':'.$values);
+            }
+       }
+    }
+    close IN;
+    return join('&',sort(@results));
+}
+
+# -------------------------------------------------------------------- User log
+
+sub userlog {
+    my ($path,$command)=@_;
+    my %filters=();
+    foreach (split(/\:/,&unescape($command))) {
+	my ($name,$value)=split(/\=/,$_);
+        $filters{$name}=$value;
+    }
+    my @results=();
+    open(IN,$path.'/activity.log') or return ('file_error');
+    while ($line=<IN>) {
+        chomp($line);
+        my ($timestamp,$host,$log)=split(/\:/,$line);
+        $log=&unescape($log);
+        my $include=1;
+        if (($filters{'action'} eq 'log') && ($log!~/^Log/)) { $include=0; }
+        if ($include) {
+	   push(@results,$timestamp.':'.$log);
+        }
+    }
+    close IN;
+    return join('&',sort(@results));
+}
+
+
 # ---------------------------------------------------- Fork once and dissociate
 $fpid=fork;
 exit if $fpid;
@@ -278,11 +346,9 @@ sub make_new_child {
 	    my $userinput = <$client>;
 	    chomp($userinput);
 	    	    
-	    my ($conserver,$querytmp,
-		$customtmp,$customshowtmp)=split(/&/,$userinput);
-	    my $query=unescape($querytmp);
-	    my $custom=unescape($customtmp);
-	    my $customshow=unescape($customshowtmp);
+	    my ($conserver,$query,
+		$arg1,$arg2,$arg3)=split(/&/,$userinput);
+	    my $query=unescape($query);
 
             #send query id which is pid_unixdatetime_runningcounter
 	    $queryid = $thisserver;
@@ -291,12 +357,42 @@ sub make_new_child {
 	    $queryid .= $run;
 	    print $client "$queryid\n";
 	    
-	    &logthis("QUERY: $query");
-	    &logthis("QUERY: $query");
+	    &logthis("QUERY: $query - $arg1 - $arg2 - $arg3");
 	    sleep 1;
+
+            my $result='';
+
+# ---------- At this point, query is received, query-ID assigned and sent back 
+# $query eq 'logquery' will mean that this is a query against log-files
+
+
+	   if (($query eq 'userlog') || ($query eq 'courselog')) {
+# ----------------------------------------------------- beginning of log query
+#
+# this goes against a user's log file
+#
+	       my $udom=&unescape($arg1);
+	       my $uname=&unescape($arg2);
+               my $command=&unescape($arg3);
+               my $path=&propath($udom,$uname);
+               if (-e "$path/activity.log") {
+		   if ($query eq 'userlog') {
+                       $result=&userlog($path,$command);
+                   } else {
+                       $result=&courselog($path,$command);
+                   }
+               } else {
+		   &logthis('Unable to do log query: '.$uname.'@'.$udom);
+	           $result='no_such_file';
+	       }
+# ------------------------------------------------------------ end of log query
+          } else {
+# -------------------------------------------------------- This is an sql query
+	    my $custom=unescape($arg1);
+	    my $customshow=unescape($arg2);
             #prepare and execute the query
 	    my $sth = $dbh->prepare($query);
-	    my $result;
+
 	    my @files;
 	    my $subsetflag=0;
 	    if ($query) {
@@ -373,8 +469,16 @@ sub make_new_child {
 		$result=join("&",@r2) unless $query;
 		$result.=$customresult;
 	    }
-	    # reply with result
-	    $result.="\n" if $result;
+# ------------------------------------------------------------ end of sql query
+	   }
+
+            # result does need to be escaped
+
+            $result=&escape($result);
+
+	    # reply with result, append \n unless already there
+
+	    $result.="\n" unless ($result=~/\n$/);
             &reply("queryreply:$queryid:$result",$conserver);
 
         }