[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Mon, 04 Aug 2003 22:40:03 -0000
albertel Mon Aug 4 18:40:03 2003 EDT
Modified files:
/loncom/homework structuretags.pm
Log:
- reverting back to 1.181, fixing BUG#1908 is more inmportant than fixing BUG#1723
(they are diametrically opposed)
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.199 loncom/homework/structuretags.pm:1.200
--- loncom/homework/structuretags.pm:1.199 Fri Jul 25 06:44:36 2003
+++ loncom/homework/structuretags.pm Mon Aug 4 18:40:03 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.199 2003/07/25 10:44:36 www Exp $
+# $Id: structuretags.pm,v 1.200 2003/08/04 22:40:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,9 +44,9 @@
sub start_web {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' ||
- $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
- my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+ if ($target eq 'web') {
+ return $bodytext;
}
return '';
}
@@ -58,12 +58,9 @@
sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
- if (!($target eq 'edit' || $target eq 'modified' ||
- $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
- &Apache::lonxml::debug("tex 1");
- my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
- } elsif ($target eq 'tex') {
- $result=&Apache::lonxml::get_all_text("/tex",$parser);
+ my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+ if ($target eq 'tex') {
+ return $bodytext.' ';
}
return $result;;
}