--- rat/lonratsrv.pm	2005/06/08 15:18:28	1.31
+++ rat/lonratsrv.pm	2005/10/31 18:52:10	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Server for RAT Maps
 #
-# $Id: lonratsrv.pm,v 1.31 2005/06/08 15:18:28 www Exp $
+# $Id: lonratsrv.pm,v 1.34 2005/10/31 18:52:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonnet;
 
 sub qtescape {
     my $str=shift;
+    $str=~s/\:/\:/g;
     $str=~s/\&\#58\;/\:/g;
     $str=~s/\&\#39\;/\'/g;
     $str=~s/\&\#44\;/\,/g;
@@ -92,7 +93,7 @@ sub loadmap {
                 } elsif ($token->[1] eq 'resource') {
 # -------------------------------------------------------------------- Resource
                     $outstr.='<&>objcont';
-                    if ($token->[2]->{'id'}) {
+                    if (defined($token->[2]->{'id'})) {
 			$outstr.='<:>'.$token->[2]->{'id'};
                         if ($obj[$token->[2]->{'id'}]==1) {
                            $errtext.='Error: multiple use of ID '.
@@ -113,7 +114,7 @@ sub loadmap {
                     } else {
                         $outstr.='false:';
                     }
-                    if ($token->[2]->{'type'}) {
+                    if (defined($token->[2]->{'type'})) {
 			$outstr.=$token->[2]->{'type'}.':';
                     }  else {
                         $outstr.='normal:';
@@ -126,7 +127,7 @@ sub loadmap {
                 } elsif ($token->[1] eq 'condition') {
 # ------------------------------------------------------------------- Condition
                     $outstr.='<&>objcont';
-                    if ($token->[2]->{'id'}) {
+                    if (defined($token->[2]->{'id'})) {
 			$outstr.='<:>'.$token->[2]->{'id'};
                         if ($obj[$token->[2]->{'id'}]==1) {
                            $errtext.='Error: multiple use of ID '.
@@ -141,7 +142,7 @@ sub loadmap {
                     }
                     $outstr.='<:>';
                     $outstr.=qtunescape($token->[2]->{'value'}).':';
-                    if ($token->[2]->{'type'}) {
+                    if (defined($token->[2]->{'type'})) {
 			$outstr.=$token->[2]->{'type'}.':';
                     } else {
                         $outstr.='normal:';
@@ -151,7 +152,7 @@ sub loadmap {
 # ----------------------------------------------------------------------- Links
                     $outstr.='<&>objlinks';
 
-                        if ($token->[2]->{'index'}) {
+                        if (defined($token->[2]->{'index'})) {
 			   if ($links[$token->[2]->{'index'}]) {
                                $errtext.='Error: multiple use of link index '.
 			       $token->[2]->{'index'}.'. ';
@@ -167,7 +168,7 @@ sub loadmap {
 		    
                     $outstr.='<:>'.$token->[2]->{'from'}.
                              ':'.$token->[2]->{'to'};
-                    if ($token->[2]->{'condition'}) {
+                    if (defined($token->[2]->{'condition'})) {
 			$outstr.=':'.$token->[2]->{'condition'};
                     } else {
  			$outstr.=':0';
@@ -292,9 +293,8 @@ sub savemap {
         $outstr.="</map>\n";
 	if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) {
 	    $env{'form.output'}=$outstr;
-            my $home=&Apache::lonnet::homeserver($2,$1);
-            my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home,
-						'output',$3);
+            my $result=&Apache::lonnet::finishuserfileupload($2,$1,
+							     'output',$3);
 	    if ($result != m|^/uploaded/|) {
 		$errtext.='Map not saved: A network error occured when trying to save the map. ';
 	    }