--- loncom/lonsql	2004/05/03 16:20:57	1.58
+++ loncom/lonsql	2004/06/08 22:09:44	1.62
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.58 2004/05/03 16:20:57 matthew Exp $
+# $Id: lonsql,v 1.62 2004/06/08 22:09:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,6 +115,7 @@ use Fcntl;
 use Tie::RefHash;
 use DBI;
 use File::Find;
+use localenroll;
 
 ########################################################
 ########################################################
@@ -282,7 +283,7 @@ my $execdir=$perlvar{'lonDaemons'};
 open (PIDSAVE,">$execdir/logs/lonsql.pid");
 print PIDSAVE "$$\n";
 close(PIDSAVE);
-&logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>");
+&logthis("<font color='red'>CRITICAL: ---------- Starting ----------</font>");
 
 #
 # Ignore signals generated during initial startup
@@ -353,7 +354,7 @@ sub make_new_child {
                                     $perlvar{'lonSqlAccess'},
                                     { RaiseError =>0,PrintError=>0})) { 
             sleep(10+int(rand(20)));
-            &logthis("<font color=blue>WARNING: Couldn't connect to database".
+            &logthis("<font color='blue'>WARNING: Couldn't connect to database".
                      ": $@</font>");
                      #  "($st secs): $@</font>");
             print "database handle error\n";
@@ -381,7 +382,7 @@ sub make_new_child {
 	    $queryid .= $run;
 	    print $client "$queryid\n";
 	    #
-	    &logthis("QUERY: $query - $arg1 - $arg2 - $arg3");
+	    # &logthis("QUERY: $query - $arg1 - $arg2 - $arg3");
 	    sleep 1;
             #
             my $result='';
@@ -406,6 +407,23 @@ sub make_new_child {
                     $result='no_such_file';
                 }
                 # end of log query
+            } elsif ($query eq 'fetchenrollment') {
+                # retrieve institutional class lists
+                my $dom = &unescape($arg1);
+                my %affiliates = ();
+                my %replies = ();
+                my $locresult = '';
+                my $querystr = &unescape($arg3);
+                foreach (split/%%/,$querystr) {
+                    if (/^(\w+)=([^=]+)$/) {
+                        @{$affiliates{$1}} = split/,/,$2;
+                    }
+                }
+                $locresult = &localenroll::fetch_enrollment($dom,\%affiliates,\%replies);
+                $result = &escape($locresult.':');
+                if ($locresult) {
+                    $result .= &escape(join(':',map{$_.'='.$replies{$_}} keys %replies));
+                }
             } else {
                 # Do an sql query
                 $result = &do_sql_query($query,$arg1,$arg2);
@@ -413,15 +431,13 @@ sub make_new_child {
             # 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);
         }
         # tidy up gracefully and finish
         #
         # close the database handle
 	$dbh->disconnect
-            or &logthis("<font color=blue>WARNING: Couldn't disconnect".
+            or &logthis("<font color='blue'>WARNING: Couldn't disconnect".
                         " from database  $DBI::errstr : $@</font>");
         # this exit is VERY important, otherwise the child will become
         # a producer of more and more children, forking yourself into
@@ -476,7 +492,7 @@ sub do_sql_query {
         #prepare and execute the query
         my $sth = $dbh->prepare($query);
         unless ($sth->execute()) {
-            &logthis('<font color=blue>'.
+            &logthis('<font color="blue">'.
                      'WARNING: Could not retrieve from database:'.
                      $sth->errstr().'</font>');
         } else {
@@ -910,7 +926,7 @@ sub HUNTSMAN {                      # si
     kill 'INT' => keys %children;
     my $execdir=$perlvar{'lonDaemons'};
     unlink("$execdir/logs/lonsql.pid");
-    &logthis("<font color=red>CRITICAL: Shutting down</font>");
+    &logthis("<font color='red'>CRITICAL: Shutting down</font>");
     $unixsock = "mysqlsock";
     my $port="$perlvar{'lonSockDir'}/$unixsock";
     unlink($port);
@@ -921,7 +937,7 @@ sub HUPSMAN {                      # sig
     local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children
     kill 'INT' => keys %children;
     close($server);                # free up socket
-    &logthis("<font color=red>CRITICAL: Restarting</font>");
+    &logthis("<font color='red'>CRITICAL: Restarting</font>");
     my $execdir=$perlvar{'lonDaemons'};
     $unixsock = "mysqlsock";
     my $port="$perlvar{'lonSockDir'}/$unixsock";
@@ -931,7 +947,7 @@ sub HUPSMAN {                      # sig
 
 sub DISCONNECT {
     $dbh->disconnect or 
-    &logthis("<font color=blue>WARNING: Couldn't disconnect from database ".
+    &logthis("<font color='blue'>WARNING: Couldn't disconnect from database ".
              " $DBI::errstr : $@</font>");
     exit;
 }