loncom/xml/scripttag.pm - diff

Return to scripttag.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/scripttag.pm between versions 1.78 and 1.79

-version 1.78, 2002/10/14 20:47:11
+version 1.79, 2002/10/21 20:31:06
  Line 59  sub start_script {
      } elsif ( $target eq 'web' || $target eq 'tex' ||
  	      $target eq 'grade' || $target eq 'answer' ||
  	      $target eq 'analyze' ) {
-       &Apache::run::run($bodytext,$safeeval);
+ 	if (!$Apache::lonxml::default_homework_loaded) {
-       if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
+ 	    &Apache::lonxml::default_homework_load($safeeval);
- 	$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>";
+ 	&Apache::run::run($bodytext,$safeeval);
- 	my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
+ 	if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
+ 	    $Apache::lonxml::evaluate--;
- 	$result.=$listing;
+ 	    $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.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
+ 	    my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
-       }
+ 	    $result.=$listing;
+ 	    $result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
+ 	}
      } elsif ($target eq "edit" ) {
        #&Apache::run::run($bodytext,$safeeval);
        #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";

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

Removed from v.1.78
changed lines
	Added in v.1.79