--- rat/lonratsrv.pm 2005/04/07 06:56:27 1.30
+++ rat/lonratsrv.pm 2005/06/08 15:18:28 1.31
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Server for RAT Maps
#
-# $Id: lonratsrv.pm,v 1.30 2005/04/07 06:56:27 albertel Exp $
+# $Id: lonratsrv.pm,v 1.31 2005/06/08 15:18:28 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,7 +118,11 @@ sub loadmap {
} else {
$outstr.='normal:';
}
- $outstr.='res';
+ if ($token->[2]->{'type'} ne 'zombie') {
+ $outstr.='res';
+ } else {
+ $outstr.='zombie';
+ }
} elsif ($token->[1] eq 'condition') {
# ------------------------------------------------------------------- Condition
$outstr.='<&>objcont';
@@ -219,7 +223,7 @@ sub savemap {
if ($parts[0] eq 'objcont') {
my @comp=split(/:/,$parts[$#parts]);
# --------------------------------------------------------------- Logical input
- if ($comp[$#comp] eq 'res') {
+ if (($comp[$#comp] eq 'res') || ($comp[$#comp] eq 'zombie')) {
$comp[0]=qtescape($comp[0]);
$comp[1]=qtescape($comp[1]);
if ($comp[2] eq 'true') {
@@ -241,14 +245,14 @@ sub savemap {
if ($comp[0] ne '') {
$outstr.=' title="'.$comp[0].'"';
}
- $outstr.=">\n";
+ $outstr.=" />\n";
} elsif ($comp[$#comp] eq 'cond') {
$outstr.='\n";
+ $outstr.=" />\n";
}
} elsif ($parts[0] eq 'objlinks') {
my @comp=split(/:/,$parts[$#parts]);
@@ -259,7 +263,7 @@ sub savemap {
$outstr.=' condition="'.$comp[2].'"';
}
$outstr.=' index="'.$parts[1].'"';
- $outstr.=">\n";
+ $outstr.=" />\n";
} elsif ($parts[0] eq 'objparms') {
undef %alltypes;
undef %allvalues;
@@ -272,8 +276,8 @@ sub savemap {
if ($allvalues{$_} ne '') {
$outstr.=''
- ."\n";
+ .'" value="'.$allvalues{$_}.'" />'
+ ."\n";
}
}
} elsif (($parts[0] ne '') && ($graphdef)) {
@@ -282,8 +286,7 @@ sub savemap {
if ($#parts==2) {
$outstr.=' index="'.$parts[1].'"';
}
- $outstr.=' value="'.qtescape($parts[$#parts]).'">'.
- $parts[0].">\n";
+ $outstr.=' value="'.qtescape($parts[$#parts]).'" />'."\n";
}
}
$outstr.="\n";