--- loncom/xml/scripttag.pm 2001/10/14 05:08:09 1.55 +++ loncom/xml/scripttag.pm 2001/11/12 20:27:28 1.57 @@ -237,24 +237,35 @@ sub start_import { my $dir=$location; $dir=~s:/[^/]*$::; # &Apache::lonxml::debug("directory $dir $location file $file \nEND\n"); + my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + if (!$id) { $id=$Apache::lonxml::curdepth; } + push(@Apache::inputtags::import,$id); &Apache::lonxml::newparser($parser,\$file,$dir); - } - if ($target eq "edit" ) { + } elsif ($target eq "edit" ) { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1); #FIXME this need to convert $bodytext to be a contruction space reference #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); #$result.="Clickhere to edit
" - } - if ($target eq 'modified') { + } elsif ($target eq 'modified') { $bodytext=$$parser[$#$parser]->get_text("/import"); $result=&Apache::edit::modifiedfield($token); &Apache::lonxml::debug($result); + } elsif ($target eq 'meta') { + my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + $result.=''; + $result.=$bodytext; + $result.=''; } return $result; } sub end_import { + pop(@Apache::inputtags::import); return ''; }