Diff for /loncom/xml/scripttag.pm between versions 1.145 and 1.155

version 1.145, 2007/11/17 01:43:00 version 1.155, 2010/05/26 12:22:54
Line 44  BEGIN { Line 44  BEGIN {
      'window','display','storetc','physnet',       'window','display','storetc','physnet',
      'standalone','comment','num','parse','algebra',       'standalone','comment','num','parse','algebra',
      'LONCAPA_INTERNAL_TURN_STYLE_ON',       'LONCAPA_INTERNAL_TURN_STYLE_ON',
      'LONCAPA_INTERNAL_TURN_STYLE_OFF',       'LONCAPA_INTERNAL_TURN_STYLE_OFF'));
      'LONCAPA_INTERNAL_LONHTTPD_PORT'));  
 }  }
   
 sub start_LONCAPA_INTERNAL_TURN_STYLE_ON {  sub start_LONCAPA_INTERNAL_TURN_STYLE_ON {
Line 81  sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF Line 80  sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF
     return ('','no');      return ('','no');
 }  }
   
 =pod   
   
 =item start_LONCAPA_INTERNAL_LONHTTPD_PORT  
   
 emits a pice of javascript that says a global js variable to the  
 current lonhttp port, currently used by the remote control to find out  
 where to load images from  
   
 =cut  
   
 sub start_LONCAPA_INTERNAL_LONHTTPD_PORT {  
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;  
     if ($target eq 'web' || $target eq 'webgrade') {  
  return '<script type="text/javascript">var lonhttpdport=\''.  
     &Apache::loncommon::lonhttpd_port().'\';</script>';  
     }  
     return ('','no');  
 }  
   
 sub end_LONCAPA_INTERNAL_LONHTTPD_PORT {  
     return ('','no');  
 }  
   
 sub start_script {  sub start_script {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   @Apache::scripttag::parser_env = @_;    @Apache::scripttag::parser_env = @_;
Line 333  sub start_window { Line 309  sub start_window {
  $result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);   $result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
  $result.=&Apache::edit::text_arg('Height:','height',$token,5);   $result.=&Apache::edit::text_arg('Height:','height',$token,5);
  $result.=&Apache::edit::text_arg('Width:','width',$token,5);   $result.=&Apache::edit::text_arg('Width:','width',$token,5);
    $result.=&Apache::edit::text_arg('Mime Type:','mimetype',$token,5);
  $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'linktext',       $safeeval,'linktext',
      'width','height');       'width','height',
        'mimetype');
  if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
     }      }
     return $result;        return $result;  
Line 357  sub end_window { Line 335  sub end_window {
     if (!$width) { $width='500'; }      if (!$width) { $width='500'; }
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);      my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }      if (!$height) { $height='200'; }
       my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval)
             || 'text/html';
   
     my $start_page =      my ($start_page,$end_page);
  &Apache::loncommon::start_page($linktext, undef,      if ($mimetype eq 'text/html') {
        {'only_body' => 1,   $start_page =
  'bgcolor'   => '#FFFFFF',      &Apache::loncommon::start_page($linktext, undef,
  'js_ready'  => 1,});     {'only_body' => 1,
     my $end_page =      'bgcolor'   => '#FFFFFF',
  &Apache::loncommon::end_page({'js_ready' => 1,});      'js_ready'  => 1,});
    $end_page =
       &Apache::loncommon::end_page({'js_ready' => 1,});
       }
     $result = "<script type=\"text/javascript\">      $result = "<script type=\"text/javascript\">
 //<!--  //<!--
  function LONCAPA_newwindow_$Apache::lonxml::curdepth() {   function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
   newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W');
   newWindow.close();
 newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');  newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
 newWindow.".&Apache::lonhtmlcommon::javascript_docopen().";  newWindow.".&Apache::lonhtmlcommon::javascript_docopen($mimetype).";
 newWindow.document.writeln('$start_page $output $end_page');  newWindow.document.writeln('$start_page $output $end_page');
 newWindow.document.close();}  newWindow.document.close();}
 //-->  //-->
