--- loncom/homework/structuretags.pm	2001/06/11 16:15:10	1.42
+++ loncom/homework/structuretags.pm	2001/07/13 14:02:35	1.47
@@ -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 {
@@ -254,17 +257,19 @@ sub shuffle {
 }
 
 sub end_randomlist {
+  return '';
 }
 
 sub start_part {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+  if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   $Apache::inputtags::part=$id;
   @Apache::inputtags::responselist = ();
   if ($target eq 'meta') {
     return &Apache::response::mandatory_part_meta;
   } elsif ($target eq 'web' || $target eq 'grade') {
-    my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
+    my ($status,$datemsg) = &Apache::lonhomework::check_date($id);
     push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
@@ -368,7 +373,7 @@ sub end_startouttext {
 
   if ($target eq 'edit') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
-    $result.="<table width=\"100%\" border=\"2\"><tr><td>Text Block</td>
+    $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
 <td>Delete:".
   &Apache::edit::deletelist($target,$token)
   ."</td>
@@ -376,7 +381,7 @@ sub end_startouttext {
   &Apache::edit::insertlist($target,$token).
     "</td>
 </tr><tr><td colspan=\"3\">\n".
-	&Apache::edit::editfield($token->[1],$text,"",50,5);
+	&Apache::edit::editfield($token->[1],$text,"",50,4);
   }
   if ($target eq 'modified') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
@@ -387,7 +392,7 @@ sub end_startouttext {
 sub start_endouttext {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
-  if ($target eq "edit" ) { $result="</td></tr></table>\n"; }
+  if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
   if ($target eq "modified") { $result='<endouttext />'; }
   return $result;
 }
@@ -397,7 +402,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__