--- loncom/homework/structuretags.pm	2001/05/04 21:21:45	1.36
+++ loncom/homework/structuretags.pm	2001/05/15 20:48:43	1.38
@@ -8,6 +8,7 @@ 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_insert('problem','',('part','postanswerdate','preduedate'))
 }
 
 sub start_web {
@@ -95,10 +96,14 @@ sub start_problem {
 <input type="submit" name="Undo" value="undo" /> <hr />
 ';
     my $temp=&Apache::edit::insertlist($token,$target);
-    &Apache::lonxml::debug("edit gave me $temp");
     $result.=$temp;
     return $result;
   }
+  if ($target eq 'modified') {
+    $result=$token->[4];
+    $result.=&Apache::edit::handle_insert();
+    return $result;
+  }
   return '';
 }
 
@@ -126,7 +131,6 @@ sub end_problem {
   } 
   if ($target eq 'meta') {
     if ($Apache::inputtags::part eq '0') {
-      
       $result=&Apache::response::mandatory_part_meta;
     }
   }
@@ -140,20 +144,23 @@ sub end_problem {
 sub start_block {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
 
-  my $code = @$parstack[$#$parstack];
-  $code =~ s/\"//g;
-  $code .=';return $condition;';
-#  print "<br />$code<br />";
-  my $result = &Apache::run::run($code,$safeeval);
-  &Apache::lonxml::debug("block :$code: returned :$result:");
-  if ( ! $result ) { 
-    my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
-    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
+  if ($target eq 'web' || $target eq 'grade') {
+    my $code = @$parstack[$#$parstack];
+    $code =~ s/\"//g;
+    $code .=';return $condition;';
+    #  print "<br />$code<br />";
+    my $result = &Apache::run::run($code,$safeeval);
+    &Apache::lonxml::debug("block :$code: returned :$result:");
+    if ( ! $result ) { 
+      my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
+      &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
+    }
   }
   return "";
 }
 
 sub end_block {
+  return '';
 }
 
 sub start_while {
@@ -249,7 +256,7 @@ sub start_part {
   @Apache::inputtags::responselist = ();
   if ($target eq 'meta') {
     return &Apache::response::mandatory_part_meta;
-  } else {
+  } elsif ($target eq 'web' || $target eq 'grade') {
     my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
     push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';
@@ -271,10 +278,13 @@ sub end_part {
   my $status=$Apache::inputtags::status['-1'];
   pop @Apache::inputtags::status;
   if ( $target eq 'meta' ) { return ''; }
-  if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { 
-    return &Apache::inputtags::grade; 
+  if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
+    return &Apache::inputtags::grade;
   }
-  return &Apache::inputtags::gradestatus($Apache::inputtags::part);
+  if ($target eq 'web') {
+    return &Apache::inputtags::gradestatus($Apache::inputtags::part);
+  }
+  return '';
 }
 
 sub start_preduedate {
@@ -352,8 +362,8 @@ sub end_startouttext {
   if ($target eq 'edit') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
     $result=
-      &Apache::edit::tag_start("outtext").
-	&Apache::edit::editfield($token->[1],$text,"Text Block");
+      &Apache::edit::tag_start($target,$token).
+	&Apache::edit::editfield($token->[1],$text,"Text Block",50,5);
   }
   if ($target eq 'modified') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
@@ -364,7 +374,7 @@ sub end_startouttext {
 sub start_endouttext {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result='';
-  if ($target eq "edit" ) { $result=&Apache::edit::tag_end("outtext"); }
+  if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); }
   if ($target eq "modified") { $result='<endouttext />'; }
   return $result;
 }