--- loncom/homework/structuretags.pm 2001/10/30 19:18:15 1.71
+++ loncom/homework/structuretags.pm 2002/09/23 17:25:24 1.116
@@ -1,5 +1,30 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
+#
+# $Id: structuretags.pm,v 1.116 2002/09/23 17:25:24 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# 2/19 Guy
# 6/26/2001 fixed extra web display at end of tags
# 8/17,8/18,8/20 Gerd Kortemeyer
@@ -8,8 +33,9 @@ package Apache::structuretags;
use strict;
use Apache::lonnet;
+use Apache::File();
-sub BEGIN {
+BEGIN {
&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'))
}
@@ -31,7 +57,7 @@ sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
if ($target eq 'tex') {
- return $bodytext
+ return $bodytext.' ';
}
return '';
}
@@ -42,25 +68,101 @@ sub end_tex {
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='';
+ }
+ return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
+}
+
+sub get_resource_name {
+ my ($parstack,$safeeval)=@_;
+ my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
+ if ($name eq '') {
+ $name=&Apache::lonnet::EXT('resource.title');
+ if ($name eq 'con_lost') { $name = ''; }
}
- $body_tag_start.='>';
- return ($result,$head_tag_start,$body_tag_start);
+ $Apache::lonhomework::name=$name;
+ return $name;
+}
+
+sub setup_rndseed {
+ my ($safeeval)=@_;
+ my $rndseed;
+ if ($ENV{'request.state'} eq "construct") {
+ $rndseed=$ENV{'form.rndseed'};
+ if (!$rndseed) {
+ $rndseed=time;
+ $ENV{'form.rndseed'}=$rndseed;
+ }
+ &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+ }
+ return $rndseed;
+}
+
+sub problem_edit_header {
+ return '
+
+
+
+
+
+
+ ';
+}
+
+sub problem_edit_footer {
+ return '
+ ';
+}
+
+sub problem_web_to_edit_header {
+ my ($rndseed)=@_;
+ my $result.='
+
+
+ Random Seed:
+
+
+
Checking out resources is subject to course policies, and may exclude future
credit even if done erroneously.
-
-
ENDCHECKOUT
}
@@ -123,13 +223,26 @@ ENDCHECKOUT
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ # meta is called from lonpublisher, which doesn't uses the normal
+ # lonhomework method of parsing the file which means that inputtags
+ # won't get reset
+ if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
+ &Apache::lonxml::error('Only one problem allowed in a .problem file');
+ my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]);
+ return '';
+ }
#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 ($target ne 'analyze') {
+ &initialize_storage();
+ if ($target eq 'web') {
+ &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+ }
+ $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 '') {
my $uri=$ENV{'request.uri'};
if ($uri=~/\.(\w+)$/) {
@@ -148,11 +261,11 @@ sub start_problem {
my $accessmsg;
#should get back a or the neccesary stuff to start XML/MathML
- my ($result,$head_tag_start,$body_tag_start)=
+ my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
-
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
#handle exam checkout
if ($Apache::lonhomework::type eq 'exam') {
my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
@@ -164,15 +277,7 @@ sub start_problem {
}
#handle rand seed in construction space
- my $rndseed;
- if ($ENV{'request.state'} eq "construct") {
- $rndseed=$ENV{'form.rndseed'};
- if (!$rndseed) {
- $rndseed=time;
- $ENV{'form.rndseed'}=$rndseed;
- }
- &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
- }
+ my $rndseed=&setup_rndseed($safeeval);
($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';
@@ -194,24 +299,14 @@ sub start_problem {
$result.=$msg.' ';
}
} elsif ($target eq 'web') {
- my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
- if ($name eq '') {
- $name=&Apache::lonnet::EXT('resource.title');
- if ($name eq 'con_lost') { $name = ''; }
- }
- $Apache::lonhomework::name=$name;
+ my $name= &get_resource_name($parstack,$safeeval);
if ($status eq 'CAN_ANSWER') {
# create a page header and exit
- $result.="$head_tag_start$name\n
- $body_tag_start\n
-