--- loncom/homework/structuretags.pm 2001/06/02 03:59:59 1.40
+++ loncom/homework/structuretags.pm 2001/08/16 21:06:22 1.53
@@ -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,14 +67,28 @@ 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 '') {
+ 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
my $expression='$external::part='.$Apache::inputtags::part.';';
&Apache::run::run($expression,$safeeval);
my $status;
my $datemsg;
- my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$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');
@@ -59,9 +99,11 @@ 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 $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
@@ -72,8 +114,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";
+ }
+ $result.=&Apache::lonxml::xmlend();
}
- }
+ }
if ($target eq 'meta') {
if ($Apache::inputtags::part eq '0') {
$result=&Apache::response::mandatory_part_meta;
@@ -139,6 +183,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.
+ '