Line 387  sub start_import { Line 372  sub start_import {
   my $bodytext=$$parser[$#$parser]->get_text("/import");    my $bodytext=$$parser[$#$parser]->get_text("/import");
   my $result ="";    my $result ="";
   
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);    $bodytext=&Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
   
   if ($target eq 'web' ||  $target eq 'webgrade' || $target eq 'grade'     if ($target eq 'web' ||  $target eq 'webgrade' || $target eq 'grade' 
       || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) {        || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) {
Line 399  sub start_import { Line 384  sub start_import {
       &Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>");        &Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>");
       return "";        return "";
     }      }
       my $importmode=&Apache::lonxml::get_param('importmode',$parstack,$safeeval);
       if (($importmode eq 'problem') || ($importmode eq 'part')) {
   # We are using import to import published problems
          if (($importmode eq 'problem') || ($file=~/<part[^<]*>/s)) {
   # We explicitly don't want this to be a separate part or the problem already has parts
             $file=~s/^\s*<problem>/<library>/s;
     $file=~s/<\/problem>\s*$/<\/library>/s;
          } else {
   # We want this to be a separate part, but it currently is not
             $file=~s/^\s*<problem>/<library><part>/s;
     $file=~s/<\/problem>\s*$/<\/part><\/library>/s;
          }
       }
     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");
Line 412  sub start_import { Line 409  sub start_import {
   
   } 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::editline($token->[1],$bodytext,'',40);      my $location=$token->[1];
       $location=~s/^\s*//s;
       $location=~s/\s*$//s;
       $result.=&Apache::edit::editline($location,$bodytext,'',40);
     $result.=&Apache::edit::browse(undef,'textnode');      $result.=&Apache::edit::browse(undef,'textnode');
       $result.= '&nbsp;<label>'.&mt('Import as:').
                 '<select name="importmode_'.$Apache::lonxml::curdepth.'">';
       my %options=&Apache::lonlocal::texthash(''        => 'as standard library',
                                               'problem' => 'as problem',
                                               'part'    => 'as problem part(s)');
       foreach my $option (sort(keys(%options))) {
          $result.='<option value="'.$option.'"';
          if ($option eq &Apache::lonxml::get_param('importmode',$parstack,$safeeval)) {
             $result.=' selected="selected"';
          }
          $result.='>'.$options{$option}.'</option>';
       }
       $result.='</select></label>';
     #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') {
       $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);        &Apache::edit::get_new_args($token,$parstack,$safeeval,'importmode');
         $result='<import id="'.$token->[2]{'id'}.'" importmode="'.$token->[2]{'importmode'}.'">';
         $result.=&Apache::edit::modifiedfield("/import",$parser);
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     my $id= &Apache::lonxml::get_id($parstack,$safeeval);      my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     $result.='<import part="'.$Apache::inputtags::part;      $result.='<import part="'.$Apache::inputtags::part;
Line 612  sub start_algebra { Line 627  sub start_algebra {
  $inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);   $inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {   if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
     my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);      my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);
     $result=&Apache::lontexconvert::algebra($inside,$target,$style);      $result=&Apache::lontexconvert::algebra($inside,undef,$target,$style,$parstack,$safeeval);
  }   }
  $Apache::lonxml::post_evaluate=0;   $Apache::lonxml::post_evaluate=0;
     }      }
Line 627  sub end_algebra { Line 642  sub end_algebra {
   
 1;  1;
 __END__  __END__
   
   =pod
   
   =head1 NAME
   
   Apache::scripttag.pm
   
   =head1 SYNOPSIS
   
   implements <script>, <scriptlib>, <parserlib>,
   and <import>
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =cut
   

Removed from v.1.145  
changed lines
  Added in v.1.155


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