Diff for /loncom/xml/scripttag.pm between versions 1.45 and 1.46

version 1.45, 2001/07/11 14:44:37 version 1.46, 2001/07/12 14:29:17
Line 196  sub start_import { Line 196  sub start_import {
   my $result ="";    my $result ="";
   
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);    $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("<b> Unable to find <i>$bodytext $location</i> for import</b>");  
     return "";  
   }  
   
   my $dir=$location;    if ($target eq 'web' || $target eq 'grade') {
   $dir=~s:/[^/]*$::;        # FIXME this probably needs to be smart about construction vs.
 #  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");      # non construction space.
   &Apache::lonxml::newparser($parser,\$file,$dir);      my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
       my $file=&Apache::lonnet::getfile($location);
       if ($file == -1) {
         &Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>");
         return "";
       }
   
       my $dir=$location;
       $dir=~s:/[^/]*$::;
       #  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");
       &Apache::lonxml::newparser($parser,\$file,$dir);
     }
   if ($target eq "edit" ) {    if ($target eq "edit" ) {
       $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);      $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
     $result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br />"      #FIXME this need to convert $bodytext to be a contruction space reference
       #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
       #$result.="Click<a href=\"$location\">here</a> to edit<br />"
   }    }
   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 {  sub end_import {
   return '';    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 {  sub start_storetc {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';    my $result = '';

Removed from v.1.45  
changed lines
  Added in v.1.46


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>