--- loncom/lonnet/perl/lonnet.pm	2002/05/23 20:37:25	1.232
+++ loncom/lonnet/perl/lonnet.pm	2002/06/05 20:40:10	1.236
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.232 2002/05/23 20:37:25 www Exp $
+# $Id: lonnet.pm,v 1.236 2002/06/05 20:40:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -140,20 +140,20 @@ sub reply {
     unless (defined($hostname{$server})) { return 'no_such_host'; }
     my $answer=subreply($cmd,$server);
     if ($answer eq 'con_lost') {
-       sleep 5; 
-       $answer=subreply($cmd,$server);
-       if ($answer eq 'con_lost') {
-	   &logthis("Second attempt con_lost on $server");
-           my $peerfile="$perlvar{'lonSockDir'}/$server";
-           my $client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
-                                            Type    => SOCK_STREAM,
-                                            Timeout => 10)
-                      or return "con_lost";
-           &logthis("Killing socket");
-           print $client "close_connection_exit\n";
-           sleep 5;
-           $answer=subreply($cmd,$server);       
-       }   
+       #sleep 5; 
+       #$answer=subreply($cmd,$server);
+       #if ($answer eq 'con_lost') {
+	#   &logthis("Second attempt con_lost on $server");
+        #   my $peerfile="$perlvar{'lonSockDir'}/$server";
+        #   my $client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
+        #                                    Type    => SOCK_STREAM,
+        #                                    Timeout => 10)
+        #              or return "con_lost";
+        #   &logthis("Killing socket");
+        #   print $client "close_connection_exit\n";
+           #sleep 5;
+        #   $answer=subreply($cmd,$server);       
+       #}   
     }
     if (($answer=~/^refused/) || ($answer=~/^rejected/)) {
        &logthis("<font color=blue>WARNING:".
@@ -799,6 +799,7 @@ sub checkout {
     my $now=time;
     my $lonhost=$perlvar{'lonHostID'};
     my $infostr=&escape(
+                 'CHECKOUTTOKEN&'.
                  $tuname.'&'.
                  $tudom.'&'.
                  $tcrsid.'&'.
@@ -848,7 +849,7 @@ sub checkin {
     $lonhost=~tr/A-Z/a-z/;
     my $dtoken=$ta.'_'.$hostip{$lonhost}.'_'.$tb;
     $dtoken=~s/\W/\_/g;
-    my ($tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
+    my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
                  split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost)));
 
     unless (($tuname) && ($tudom)) {
@@ -1736,7 +1737,6 @@ sub is_on_map {
     $pathname=~s/\/$filename$//;
     my $match=($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~
 	       /\&$filename\:([\d\|]+)\&/);
-    &logthis('is: '.$uri.' '.$match.' '.$1);
     if ($match) {
        return (1,$1);
    } else {
@@ -2278,7 +2278,11 @@ sub EXT {
             my %reply=&get($space,[$item]);
             return $reply{$item};
         }
-    } elsif ($realm eq 'request') {
+    } elsif ($realm eq 'query') {
+# ---------------------------------------------- pull stuff out of query string
+        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},[$space]);
+	return $ENV{'form.'.$space}; 
+   } elsif ($realm eq 'request') {
 # ------------------------------------------------------------- request.browser
         if ($space eq 'browser') {
 	    return $ENV{'browser.'.$qualifier};
@@ -2787,6 +2791,7 @@ sub declutter {
     $thisfn=~s/^$perlvar{'lonDocRoot'}//;
     $thisfn=~s/^\///;
     $thisfn=~s/^res\///;
+    $thisfn=~s/\?.+$//;
     return $thisfn;
 }