--- loncom/homework/structuretags.pm	2001/06/05 16:32:18	1.41
+++ loncom/homework/structuretags.pm	2001/06/26 21:43:30	1.45
@@ -1,6 +1,7 @@
 # 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 <web></web> tags
 package Apache::structuretags; 
 
 use strict;
@@ -21,6 +22,7 @@ sub start_web {
 }
 
 sub end_web {
+    return '';
 }
 
 sub start_tex {
@@ -33,6 +35,7 @@ sub start_tex {
 }
 
 sub end_tex {
+    return '';
 }
 
 sub start_problem {
@@ -41,7 +44,11 @@ sub start_problem {
 #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);
@@ -364,9 +371,15 @@ sub end_startouttext {
 
   if ($target eq 'edit') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
-    $result=
-      &Apache::edit::tag_start($target,$token).
-	&Apache::edit::editfield($token->[1],$text,"Text Block",50,5);
+    $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
+<td>Delete:".
+  &Apache::edit::deletelist($target,$token)
+  ."</td>
+<td>".
+  &Apache::edit::insertlist($target,$token).
+    "</td>
+</tr><tr><td colspan=\"3\">\n".
+	&Apache::edit::editfield($token->[1],$text,"",50,4);
   }
   if ($target eq 'modified') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
@@ -377,7 +390,7 @@ sub end_startouttext {
 sub start_endouttext {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
-  if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); }
+  if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
   if ($target eq "modified") { $result='<endouttext />'; }
   return $result;
 }
@@ -387,7 +400,19 @@ sub end_endouttext {
   if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
   return (@result);
 }
-
+sub delete_startouttext {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+#  my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
+  my $text=$$parser['-1']->get_text("/endouttext");
+  my $token=$$parser['-1']->get_token();
+  &Apache::lonxml::debug("Deleting :$text: and :$token->[0]:$token->[1]:$token->[2]: for startouttext");
+  &Apache::lonxml::end_tag($tagstack,$parstack,$token);
+  # Deleting 2 parallel tag pairs, but we need the numbers later to look like 
+  # they did the last time round
+  &Apache::lonxml::increasedepth($token);
+  &Apache::lonxml::decreasedepth($token);
+  return 1;
+}
 
 1;
 __END__