version 1.30, 2005/04/07 06:56:27
|
version 1.33, 2005/09/26 19:47:52
|
Line 92 sub loadmap {
|
Line 92 sub loadmap {
|
} elsif ($token->[1] eq 'resource') { |
} elsif ($token->[1] eq 'resource') { |
# -------------------------------------------------------------------- Resource |
# -------------------------------------------------------------------- Resource |
$outstr.='<&>objcont'; |
$outstr.='<&>objcont'; |
if ($token->[2]->{'id'}) { |
if (defined($token->[2]->{'id'})) { |
$outstr.='<:>'.$token->[2]->{'id'}; |
$outstr.='<:>'.$token->[2]->{'id'}; |
if ($obj[$token->[2]->{'id'}]==1) { |
if ($obj[$token->[2]->{'id'}]==1) { |
$errtext.='Error: multiple use of ID '. |
$errtext.='Error: multiple use of ID '. |
Line 113 sub loadmap {
|
Line 113 sub loadmap {
|
} else { |
} else { |
$outstr.='false:'; |
$outstr.='false:'; |
} |
} |
if ($token->[2]->{'type'}) { |
if (defined($token->[2]->{'type'})) { |
$outstr.=$token->[2]->{'type'}.':'; |
$outstr.=$token->[2]->{'type'}.':'; |
} else { |
} else { |
$outstr.='normal:'; |
$outstr.='normal:'; |
} |
} |
$outstr.='res'; |
if ($token->[2]->{'type'} ne 'zombie') { |
|
$outstr.='res'; |
|
} else { |
|
$outstr.='zombie'; |
|
} |
} elsif ($token->[1] eq 'condition') { |
} elsif ($token->[1] eq 'condition') { |
# ------------------------------------------------------------------- Condition |
# ------------------------------------------------------------------- Condition |
$outstr.='<&>objcont'; |
$outstr.='<&>objcont'; |
if ($token->[2]->{'id'}) { |
if (defined($token->[2]->{'id'})) { |
$outstr.='<:>'.$token->[2]->{'id'}; |
$outstr.='<:>'.$token->[2]->{'id'}; |
if ($obj[$token->[2]->{'id'}]==1) { |
if ($obj[$token->[2]->{'id'}]==1) { |
$errtext.='Error: multiple use of ID '. |
$errtext.='Error: multiple use of ID '. |
Line 137 sub loadmap {
|
Line 141 sub loadmap {
|
} |
} |
$outstr.='<:>'; |
$outstr.='<:>'; |
$outstr.=qtunescape($token->[2]->{'value'}).':'; |
$outstr.=qtunescape($token->[2]->{'value'}).':'; |
if ($token->[2]->{'type'}) { |
if (defined($token->[2]->{'type'})) { |
$outstr.=$token->[2]->{'type'}.':'; |
$outstr.=$token->[2]->{'type'}.':'; |
} else { |
} else { |
$outstr.='normal:'; |
$outstr.='normal:'; |
Line 147 sub loadmap {
|
Line 151 sub loadmap {
|
# ----------------------------------------------------------------------- Links |
# ----------------------------------------------------------------------- Links |
$outstr.='<&>objlinks'; |
$outstr.='<&>objlinks'; |
|
|
if ($token->[2]->{'index'}) { |
if (defined($token->[2]->{'index'})) { |
if ($links[$token->[2]->{'index'}]) { |
if ($links[$token->[2]->{'index'}]) { |
$errtext.='Error: multiple use of link index '. |
$errtext.='Error: multiple use of link index '. |
$token->[2]->{'index'}.'. '; |
$token->[2]->{'index'}.'. '; |
Line 163 sub loadmap {
|
Line 167 sub loadmap {
|
|
|
$outstr.='<:>'.$token->[2]->{'from'}. |
$outstr.='<:>'.$token->[2]->{'from'}. |
':'.$token->[2]->{'to'}; |
':'.$token->[2]->{'to'}; |
if ($token->[2]->{'condition'}) { |
if (defined($token->[2]->{'condition'})) { |
$outstr.=':'.$token->[2]->{'condition'}; |
$outstr.=':'.$token->[2]->{'condition'}; |
} else { |
} else { |
$outstr.=':0'; |
$outstr.=':0'; |
Line 219 sub savemap {
|
Line 223 sub savemap {
|
if ($parts[0] eq 'objcont') { |
if ($parts[0] eq 'objcont') { |
my @comp=split(/:/,$parts[$#parts]); |
my @comp=split(/:/,$parts[$#parts]); |
# --------------------------------------------------------------- Logical input |
# --------------------------------------------------------------- Logical input |
if ($comp[$#comp] eq 'res') { |
if (($comp[$#comp] eq 'res') || ($comp[$#comp] eq 'zombie')) { |
$comp[0]=qtescape($comp[0]); |
$comp[0]=qtescape($comp[0]); |
$comp[1]=qtescape($comp[1]); |
$comp[1]=qtescape($comp[1]); |
if ($comp[2] eq 'true') { |
if ($comp[2] eq 'true') { |
Line 241 sub savemap {
|
Line 245 sub savemap {
|
if ($comp[0] ne '') { |
if ($comp[0] ne '') { |
$outstr.=' title="'.$comp[0].'"'; |
$outstr.=' title="'.$comp[0].'"'; |
} |
} |
$outstr.="></resource>\n"; |
$outstr.=" />\n"; |
} elsif ($comp[$#comp] eq 'cond') { |
} elsif ($comp[$#comp] eq 'cond') { |
$outstr.='<condition id="'.$parts[1].'"'; |
$outstr.='<condition id="'.$parts[1].'"'; |
if (($comp[1] ne '') && ($comp[1] ne 'normal')) { |
if (($comp[1] ne '') && ($comp[1] ne 'normal')) { |
$outstr.=' type="'.$comp[1].'"'; |
$outstr.=' type="'.$comp[1].'"'; |
} |
} |
$outstr.=' value="'.qtescape($comp[0]).'"'; |
$outstr.=' value="'.qtescape($comp[0]).'"'; |
$outstr.="></condition>\n"; |
$outstr.=" />\n"; |
} |
} |
} elsif ($parts[0] eq 'objlinks') { |
} elsif ($parts[0] eq 'objlinks') { |
my @comp=split(/:/,$parts[$#parts]); |
my @comp=split(/:/,$parts[$#parts]); |
Line 259 sub savemap {
|
Line 263 sub savemap {
|
$outstr.=' condition="'.$comp[2].'"'; |
$outstr.=' condition="'.$comp[2].'"'; |
} |
} |
$outstr.=' index="'.$parts[1].'"'; |
$outstr.=' index="'.$parts[1].'"'; |
$outstr.="></link>\n"; |
$outstr.=" />\n"; |
} elsif ($parts[0] eq 'objparms') { |
} elsif ($parts[0] eq 'objparms') { |
undef %alltypes; |
undef %alltypes; |
undef %allvalues; |
undef %allvalues; |
Line 272 sub savemap {
|
Line 276 sub savemap {
|
if ($allvalues{$_} ne '') { |
if ($allvalues{$_} ne '') { |
$outstr.='<param to="'.$parts[1].'" type="' |
$outstr.='<param to="'.$parts[1].'" type="' |
.$alltypes{$_}.'" name="'.$_ |
.$alltypes{$_}.'" name="'.$_ |
.'" value="'.$allvalues{$_}.'">' |
.'" value="'.$allvalues{$_}.'" />' |
."</param>\n"; |
."\n"; |
} |
} |
} |
} |
} elsif (($parts[0] ne '') && ($graphdef)) { |
} elsif (($parts[0] ne '') && ($graphdef)) { |
Line 282 sub savemap {
|
Line 286 sub savemap {
|
if ($#parts==2) { |
if ($#parts==2) { |
$outstr.=' index="'.$parts[1].'"'; |
$outstr.=' index="'.$parts[1].'"'; |
} |
} |
$outstr.=' value="'.qtescape($parts[$#parts]).'"></'. |
$outstr.=' value="'.qtescape($parts[$#parts]).'" />'."\n"; |
$parts[0].">\n"; |
|
} |
} |
} |
} |
$outstr.="</map>\n"; |
$outstr.="</map>\n"; |
if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) { |
if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) { |
$env{'form.output'}=$outstr; |
$env{'form.output'}=$outstr; |
my $home=&Apache::lonnet::homeserver($2,$1); |
my $result=&Apache::lonnet::finishuserfileupload($2,$1, |
my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home, |
'output',$3); |
'output',$3); |
|
if ($result != m|^/uploaded/|) { |
if ($result != m|^/uploaded/|) { |
$errtext.='Map not saved: A network error occured when trying to save the map. '; |
$errtext.='Map not saved: A network error occured when trying to save the map. '; |
} |
} |