--- loncom/xml/scripttag.pm 2001/07/11 14:44:37 1.45 +++ loncom/xml/scripttag.pm 2001/07/12 14:29:17 1.46 @@ -196,44 +196,41 @@ sub start_import { my $result =""; $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); - my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); - my $file=&Apache::lonnet::getfile($location); - if ($file == -1) { - &Apache::lonxml::error(" Unable to find $bodytext $location for import"); - return ""; - } - my $dir=$location; - $dir=~s:/[^/]*$::; -# &Apache::lonxml::debug("directory $dir $location file $file \nEND\n"); - &Apache::lonxml::newparser($parser,\$file,$dir); + if ($target eq 'web' || $target eq 'grade') { + # FIXME this probably needs to be smart about construction vs. + # non construction space. + my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); + my $file=&Apache::lonnet::getfile($location); + if ($file == -1) { + &Apache::lonxml::error(" Unable to find $bodytext as $location for import"); + return ""; + } + my $dir=$location; + $dir=~s:/[^/]*$::; + # &Apache::lonxml::debug("directory $dir $location file $file \nEND\n"); + &Apache::lonxml::newparser($parser,\$file,$dir); + } if ($target eq "edit" ) { + $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1); - $result.="Clickhere to edit
" + #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
" } - return ''; + if ($target eq 'modified') { + $bodytext=$$parser[$#$parser]->get_text("/import"); + $result=&Apache::edit::modifiedfield($token); + &Apache::lonxml::debug($result); + } + return $result; } sub end_import { return ''; } -sub start_meta { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result = ''; - if ($target ne 'meta') { - $result = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]); - $result = ''; - return $result; - } else { - return $result; - } -} - -sub end_meta { -} - sub start_storetc { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = '';