--- loncom/homework/structuretags.pm	2001/01/08 13:55:08	1.29
+++ loncom/homework/structuretags.pm	2001/05/04 21:21:45	1.36
@@ -1,12 +1,13 @@
-# The LearningOnline Network with CAPA # <script> definiton
-
+# The LearningOnline Network with CAPA 
+# definition of tags that give a structure to a document
+# 2/19 Guy
 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'));
+  &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
 }
 
 sub start_web {
@@ -45,7 +46,10 @@ sub start_problem {
   &Apache::run::run($expression,$safeeval);
   my $status;
   my $datemsg;
-  if ($target ne 'meta') {
+
+  my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval);
+
+  if ($target eq 'web' || $target eq 'grade') {
     ($status,$datemsg) = &Apache::lonhomework::check_date('0');
     push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';
@@ -54,7 +58,7 @@ sub start_problem {
     if ( $status eq 'CLOSED' ) {
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
       if ( $target eq "web" ) {
-	return "<body bgcolor=#FFFFFF> <br></br>Problem is not open to be viewed. The problem $datemsg<br></br>";
+	return $result."<body bgcolor=\"#FFFFFF\"> <br />Problem is not open to be viewed. The problem $datemsg<br />";
       }
     } 
   }
@@ -62,13 +66,39 @@ sub start_problem {
     my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+    if ($name eq '') { 
+      $name=&Apache::lonnet::EXT('resource.title');
+      if ($name eq 'con_lost') { $name = ''; }
+    }
+    $Apache::lonhomework::name=$name;
     if ($status eq 'CAN_ANSWER') {
       # create a page header and exit
-      return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";
+      $result.="<head><title>$name</title></head>\n
+              <body bgcolor=\"#FFFFFF\">\n
+              <form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".
+		'<input type="hidden" name="submitted" value="yes" />';
+      if ($ENV{'request.state'} eq "construct") {
+	$result.='<input type="hidden" name="problemmode" value="View" />
+                 <input type="submit" name="problemmode" value="Edit" /><hr />';
+      }
+      return $result;
     } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {
-      return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n";
+      return $result."<title>$name</title>\n<body bgcolor=\"#FFFFFF\">\n";
     }
   }
+  if ($target eq 'edit') {
+    $result.='<body bgcolor="#FFFFFF">
+<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">
+<input type="hidden" name="submitted" value="edit" />
+<input type="hidden" name="problemmode" value="Edit" />
+<input type="submit" name="problemmode" value="View" />
+<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;
+  }
   return '';
 }
 
@@ -76,7 +106,7 @@ sub end_problem {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result='';
   my $status=$Apache::inputtags::status['-1'];
-  unless ($target eq 'meta') {
+  if ($target eq 'grade' || $target eq'web' ) {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
        $status eq 'CAN_ANSWER') {
       # if part is zero, no <part>s existed, so we need to the grading
@@ -93,11 +123,17 @@ sub end_problem {
 	$result.="</body>\n"; 
       } 
     }
-  } else {
+  } 
+  if ($target eq 'meta') {
     if ($Apache::inputtags::part eq '0') {
+      
       $result=&Apache::response::mandatory_part_meta;
     }
   }
+  if ($target eq 'edit') {
+    &Apache::lonxml::debug("in end_problem with $target, edit");
+    $result='<br /><input type="submit" name="submit" value="Submit Changes" />';
+  }
   return $result;
 }
 
@@ -107,7 +143,7 @@ sub start_block {
   my $code = @$parstack[$#$parstack];
   $code =~ s/\"//g;
   $code .=';return $condition;';
-#  print "<br>$code<br>";
+#  print "<br />$code<br />";
   my $result = &Apache::run::run($code,$safeeval);
   &Apache::lonxml::debug("block :$code: returned :$result:");
   if ( ! $result ) { 
@@ -170,14 +206,14 @@ sub start_randomlist {
       $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
       $list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";
       push(@randomlist,$list_item);
-   #  print "<BR><B>START-TAG $b_tok->[1], $b_tok->[4], $list_item</B>";
+   #  print "<br /><b>START-TAG $b_tok->[1], $b_tok->[4], $list_item</b>";
     }
     if($b_tok->[0] eq 'T') { # text
     # what to do with text in between tags?
-      #  print "<B>TEXT $b_tok->[1]</B><BR>";
+      #  print "<b>TEXT $b_tok->[1]</b><br />";
     }
     # if($b_tok->[0] eq 'E') { # end tag, should not happen
-      #  print "<B>END-TAG $b_tok->[1]</B><BR>";
+      #  print "<b>END-TAG $b_tok->[1]</b><br />";
     # }
   }
   my @idx_arr = (0 .. $#randomlist);
@@ -222,7 +258,7 @@ sub start_part {
     if ( $status eq 'CLOSED' ) {
       my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
       if ( $target eq "web" ) {
-	return "<br></br>Part is not open to be viewed. It $datemsg<br></br>";
+	return "<br />Part is not open to be viewed. It $datemsg<br />";
       }
     }
   }
@@ -243,7 +279,7 @@ sub end_part {
 
 sub start_preduedate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  if ($target ne 'meta') {
+  if ($target eq 'web' || $target eq 'grade') {
     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
 	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
       &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
@@ -258,7 +294,7 @@ sub end_preduedate {
 
 sub start_postanswerdate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  if ($target ne 'meta') {
+  if ($target eq 'web' || $target eq 'grade') {
     if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
       &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
     }
@@ -272,7 +308,7 @@ sub end_postanswerdate {
 
 sub start_notsolved {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  if ($target ne 'meta') {
+  if ($target eq 'web' || $target eq 'grade') {
     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     &Apache::lonxml::debug("not solved has :$gradestatus:");
     if ($gradestatus =~ /^correct/) {
@@ -289,7 +325,7 @@ sub end_notsolved {
 
 sub start_solved {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  if ($target ne 'meta') {
+  if ($target eq 'web' || $target eq 'grade') {
     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     if ($gradestatus !~ /^correct/) {
       &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);
@@ -301,5 +337,44 @@ sub start_solved {
 sub end_solved {
   return '';
 }
+
+sub start_startouttext {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my @result=(''.'');
+  if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
+  return (@result);
+}
+sub end_startouttext {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my $result='';
+  my $text='';
+
+  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");
+  }
+  if ($target eq 'modified') {
+    $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
+    $result='<startouttext />'.&Apache::edit::modifiedfield();
+  }
+  return $result;
+}
+sub start_endouttext {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my $result='';
+  if ($target eq "edit" ) { $result=&Apache::edit::tag_end("outtext"); }
+  if ($target eq "modified") { $result='<endouttext />'; }
+  return $result;
+}
+sub end_endouttext {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my @result=('','');
+  if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
+  return (@result);
+}
+
+
 1;
 __END__
