--- loncom/lonsql	2002/06/17 14:00:09	1.44
+++ loncom/lonsql	2002/07/05 15:07:59	1.50
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.44 2002/06/17 14:00:09 www Exp $
+# $Id: lonsql,v 1.50 2002/07/05 15:07:59 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -189,6 +189,97 @@ 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);
+#
+# $log has the actual log entries; currently still escaped, and
+# %26(timestamp)%3a(url)%3a(user)%3a(domain)
+# then additionally
+# %3aPOST%3a(name)%3d(value)%3a(name)%3d(value)
+# or
+# %3aCSTORE%3a(name)%3d(value)%26(name)%3d(value)
+#
+# get delimiter between timestamped entries to be &&&
+        $log=~s/\%26(\d+)\%3a/\&\&\&$1\%3a/g;
+# now go over all log entries 
+        foreach (split(/\&\&\&/,&unescape($log))) {
+	    my ($time,$res,$uname,$udom,$action,@values)=split(/\:/,$_);
+            my $values=&unescape(join(':',@values));
+            $values=~s/\&/\:/g;
+            $res=&unescape($res);
+            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<1000000000?'0':'').$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{'start'}) && ($timestamp<$filters{'start'})) 
+                                                             { $include=0; }
+        if (($filters{'end'}) && ($timestamp>$filters{'end'})) 
+                                                             { $include=0; }
+        if (($filters{'action'} eq 'log') && ($log!~/^Log/)) { $include=0; }
+        if (($filters{'action'} eq 'check') && ($log!~/^Check/)) 
+                                                             { $include=0; }
+        if ($include) {
+	   push(@results,$timestamp.':'.$log);
+        }
+    }
+    close IN;
+    return join('&',sort(@results));
+}
+
+
 # ---------------------------------------------------- Fork once and dissociate
 $fpid=fork;
 exit if $fpid;
@@ -276,11 +367,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;
@@ -289,17 +378,42 @@ sub make_new_child {
 	    $queryid .= $run;
 	    print $client "$queryid\n";
 	    
-	    &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
 
-          unless ($query eq 'logquery') {
+
+	   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) {
@@ -377,15 +491,14 @@ sub make_new_child {
 		$result.=$customresult;
 	    }
 # ------------------------------------------------------------ end of sql query
-	} else {
-# ------------------------------------------------------ beginning of log query
-#
-# do log queries here
-#
-	    $result='not_yet_implemented';
-# ------------------------------------------------------------ end of log query
-	}
+	   }
+
+            # 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);