--- loncom/homework/structuretags.pm 2001/07/12 12:27:15 1.46
+++ loncom/homework/structuretags.pm 2001/08/22 19:21:36 1.66
@@ -2,13 +2,15 @@
# 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,8/18,8/20 Gerd Kortemeyer
+
package Apache::structuretags;
use strict;
use Apache::lonnet;
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','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
}
@@ -38,42 +40,133 @@ sub end_tex {
return '';
}
+sub page_start {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ my $head_tag_start=''.&Apache::lonxml::registerurl();
+ my $body_tag_start='The resource needs to be checked out
+As a resource gets checked out, a unique timestamped ID is given to it, and a
+permanent record is left in the system.
+
+Checking out resources is subject to course policies, and may exclude future
+credit even if done erroneously.
+
+
+ENDCHECKOUT
+}
+
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
#intialize globals
$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();
+ @Apache::inputtags::previous=();
+ &initialize_storage();
$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
+
+#added vars to the scripting enviroment
my $expression='$external::part='.$Apache::inputtags::part.';';
&Apache::run::run($expression,$safeeval);
my $status;
- my $datemsg;
+ my $accessmsg;
#should get back a or the neccesary stuff to start XML/MathML
- my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ my ($result,$head_tag_start,$body_tag_start)=
+ &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
- my $head_tag_start=''.&Apache::lonxml::registerurl();
- my $body_tag_start='';
+ if ($Apache::lonhomework::type eq 'exam') {
+ if ($target eq 'web') {
+ my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
+ if (($ENV{'form.doescheckout'}) && (!$token)) {
+ $token=&Apache::lonxml::maketoken();
+ $Apache::lonhomework::history{"resource.0.outtoken"}=$token;
+ }
+ $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
+ }
+ }
if ($target eq 'web' || $target eq 'grade') {
- ($status,$datemsg) = &Apache::lonhomework::check_date('0');
+ ($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);
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 '.$accessmsg;
+ } elsif ($status eq 'UNCHECKEDOUT') {
+ $msg.=&checkout_msg;
+ }
+ return $result.$msg.' ';
}
}
}
@@ -94,6 +187,13 @@ sub start_problem {
$result.='
';
}
+ # if we are viewing someone else preserve that info
+ if (defined $ENV{'form.grade_symb'}) {
+ foreach my $field ('symb','courseid','domain','username') {
+ $result .= ''."\n";
+ }
+ }
return $result;
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {
return $result.$head_tag_start."$name\n$body_tag_start\n";
@@ -106,6 +206,7 @@ sub start_problem {
+
';
my $temp=&Apache::edit::insertlist($target,$token);
$result.=$temp;
@@ -139,15 +240,51 @@ sub end_problem {
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
$result.="\n";
}
+ $result.=&Apache::lonxml::xmlend();
}
- }
- if ($target eq 'meta') {
+ if ($target eq 'grade') {
+ &Apache::lonhomework::showhash(%Apache::lonhomework::results);
+ &finalize_storage();
+ }
+ } elsif ($target eq 'meta') {
if ($Apache::inputtags::part eq '0') {
$result=&Apache::response::mandatory_part_meta;
}
+ } elsif ($target eq 'edit') {
+ &Apache::lonxml::debug("in end_problem with $target, edit");
+ $result=' ';
+ }
+ return $result;
+}
+
+sub start_library {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my ($result,$head_tag_start,$body_tag_start)=
+ &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ if ($target eq 'edit') {
+ $result.=$head_tag_start."".$body_tag_start.
+ '