--- loncom/lonsql	2002/05/17 14:03:04	1.43
+++ loncom/lonsql	2002/06/17 14:00:09	1.44
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.43 2002/05/17 14:03:04 matthew Exp $
+# $Id: lonsql,v 1.44 2002/06/17 14:00:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -290,8 +290,13 @@ sub make_new_child {
 	    print $client "$queryid\n";
 	    
 	    &logthis("QUERY: $query");
-	    &logthis("QUERY: $query");
 	    sleep 1;
+
+# ---------- 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') {
+# -------------------------------------------------------- This is an sql query
             #prepare and execute the query
 	    my $sth = $dbh->prepare($query);
 	    my $result;
@@ -371,8 +376,17 @@ sub make_new_child {
 		$result=join("&",@r2) unless $query;
 		$result.=$customresult;
 	    }
-	    # reply with result
-	    $result.="\n" if $result;
+# ------------------------------------------------------------ end of sql query
+	} else {
+# ------------------------------------------------------ beginning of log query
+#
+# do log queries here
+#
+	    $result='not_yet_implemented';
+# ------------------------------------------------------------ end of log query
+	}
+	    # reply with result, append \n unless already there
+	    $result.="\n" unless ($result=~/\n$/);
             &reply("queryreply:$queryid:$result",$conserver);
 
         }