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

Diff for /loncom/xml/scripttag.pm between versions 1.141 and 1.144

version 1.141, 2007/06/11 20:52:40 version 1.144, 2007/10/11 00:24:46
Line 80  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 {  sub start_LONCAPA_INTERNAL_LONHTTPD_PORT {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};  
  if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }  
  return '<script type="text/javascript">var lonhttpdport=\''.   return '<script type="text/javascript">var lonhttpdport=\''.
     $lonhttpdPort.'\';</script>';      &Apache::loncommon::lonhttpd_port().'\';</script>';
     }      }
     return ('','no');      return ('','no');
 }  }
Line 151  sub start_script { Line 159  sub start_script {
     }      }
   } else {    } else {
       my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);        my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
       if ($target ne "meta" && $target ne 'tex') {        if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
   $result = $token->[4];    $result = $token->[4];
   $result.=$bodytext;    $result.=$bodytext;
       }        }
Line 391  sub start_import { Line 399  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);      my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     if (!$id) { $id=$Apache::lonxml::curdepth; }      if (!$id) { $id=$Apache::lonxml::curdepth; }
     push(@Apache::inputtags::import,$id);      push(@Apache::inputtags::import,$id);
     push(@Apache::inputtags::importlist,$id);      push(@Apache::inputtags::importlist,$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 408  sub start_import { Line 416  sub start_import {
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
       $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);        $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);      my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     $result.='<import part="'.$Apache::inputtags::part;      $result.='<import part="'.$Apache::inputtags::part;
     if ($id) {      if ($id) {
       $result.='" id="'.$id;        $result.='" id="'.$id;
Removed from v.1.141  
changed lines
  Added in v.1.144

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