--- loncom/homework/structuretags.pm 2001/05/04 21:21:45 1.36
+++ loncom/homework/structuretags.pm 2001/07/19 21:26:22 1.49
@@ -1,17 +1,19 @@
# 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'))
}
sub start_web {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
if ($target eq 'web') {
return $bodytext;
@@ -20,10 +22,11 @@ sub start_web {
}
sub end_web {
+ return '';
}
sub start_tex {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
if ($target eq 'tex') {
return $bodytext
@@ -32,22 +35,39 @@ 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 {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
#intialize globals
$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();
-
+ $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);
my $status;
my $datemsg;
- my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval);
+ #should get back a or the neccesary stuff to start XML/MathML
+ my ($result,$head_tag_start,$body_tag_start)=
+ &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
if ($target eq 'web' || $target eq 'grade') {
($status,$datemsg) = &Apache::lonhomework::check_date('0');
@@ -58,14 +78,14 @@ sub start_problem {
if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
if ( $target eq "web" ) {
- return $result."
Problem is not open to be viewed. The problem $datemsg
";
+ $result.= $head_tag_start.'';
+ return $result . $body_tag_start .
+ "
Problem is not open to be viewed. The problem $datemsg
";
}
- }
+ }
}
if ($target eq 'web') {
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $name = &Apache::run::run("{$args;".'return $name}',$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 = ''; }
@@ -73,8 +93,8 @@ sub start_problem {
$Apache::lonhomework::name=$name;
if ($status eq 'CAN_ANSWER') {
# create a page header and exit
- $result.="$name\n
- \n
+ $result.="$head_tag_start$name\n
+ $body_tag_start\n
\n";
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
- $result.="\n";
- }
+ $result.="\n";
+ }
}
- }
+ }
if ($target eq 'meta') {
if ($Apache::inputtags::part eq '0') {
-
$result=&Apache::response::mandatory_part_meta;
}
}
@@ -137,27 +161,63 @@ 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.
+ '