Diff for /loncom/xml/scripttag.pm between versions 1.56 and 1.58

version 1.56, 2001/11/05 22:59:33 version 1.58, 2001/11/29 19:03:58
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # <script> definiton  # <script> definiton
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # 2/21 Guy  # 2/21 Guy
 # 8/20 Gerd Kortemeyer  # 8/20 Gerd Kortemeyer
   
Line 237  sub start_import { Line 262  sub start_import {
     my $dir=$location;      my $dir=$location;
     $dir=~s:/[^/]*$::;      $dir=~s:/[^/]*$::;
     #  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");      #  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\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);      &Apache::lonxml::newparser($parser,\$file,$dir);
   } elsif ($target eq "edit" ) {    } elsif ($target eq "edit" ) {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
Line 249  sub start_import { Line 277  sub start_import {
     $result=&Apache::edit::modifiedfield($token);      $result=&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);      &Apache::lonxml::debug($result);
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     $result.='<import id="'.$Apache::inputtags::part.'">';      my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
       $result.='<import part="'.$Apache::inputtags::part;
       if ($id) {
         $result.='" id="'.$id;
       }
       $result.='">';
     $result.=$bodytext;      $result.=$bodytext;
     $result.='</import>';      $result.='</import>';
   }    }
Line 257  sub start_import { Line 290  sub start_import {
 }  }
   
 sub end_import {  sub end_import {
     pop(@Apache::inputtags::import);
   return '';    return '';
 }  }
   

Removed from v.1.56  
changed lines
  Added in v.1.58


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