--- loncom/homework/structuretags.pm 2003/04/03 21:08:33 1.163
+++ loncom/homework/structuretags.pm 2003/05/15 21:44:23 1.175
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.163 2003/04/03 21:08:33 albertel Exp $
+# $Id: structuretags.pm,v 1.175 2003/05/15 21:44:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,7 +38,7 @@ use Apache::File();
use Apache::lonmenu;
BEGIN {
- &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
+ &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
}
sub start_web {
@@ -104,8 +104,9 @@ sub page_start {
}
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
- my ($symb)=&Apache::lonxml::whichuser();
- if ($symb eq '') {
+ my ($symb,undef,undef,undef,$publicuser)=
+ &Apache::lonxml::whichuser();
+ if ($symb eq '' && !$publicuser) {
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
$help="Browsing resource, all submissions are temporary.
";
$body_tag_start.=$help;
@@ -145,8 +146,13 @@ sub setup_rndseed {
$ENV{'form.rndseed'}=$rndseed;
}
}
- if ($ENV{'form.resetdata'} eq 'New Problem Variation') {
+ if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
+ $ENV{'form.newrandomization'} eq 'New Randomization') {
$rndseed=time;
+ if ($rndseed eq $ENV{'form.rndseed'}) {
+ srand($rndseed);
+ $rndseed=int(rand(1000000000));
+ }
$ENV{'form.rndseed'}=$rndseed;
}
&Apache::lonxml::debug("Setting rndseed to $rndseed");
@@ -176,10 +182,12 @@ sub problem_web_to_edit_header {
my $result.='
- Random Seed:
-
+
+
+
Show All Foils
@@ -270,6 +278,13 @@ sub start_problem {
@Apache::structuretags::whileconds=();
@Apache::structuretags::whilebody=();
@Apache::structuretags::whileline=();
+ $Apache::lonhomework::scantronmode=0;
+ $Apache::lonhomework::problemstatus=
+ &Apache::lonnet::EXT('resource.0.problemstatus');
+
+ if (defined($ENV{'scantron.maxquest'})) {
+ $Apache::lonhomework::scantronmode=1;
+ }
if ($target ne 'analyze') {
&initialize_storage();
@@ -279,7 +294,7 @@ sub start_problem {
$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 '') {
+ if ($Apache::lonhomework::type eq '' ) {
my $uri=$ENV{'request.uri'};
if ($uri=~/\.(\w+)$/) {
$Apache::lonhomework::type=$1;
@@ -323,7 +338,9 @@ sub start_problem {
$form_tag_start.=''.
'';
+ value="New Problem Variation" />'.
+ '';
}
($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);
@@ -470,7 +487,8 @@ sub end_problem {
($target eq 'answer') || ($target eq 'tex')
) {
if ($status eq 'CAN_ANSWER') {
- if ($target ne 'tex') {
+ if ($target ne 'tex' &&
+ $ENV{'form.answer_output_mode'} ne 'tex') {
$result.="