loncom/homework/structuretags.pm - diff

Return to structuretags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.35 and 1.38

version 1.35, 2001/04/26 21:27:15	version 1.38, 2001/05/15 20:48:43
Line 8 use Apache::lonnet;	Line 8 use Apache::lonnet;

sub BEGIN {	sub BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));	&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
	# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
}	}

sub start_web {	sub start_web {
Line 46 sub start_problem {	Line 47 sub start_problem {
&Apache::run::run($expression,$safeeval);	&Apache::run::run($expression,$safeeval);
my $status;	my $status;
my $datemsg;	my $datemsg;

	my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval);

if ($target eq 'web' \|\| $target eq 'grade') {	if ($target eq 'web' \|\| $target eq 'grade') {
($status,$datemsg) = &Apache::lonhomework::check_date('0');	($status,$datemsg) = &Apache::lonhomework::check_date('0');
push (@Apache::inputtags::status,$status);	push (@Apache::inputtags::status,$status);
Line 55 sub start_problem {	Line 59 sub start_problem {
if ( $status eq 'CLOSED' ) {	if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);	my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
if ( $target eq "web" ) {	if ( $target eq "web" ) {
return "<body bgcolor=\"#FFFFFF\"> <br />Problem is not open to be viewed. The problem $datemsg<br />";	return $result."<body bgcolor=\"#FFFFFF\"> <br />Problem is not open to be viewed. The problem $datemsg<br />";
}	}
}	}
}	}
Line 70 sub start_problem {	Line 74 sub start_problem {
$Apache::lonhomework::name=$name;	$Apache::lonhomework::name=$name;
if ($status eq 'CAN_ANSWER') {	if ($status eq 'CAN_ANSWER') {
# create a page header and exit	# create a page header and exit
return "<title>$name</title>\n<body bgcolor=\"#FFFFFF\">\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".'<input type="hidden" name="submitted" value="yes" />';	$result.="<head><title>$name</title></head>\n
	<body bgcolor=\"#FFFFFF\">\n
	<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".
	'<input type="hidden" name="submitted" value="yes" />';
	if ($ENV{'request.state'} eq "construct") {
	$result.='<input type="hidden" name="problemmode" value="View" />
	<input type="submit" name="problemmode" value="Edit" /><hr />';
	}
	return $result;
} elsif ($status eq 'SHOW_ANSWER' \|\| $status eq 'CANNOT_ANSWER' \|\| $status eq 'CLOSED') {	} elsif ($status eq 'SHOW_ANSWER' \|\| $status eq 'CANNOT_ANSWER' \|\| $status eq 'CLOSED') {
return "<title>$name</title>\n<body bgcolor=\"#FFFFFF\">\n";	return $result."<title>$name</title>\n<body bgcolor=\"#FFFFFF\">\n";
}	}
}	}
if ($target eq 'edit') {	if ($target eq 'edit') {
return '<body bgcolor="#FFFFFF">	$result.='<body bgcolor="#FFFFFF">
<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">	<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">
<input type="hidden" name="submitted" value="edit" />	<input type="hidden" name="submitted" value="edit" />
<input type="submit" name="undo" value="undo" />	<input type="hidden" name="problemmode" value="Edit" />
	<input type="submit" name="problemmode" value="View" />
	<input type="submit" name="Undo" value="undo" /> <hr />
';	';
	my $temp=&Apache::edit::insertlist($token,$target);
	$result.=$temp;
	return $result;
	}
	if ($target eq 'modified') {
	$result=$token->[4];
	$result.=&Apache::edit::handle_insert();
	return $result;
}	}
return '';	return '';
}	}
Line 109 sub end_problem {	Line 131 sub end_problem {
}	}
if ($target eq 'meta') {	if ($target eq 'meta') {
if ($Apache::inputtags::part eq '0') {	if ($Apache::inputtags::part eq '0') {

$result=&Apache::response::mandatory_part_meta;	$result=&Apache::response::mandatory_part_meta;
}	}
}	}
Line 123 sub end_problem {	Line 144 sub end_problem {
sub start_block {	sub start_block {
my ($target,$token,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$parstack,$parser,$safeeval)=@_;

my $code = @$parstack[$#$parstack];	if ($target eq 'web' \|\| $target eq 'grade') {
$code =~ s/\"//g;	my $code = @$parstack[$#$parstack];
$code .=';return $condition;';	$code =~ s/\"//g;
# print "<br />$code<br />";	$code .=';return $condition;';
my $result = &Apache::run::run($code,$safeeval);	# print "<br />$code<br />";
&Apache::lonxml::debug("block :$code: returned :$result:");	my $result = &Apache::run::run($code,$safeeval);
if ( ! $result ) {	&Apache::lonxml::debug("block :$code: returned :$result:");
my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);	if ( ! $result ) {
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");	my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
	&Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
	}
}	}
return "";	return "";
}	}

sub end_block {	sub end_block {
	return '';
}	}

sub start_while {	sub start_while {
Line 232 sub start_part {	Line 256 sub start_part {
@Apache::inputtags::responselist = ();	@Apache::inputtags::responselist = ();
if ($target eq 'meta') {	if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;	return &Apache::response::mandatory_part_meta;
} else {	} elsif ($target eq 'web' \|\| $target eq 'grade') {
my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);	my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
push (@Apache::inputtags::status,$status);	push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';	my $expression='$external::datestatus="'.$status.'";';
Line 254 sub end_part {	Line 278 sub end_part {
my $status=$Apache::inputtags::status['-1'];	my $status=$Apache::inputtags::status['-1'];
pop @Apache::inputtags::status;	pop @Apache::inputtags::status;
if ( $target eq 'meta' ) { return ''; }	if ( $target eq 'meta' ) { return ''; }
if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {	if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
return &Apache::inputtags::grade;	return &Apache::inputtags::grade;
}	}
return &Apache::inputtags::gradestatus($Apache::inputtags::part);	if ($target eq 'web') {
	return &Apache::inputtags::gradestatus($Apache::inputtags::part);
	}
	return '';
}	}

sub start_preduedate {	sub start_preduedate {
Line 335 sub end_startouttext {	Line 362 sub end_startouttext {
if ($target eq 'edit') {	if ($target eq 'edit') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);	$text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
$result=	$result=
&Apache::edit::tag_start("outtext").	&Apache::edit::tag_start($target,$token).
&Apache::edit::editfield($token->[1],$text,"Text Block");	&Apache::edit::editfield($token->[1],$text,"Text Block",50,5);
}	}
if ($target eq 'modified') {	if ($target eq 'modified') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);	$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
Line 347 sub end_startouttext {	Line 374 sub end_startouttext {
sub start_endouttext {	sub start_endouttext {
my ($target,$token,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$parstack,$parser,$safeeval)=@_;
my $result='';	my $result='';
if ($target eq "edit" ) { $result=&Apache::edit::tag_end("outtext"); }	if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); }
if ($target eq "modified") { $result='<endouttext />'; }	if ($target eq "modified") { $result='<endouttext />'; }
return $result;	return $result;
}	}

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

Removed from v.1.35
changed lines
	Added in v.1.38