--- loncom/lond	2004/06/21 14:08:20	1.201
+++ loncom/lond	2004/07/03 18:49:42	1.205
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.201 2004/06/21 14:08:20 matthew Exp $
+# $Id: lond,v 1.205 2004/07/03 18:49:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,12 +51,12 @@ use LONCAPA::ConfigFileEdit;
 use LONCAPA::lonlocal;
 use LONCAPA::lonssl;
 
-my $DEBUG = 11;		       # Non zero to enable debug log entries.
+my $DEBUG = 0;		       # Non zero to enable debug log entries.
 
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.201 $'; #' stupid emacs
+my $VERSION='$Revision: 1.205 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -354,7 +354,6 @@ sub ReadManagerTable {
    while(my $host = <MANAGERS>) {
       chomp($host);
       if ($host =~ "^#") {                  # Comment line.
-         logthis('<font color="green"> Skipping line: '. "$host</font>\n");
          next;
       }
       if (!defined $hostip{$host}) { # This is a non cluster member
@@ -2836,8 +2835,8 @@ sub make_new_child {
 			my %hash;
 			if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
 			    foreach my $pair (@pairs) {
-				my ($key,$value)=split(/=/,$pair);
-				$hash{$key}=$value.':'.$now;
+				my ($key,$descr,$inst_code)=split(/=/,$pair);
+				$hash{$key}=$descr.':'.$inst_code.':'.$now;
 			    }
 			    if (untie(%hash)) {
 				print $client "ok\n";
@@ -2872,14 +2871,19 @@ sub make_new_child {
 			my %hash;
 			if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
 			    while (my ($key,$value) = each(%hash)) {
-				my ($descr,$lasttime)=split(/\:/,$value);
+                                my ($descr,$lasttime,$inst_code);
+                                if ($value =~ m/^([^\:]*):([^\:]*):(\d+)$/) {
+				    ($descr,$inst_code,$lasttime)=($1,$2,$3);
+                                } else {
+                                    ($descr,$lasttime) = split(/\:/,$value);
+                                }
 				if ($lasttime<$since) { next; }
 				if ($description eq '.') {
-				    $qresult.=$key.'='.$descr.'&';
+				    $qresult.=$key.'='.$descr.':'.$inst_code.'&';
 				} else {
 				    my $unescapeVal = &unescape($descr);
 				    if (eval('$unescapeVal=~/\Q$description\E/i')) {
-					$qresult.="$key=$descr&";
+					$qresult.=$key.'='.$descr.':'.$inst_code.'&';
 				    }
 				}
 			    }
@@ -3210,6 +3214,32 @@ sub make_new_child {
                     } else {
                         print $client "refused\n";
                     }
+#---------------------  read and retrieve institutional code format (for support form).
+                } elsif ($userinput =~/^autoinstcodeformat:/) {
+                    if (isClient) {
+                        my $reply;
+                        my($cmd,$cdom,$course) = split(/:/,$userinput);
+                        my @pairs = split/\&/,$course;
+                        my %instcodes = ();
+                        my %codes = ();
+                        my @codetitles = ();
+                        my %cat_titles = ();
+                        my %cat_order = ();
+                        foreach (@pairs) {
+                            my ($key,$value) = split/=/,$_;
+                            $instcodes{&unescape($key)} = &unescape($value);
+                        }
+                        my $formatreply = &localenroll::instcode_format($cdom,\%instcodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
+                        if ($formatreply eq 'ok') {
+                            my $codes_str = &hash2str(%codes);
+                            my $codetitles_str = &array2str(@codetitles);
+                            my $cat_titles_str = &hash2str(%cat_titles);
+                            my $cat_order_str = &hash2str(%cat_order);
+                            print $client $codes_str.':'.$codetitles_str.':'.$cat_titles_str.':'.$cat_order_str."\n";
+                        }
+                    } else {
+                        print $client "refused\n";
+                    }
 # ------------------------------------------------------------- unknown command
 
 		} else {
@@ -3617,6 +3647,73 @@ sub userload {
     return $userloadpercent;
 }
 
+# Routines for serializing arrays and hashes (copies from lonnet)
+
+sub array2str {
+  my (@array) = @_;
+  my $result=&arrayref2str(\@array);
+  $result=~s/^__ARRAY_REF__//;
+  $result=~s/__END_ARRAY_REF__$//;
+  return $result;
+}
+                                                                                 
+sub arrayref2str {
+  my ($arrayref) = @_;
+  my $result='__ARRAY_REF__';
+  foreach my $elem (@$arrayref) {
+    if(ref($elem) eq 'ARRAY') {
+      $result.=&arrayref2str($elem).'&';
+    } elsif(ref($elem) eq 'HASH') {
+      $result.=&hashref2str($elem).'&';
+    } elsif(ref($elem)) {
+      #print("Got a ref of ".(ref($elem))." skipping.");
+    } else {
+      $result.=&escape($elem).'&';
+    }
+  }
+  $result=~s/\&$//;
+  $result .= '__END_ARRAY_REF__';
+  return $result;
+}
+                                                                                 
+sub hash2str {
+  my (%hash) = @_;
+  my $result=&hashref2str(\%hash);
+  $result=~s/^__HASH_REF__//;
+  $result=~s/__END_HASH_REF__$//;
+  return $result;
+}
+                                                                                 
+sub hashref2str {
+  my ($hashref)=@_;
+  my $result='__HASH_REF__';
+  foreach (sort(keys(%$hashref))) {
+    if (ref($_) eq 'ARRAY') {
+      $result.=&arrayref2str($_).'=';
+    } elsif (ref($_) eq 'HASH') {
+      $result.=&hashref2str($_).'=';
+    } elsif (ref($_)) {
+      $result.='=';
+      #print("Got a ref of ".(ref($_))." skipping.");
+    } else {
+        if ($_) {$result.=&escape($_).'=';} else { last; }
+    }
+
+    if(ref($hashref->{$_}) eq 'ARRAY') {
+      $result.=&arrayref2str($hashref->{$_}).'&';
+    } elsif(ref($hashref->{$_}) eq 'HASH') {
+      $result.=&hashref2str($hashref->{$_}).'&';
+    } elsif(ref($hashref->{$_})) {
+       $result.='&';
+      #print("Got a ref of ".(ref($hashref->{$_}))." skipping.");
+    } else {
+      $result.=&escape($hashref->{$_}).'&';
+    }
+  }
+  $result=~s/\&$//;
+  $result .= '__END_HASH_REF__';
+  return $result;
+}
 
 # ----------------------------------- POD (plain old documentation, CPAN style)