--- rat/lonratsrv.pm	2005/06/13 20:23:53	1.32
+++ rat/lonratsrv.pm	2006/07/21 08:30:57	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Server for RAT Maps
 #
-# $Id: lonratsrv.pm,v 1.32 2005/06/13 20:23:53 albertel Exp $
+# $Id: lonratsrv.pm,v 1.37 2006/07/21 08:30:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonnet;
 
 sub qtescape {
     my $str=shift;
+    $str=~s/\&colon;/\:/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';
@@ -345,24 +346,30 @@ sub handler {
   }
   ($outtext,$errtext,$infotext)=&loadmap($fn,$errtext,$infotext);
 
+  my $start_page =
+      &Apache::loncommon::start_page('Alert',undef,
+				     {'only_body' => 1,
+				      'bgcolor'   => '#FFFFFF',});
+  my $end_page =
+      &Apache::loncommon::end_page();
+
   $r->print(<<ENDDOCUMENT);
-<html>
-<body bgcolor="#FFFFFF">
-<form name=storage method=post action="$url">
-<input type=hidden name=output value="$outtext">
+$start_page
+<form name="storage" method="post" action="$url">
+<input type="hidden" name="output" value="$outtext" />
 </form>
-<script>
+<script type ="text/javascript">
     parent.flag=1;
 </script>
 ENDDOCUMENT
     if (($errtext ne '') || ($infotext ne '')) {
 	$r->print(<<ENDSCRIPT);
-<script>
+<script type="text/javascript">
     alert("$infotext $errtext");
 </script>
 ENDSCRIPT
     }
-    $r->print("</body>\n</html>\n");
+    $r->print($end_page);
 
   return OK;
 }
