[BACK]Return to scripttag.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/scripttag.pm between versions 1.50 and 1.59

version 1.50, 2001/08/20 17:14:55 version 1.59, 2001/12/04 14:56:46
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 31  sub start_script { Line 56  sub start_script {
     my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);      my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
     if ( $target eq "modified" ) {      if ( $target eq "modified" ) {
       $result=$token->[4].&Apache::edit::modifiedfield();        $result=$token->[4].&Apache::edit::modifiedfield();
     } elsif ( $target eq "web" || $target eq "grade" ) {      } elsif ( $target eq 'web' || $target eq 'tex' ||
         $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')) {
    $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>";
    my $listing= &Apache::run::dump($target,$safeeval);
    $listing =~ s/\n/\\n/g;
    $result.=$listing;
    $result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
         }
     } elsif ($target eq "edit" ) {      } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);        #&Apache::run::run($bodytext,$safeeval);
       #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";        #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
Line 51  sub end_script { Line 85  sub end_script {
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);    my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
   my $result='';    my $result='';
   #other script blocks need to survive    #other script blocks need to survive
   if ($type ne "loncapa/perl") { return $token->[2]; }    if ($type ne "loncapa/perl") {
   if ($target eq 'edit' ) { return &Apache::edit::end_table(); }      return $token->[2];
     } elsif ($target eq 'edit' ) {
       return &Apache::edit::end_table();
     } elsif (($ENV{'request.state'} eq 'construct') && ($target eq 'answer')) {
       $Apache::lonxml::evaluate++;
     }
   return '';    return '';
 }  }
   
Line 64  sub start_display { Line 103  sub start_display {
   
   if ( $target eq "modified" ) {    if ( $target eq "modified" ) {
     $result=$token->[4].&Apache::edit::modifiedfield();      $result=$token->[4].&Apache::edit::modifiedfield();
   } elsif ( $target eq "web" || $target eq "grade" ) {    } elsif ( $target eq 'web' || $target eq 'tex' ||
       $target eq 'grade' || $target eq 'answer') {
     $result=&Apache::run::run($bodytext,$safeeval);      $result=&Apache::run::run($bodytext,$safeeval);
     if ($target eq 'grade' ) {      if ($target eq 'grade' || $target eq 'answer' ) {
       $result=''; # grade should produce no output        $result=''; # grade should produce no output
     }      }
   } elsif ($target eq "edit" ) {    } elsif ($target eq "edit" ) {
Line 91  sub start_scriptlib { Line 131  sub start_scriptlib {
   my $result ='';    my $result ='';
   my $error='';    my $error='';
   
   if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') {
     $bodytext=$$parser[$#$parser]->get_text("/scriptlib");      $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,      $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
      $$parstack[$#$parstack]);       $$parstack[$#$parstack]);
Line 136  sub start_parserlib { Line 176  sub start_parserlib {
   my $bodytext;    my $bodytext;
   my $result ="";    my $result ="";
   my $error='';    my $error='';
   if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') {
     $bodytext=$$parser[$#$parser]->get_text("/parserlib");      $bodytext=$$parser[$#$parser]->get_text("/parserlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,      $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
      $$parstack[$#$parstack]);       $$parstack[$#$parstack]);
Line 209  sub start_import { Line 249  sub start_import {
   
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);    $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
   
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     # FIXME this probably needs to be smart about construction vs.      # FIXME this probably needs to be smart about construction vs.
     # non construction space.      # non construction space.
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);      my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
Line 222  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" ) {
   if ($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::editfield($token->[1],$bodytext,'',40,1);
     #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') {
   if ($target eq 'modified') {  
     $bodytext=$$parser[$#$parser]->get_text("/import");      $bodytext=$$parser[$#$parser]->get_text("/import");
     $result=&Apache::edit::modifiedfield($token);      $result=&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);      &Apache::lonxml::debug($result);
     } elsif ($target eq 'meta') {
       my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
       $result.='<import part="'.$Apache::inputtags::part;
       if ($id) {
         $result.='" id="'.$id;
       }
       $result.='">';
       $result.=$bodytext;
       $result.='</import>';
   }    }
   return $result;    return $result;
 }  }
   
 sub end_import {  sub end_import {
     pop(@Apache::inputtags::import);
   return '';    return '';
 }  }
   
Line 255  sub end_storetc { Line 306  sub end_storetc {
     my $result;      my $result;
     my $output=&Apache::lonxml::endredirection;      my $output=&Apache::lonxml::endredirection;
     $output =~ s/\"/\&quot\;/g;      $output =~ s/\"/\&quot\;/g;
     $result = "{\bf $output.}}\write\tcfile{\protect\tcpc{ $output.}{\the\value{relpage}}}";      $result = '{\bf '.$output.'.}}\write\tcfile{\protect\tcpc{ '.$output.'.}{\the\value{relpage}}}';
     return $result;       return $result;
 }  }
   
   
Line 267  sub start_physnet { Line 318  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 "";
 }  }
   
Removed from v.1.50  
changed lines
  Added in v.1.59

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