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.51 and 1.57

version 1.51, 2001/09/18 02:21:13	version 1.57, 2001/11/12 20:27:28
Line 31 sub start_script {	Line 31 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" \|\| $target eq 'answer') {	} 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="#FFFFFF"><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 /> <$token->[1]> output: <br />$bodytext<br />Source:<br />";	#$result="<br /> <$token->[1]> output: <br />$bodytext<br />Source:<br />";
Line 51 sub end_script {	Line 60 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 78 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" \|\| $target eq 'answer') {	} 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 222 sub start_import {	Line 237 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 281 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;
}	}

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

Removed from v.1.51
changed lines
	Added in v.1.57