--- loncom/homework/structuretags.pm 2001/07/18 20:08:34 1.48
+++ loncom/homework/structuretags.pm 2001/08/17 14:10:40 1.54
@@ -2,6 +2,8 @@
# definition of tags that give a structure to a document
# 2/19 Guy
# 6/26/2001 fixed extra web display at end of tags
+# 8/17 Gerd Kortemeyer
+
package Apache::structuretags;
use strict;
@@ -43,8 +45,21 @@ sub page_start {
my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
my $head_tag_start=''.&Apache::lonxml::registerurl();
my $body_tag_start='';
+ 'onUnload="'.&Apache::lonxml::unloadevents().'" ';
+ my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);
+ if ($background) {
+ $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+ $background;
+ $body_tag_start.='background="'.$background.'" ';
+ } else {
+ my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);
+ if ($bgcolor) {
+ $body_tag_start.='bgcolor="'.$bgcolor.'" ';
+ } else {
+ $body_tag_start.='bgcolor="#ffffff"';
+ }
+ }
+ $body_tag_start.='>';
return ($result,$head_tag_start,$body_tag_start);
}
@@ -54,10 +69,18 @@ sub start_problem {
#intialize globals
$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();
+ @Apache::inputtags::previous=();
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
if ($Apache::lonhomework::type eq '') {
- $Apache::lonhomework::type='homework';
+ my $uri=$ENV{'request.uri'};
+ if ($uri=~/\.(\w+)$/) {
+ $Apache::lonhomework::type=$1;
+ &Apache::lonxml::debug("Using type of $1");
+ } else {
+ $Apache::lonhomework::type='problem';
+ &Apache::lonxml::debug("Using default type, problem, :$uri:");
+ }
}
#adeed vars to the scripting enviroment
my $expression='$external::part='.$Apache::inputtags::part.';';
@@ -75,12 +98,20 @@ sub start_problem {
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
&Apache::run::run($expression,$safeeval);
- if ( $status eq 'CLOSED' ) {
+ if (( $status eq 'CLOSED' ) ||
+ ( $status eq 'UNCHECKEDOUT') ||
+ ( $status eq 'BANNED')) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
if ( $target eq "web" ) {
$result.= $head_tag_start.'';
- return $result . $body_tag_start .
- " Problem is not open to be viewed. The problem $datemsg ";
+ my $msg=$body_tag_start.
+ '
Not open to be viewed
';
+ if ($status eq 'CLOSED') {
+ $msg.='The problem '.$datemsg;
+ } elsif ($status eq 'UNCHECKEDOUT') {
+ $msg.='The resource needs to be checked out';
+ }
+ return $result.$msg.' ';
}
}
}
@@ -113,6 +144,7 @@ sub start_problem {
+
';
my $temp=&Apache::edit::insertlist($target,$token);
$result.=$temp;
@@ -146,6 +178,7 @@ sub end_problem {
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
$result.="\n";
}
+ $result.=&Apache::lonxml::xmlend();
}
}
if ($target eq 'meta') {
@@ -289,6 +322,7 @@ sub start_randomlist {
sub shuffle {
my $a=shift;
my $i;
+ &Apache::response::setrandomnumber();
for($i=@$a;--$i;) {
my $j=int rand($i+1);
next if $i == $j;
@@ -306,6 +340,7 @@ sub start_part {
if ($id eq '') { $id = $Apache::lonxml::curdepth; }
$Apache::inputtags::part=$id;
@Apache::inputtags::responselist = ();
+ @Apache::inputtags::previous=();
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;
} elsif ($target eq 'web' || $target eq 'grade') {