--- loncom/homework/structuretags.pm 2001/06/05 16:32:18 1.41
+++ loncom/homework/structuretags.pm 2001/08/03 22:12:07 1.51
@@ -1,13 +1,14 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
# 2/19 Guy
+# 6/26/2001 fixed extra web display at end of tags
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'))
}
@@ -21,6 +22,7 @@ sub start_web {
}
sub end_web {
+ return '';
}
sub start_tex {
@@ -33,6 +35,30 @@ sub start_tex {
}
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='';
+ return ($result,$head_tag_start,$body_tag_start);
}
sub start_problem {
@@ -41,7 +67,12 @@ 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';
+ }
#adeed vars to the scripting enviroment
my $expression='$external::part='.$Apache::inputtags::part.';';
&Apache::run::run($expression,$safeeval);
@@ -49,12 +80,9 @@ sub start_problem {
my $datemsg;
#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 ($target eq 'web' || $target eq 'grade') {
($status,$datemsg) = &Apache::lonhomework::check_date('0');
push (@Apache::inputtags::status,$status);
@@ -99,6 +127,7 @@ sub start_problem {
+
';
my $temp=&Apache::edit::insertlist($target,$token);
$result.=$temp;
@@ -132,6 +161,7 @@ sub end_problem {
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
$result.="\n";
}
+ $result.=&Apache::lonxml::xmlend();
}
}
if ($target eq 'meta') {
@@ -146,6 +176,39 @@ sub end_problem {
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.
+ '