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

version 1.56, 2001/11/05 22:59:33 version 1.68, 2002/03/22 22:06:06
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 14  use Apache::style; Line 39  use Apache::style;
 # so xmlparse can reenter the inner_xmlparse loop.  # so xmlparse can reenter the inner_xmlparse loop.
   
 @Apache::scripttag::parser_env = ();  @Apache::scripttag::parser_env = ();
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::scripttag',('script','scriptlib',    &Apache::lonxml::register('Apache::scripttag',
  'parserlib','import',      ('script','scriptlib','parserlib','import',
                                                  'window','display',       'window','display','storetc','physnet',
                                                  'storetc','physnet'));       'standalone'));
 }  }
   
 sub start_script {  sub start_script {
Line 34  sub start_script { Line 59  sub start_script {
     } elsif ( $target eq 'web' || $target eq 'tex' ||      } elsif ( $target eq 'web' || $target eq 'tex' ||
       $target eq 'grade' || $target eq 'answer') {        $target eq 'grade' || $target eq 'answer') {
       &Apache::run::run($bodytext,$safeeval);        &Apache::run::run($bodytext,$safeeval);
       if (($ENV{'request.state'} eq 'construct') && ($target eq 'answer')) {        if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
  $Apache::lonxml::evaluate--;   $Apache::lonxml::evaluate--;
  $result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;><pre>";   $result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;><pre>";
  my $listing= &Apache::run::dump($target,$safeeval);   my $listing= &Apache::run::dump($target,$safeeval);
  $listing =~ s/\n/\\n/g;   $listing =~ s/\n/\\n/g;
    $listing =~ s/\"/&quot;/g;
    $listing =~ s/\'/&rsquo;/g;
    $listing =~ s/</&lt;/g;
    $listing =~ s/>/&gt;/g;
    $listing =~ s/&/&amp;/g;
  $result.=$listing;   $result.=$listing;
  $result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";   $result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
       }        }
Line 49  sub start_script { Line 79  sub start_script {
       $result.=&Apache::edit::editfield($token->[1],$bodytext,'',50,4);        $result.=&Apache::edit::editfield($token->[1],$bodytext,'',50,4);
     }      }
   } else {    } else {
     if ($target ne "meta") { $result = $token->[4]; }      if ($target ne "meta") {
         $result = $token->[4];
         my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
         $result.=$bodytext;
       }
   }    }
   return $result;    return $result;
 }  }
Line 127  sub start_scriptlib { Line 161  sub start_scriptlib {
   if ($target eq "edit" ) {    if ($target eq "edit" ) {
     $result=      $result=
       &Apache::edit::tag_start($target,$token,'New Script Functions').        &Apache::edit::tag_start($target,$token,'New Script Functions').
  &Apache::edit::editfield($token->[1],$bodytext,'',40,1).   &Apache::edit::editline($token->[1],$bodytext,'',40).
   $error.'</td></tr>'.    $error.'</td></tr>'.
     &Apache::edit::end_table();      &Apache::edit::end_table();
   }    }
   if ($target eq "modified" ) {    if ($target eq "modified" ) {
     $bodytext=$$parser[$#$parser]->get_text("/scriptlib");      $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
     $result=&Apache::edit::modifiedfield($token);      $result=$token->[4].&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);      &Apache::lonxml::debug($result);
   }    }
   return $result;    return $result;
Line 172  sub start_parserlib { Line 206  sub start_parserlib {
   if ($target eq "edit" ) {    if ($target eq "edit" ) {
     $result=      $result=
       &Apache::edit::tag_start($target,$token,'New Tag Definitions').        &Apache::edit::tag_start($target,$token,'New Tag Definitions').
  &Apache::edit::editfield($token->[1],$bodytext,'',40,1).   &Apache::edit::editline($token->[1],$bodytext,'',40).
   $error.'</td></tr>'.    $error.'</td></tr>'.
     &Apache::edit::end_table();      &Apache::edit::end_table();
   }    }
   if ($target eq "modified" ) {    if ($target eq "modified" ) {
     $bodytext=$$parser[$#$parser]->get_text("/parserlib");      $bodytext=$$parser[$#$parser]->get_text("/parserlib");
     $result=&Apache::edit::modifiedfield($token);      $result=$token->[4].&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);      &Apache::lonxml::debug($result);
   }    }
   return $result;    return $result;
Line 237  sub start_import { Line 271  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);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);      $result.=&Apache::edit::editline($token->[1],$bodytext,'',40);
     #FIXME this need to convert $bodytext to be a contruction space reference      #FIXME this need to convert $bodytext to be a contruction space reference
     #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);      #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     #$result.="Click<a href=\"$location\">here</a> to edit<br />"      #$result.="Click<a href=\"$location\">here</a> to edit<br />"
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     $bodytext=$$parser[$#$parser]->get_text("/import");      $bodytext=$$parser[$#$parser]->get_text("/import");
     $result=&Apache::edit::modifiedfield($token);      $result=$token->[4].&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 299  sub start_import {
 }  }
   
 sub end_import {  sub end_import {
     pop(@Apache::inputtags::import);
   return '';    return '';
 }  }
   
Line 284  sub start_physnet { Line 327  sub start_physnet {
     my $cbistyletext=&Apache::lonnet::getfile($location);      my $cbistyletext=&Apache::lonnet::getfile($location);
   
     %$style = (%$style,&Apache::style::styleparser($target,$cbistyletext));      %$style = (%$style,&Apache::style::styleparser($target,$cbistyletext));
     if ( defined($$style{'physnet'}) ) {      $$parser['-1']->unget_token($token);
         &Apache::lonxml::newparser($parser,\$$style{'physnet'});  #    if ( defined($$style{'physnet'}) ) {
     }  #        &Apache::lonxml::newparser($parser,\$$style{'physnet'});
   #    }
     return "";      return "";
 }  }
   
Line 294  sub end_physnet { Line 338  sub end_physnet {
   return '';    return '';
 }  }
   
   sub start_standalone {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web'  && $ENV{'request.course.id'} ) {
       my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);
     }
     return '';
   }
   
   sub end_standalone {
     return '';
   }
   
   
 sub xmlparse {  sub xmlparse {
   my ($string) = @_;    my ($string) = @_;
   &Apache::lonxml::debug("Got $string");    &Apache::lonxml::debug("Got $string");

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


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