--- loncom/lonsql	2000/06/26 02:42:42	1.2
+++ loncom/lonsql	2001/03/15 14:26:56	1.6
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 # lonsql-based on the preforker:harsha jagasia:date:5/10/00
+# 7/25 Gerd Kortemeyer
+# many different dates Scott Harrison
 
 use IO::Socket;
 use Symbol;
@@ -27,6 +29,17 @@ while ($configline=<CONFIG>) {
 }
 close(CONFIG);
 
+# --------------------------------------------- Check if other instance running
+
+my $pidfile="$perlvar{'lonDaemons'}/logs/lonsql.pid";
+
+if (-e $pidfile) {
+   my $lfh=IO::File->new("$pidfile");
+   my $pide=<$lfh>;
+   chomp($pide);
+   if (kill 0 => $pide) { die "already running"; }
+}
+
 # ------------------------------------------------------------- Read hosts file
 $PREFORK=4; # number of children to maintain, at least four spare
 
@@ -168,7 +181,7 @@ sub make_new_child {
         #open database handle
 	# making dbh global to avoid garbage collector
 	unless (
-		$dbh = DBI->connect("DBI:mysql:loncapa","www","newmysql",{ RaiseError =>1,})
+		$dbh = DBI->connect("DBI:mysql:loncapa","www","123",{ RaiseError =>0,PrintError=>0})
 		) { 
 	            my $st=120+int(rand(240));
 		    &logthis("<font color=blue>WARNING: Couldn't connect to database  ($st secs): $@</font>");
@@ -189,7 +202,8 @@ sub make_new_child {
 	    my $userinput = <$client>;
 	    chomp($userinput);
 	    	    
-	    my ($conserver,$query)=split(/&/,$userinput);
+	    my ($conserver,$querytmp)=split(/&/,$userinput);
+	    my $query=unescape($querytmp);
 
             #send query id which is pid_unixdatetime_runningcounter
 	    $queryid = $thisserver;
@@ -199,15 +213,18 @@ sub make_new_child {
 	    print $client "$queryid\n";
 	    
             #prepare and execute the query
-#	    my $sth = $dbh->prepare($query);
-#	    unless ($sth->execute())
-#	    {
-#		&logthis(
-# "<font color=blue>WARNING: Could not retrieve from database: $@</font>"
-#                );
-#	    }
-#            my $result=$sth->fetch(???);
-	    $result="123";
+	    my $sth = $dbh->prepare($query);
+	    my $result;
+	    unless ($sth->execute())
+	    {
+		&logthis("<font color=blue>WARNING: Could not retrieve from database: $@</font>");
+		$result="";
+	    }
+	    else {
+		my $r1=$sth->fetchall_arrayref;
+		my @r2; map {my $a=$_; my @b=map {escape($_)} @$a; push @r2,join(",", @b)} (@$r1);
+		$result=join("&",@r2) . "\n";
+	    }
             &reply("queryreply:$queryid:$result",$conserver);
 
         }
@@ -262,3 +279,18 @@ sub reply {
   return $answer;
 }
 
+# -------------------------------------------------------- Escape Special Chars
+
+sub escape {
+    my $str=shift;
+    $str =~ s/(\W)/"%".unpack('H2',$1)/eg;
+    return $str;
+}
+
+# ----------------------------------------------------- Un-Escape Special Chars
+
+sub unescape {
+    my $str=shift;
+    $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+    return $str;
+}