--- loncom/homework/lonhomework.pm	2002/03/29 18:32:46	1.74
+++ loncom/homework/lonhomework.pm	2003/03/07 23:43:21	1.113
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.74 2002/03/29 18:32:46 albertel Exp $
+# $Id: lonhomework.pm,v 1.113 2003/03/07 23:43:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,6 +28,7 @@
 # Guy Albertelli
 # 11/30 Gerd Kortemeyer
 # 6/1,8/17,8/18 Gerd Kortemeyer
+# 7/18 Jeremy Bowers
 
 package Apache::lonhomework;
 use strict;
@@ -41,8 +42,17 @@ use Apache::randomlabel();
 use Apache::response();
 use Apache::hint();
 use Apache::outputtags();
+use Apache::caparesponse();
+use Apache::radiobuttonresponse();
+use Apache::optionresponse();
+use Apache::imageresponse();
+use Apache::essayresponse();
+use Apache::externalresponse();
+use Apache::rankresponse();
+use Apache::matchresponse();
 use Apache::Constants qw(:common);
 use HTML::Entities();
+use Apache::loncommon();
 #use Time::HiRes qw( gettimeofday tv_interval );
 
 BEGIN {
@@ -51,10 +61,14 @@ BEGIN {
 
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
-    if ( defined($ENV{'form.grade_target'}) 
+    if ( defined($ENV{'form.grade_target'}  ) 
+	 && ($ENV{'form.grade_target'} eq 'tex')) {
+      return ($ENV{'form.grade_target'});
+    } elsif ( defined($ENV{'form.grade_target'}  ) 
 	 && ($Apache::lonhomework::viewgrades == 'F' )) {
       return ($ENV{'form.grade_target'});
     }
+ 
     if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');
     } else {
@@ -71,7 +85,8 @@ sub get_target {
 	return ('web');
       }
     } else {
-      if ( $ENV{'form.problemmode'} eq 'View' ) {
+      if ( $ENV{'form.problemmode'} eq 'View' ||
+	   $ENV{'form.problemmode'} eq 'Discard Edits and View') {
 	if ( defined($ENV{'form.submitted'}) &&
 	     (!defined($ENV{'form.resetdata'})) ) {
 	  return ('grade', 'web','answer');
@@ -80,7 +95,11 @@ sub get_target {
 	}
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
 	if ( $ENV{'form.submitted'} eq 'edit' ) {
-	  return ('modified','edit');
+	  if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
+	    return ('modified','web','answer');
+	  } else {
+	    return ('modified','edit');
+	  }
 	} else {
 	  return ('edit');
 	}
@@ -122,20 +141,45 @@ sub send_footer {
 
 $Apache::lonxml::browse='';
 
+# JB, 9/24/2002: Any changes in this function may require a change
+# in lonnavmaps::resource::getDateStatus.
 sub check_access {
   my ($id) = @_;
   my $date ='';
-  my $status = '';
+  my $status;
   my $datemsg = '';
   my $lastdate = '';
   my $temp;
   my $type;
   my $passed;
+
+  if ($ENV{'request.state'} eq "construct") {
+    &Apache::lonxml::debug("in construction ignoring dates");
+    $status='CAN_ANSWER';
+    $datemsg='is in under construction';
+    return ($status,$datemsg);
+  }
+
   &Apache::lonxml::debug("checking for part :$id:");
   &Apache::lonxml::debug("time:".time);
   foreach $temp ("opendate","duedate","answerdate") {
     $lastdate = $date;
     $date = &Apache::lonnet::EXT("resource.$id.$temp");
+    my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
+    if ($thistype =~ /^(con_lost|no_such_host)/ ||
+	$date     =~ /^(con_lost|no_such_host)/) {
+	$status='UNAVAILABLE';
+	$date="may open later.";
+	return($status,$date);
+    }
+    if ($thistype eq 'date_interval') {
+	if ($temp eq 'opendate') {
+           $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;
+        }
+        if ($temp eq 'answerdate') {
+           $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date;
+        }
+    }
     &Apache::lonxml::debug("found :$date: for :$temp:");
     if ($date eq '') {
       $date = "an unknown date"; $passed = 0;
@@ -182,31 +226,51 @@ sub check_access {
     $status='CAN_ANSWER';
     $datemsg='is closed but you are allowed to view it';
   }
-  if ($ENV{'request.state'} eq "construct") {
-    &Apache::lonxml::debug("in construction ignoring dates");
-    $status='CAN_ANSWER';
-    $datemsg='is in under construction';
-  }
+
   return ($status,$datemsg);
 }
 
 sub showhash {
   my (%hash) = @_;
+  &showhashsubset(\%hash,'.');
+  return '';
+}
+
+sub showarray {
+    my ($array)=@_;
+    my $string="(";
+    foreach my $elm (@{ $array }) {
+	if (ref($elm)) {
+	    if ($elm =~ /ARRAY/ ) {
+		$string.=&showarray($elm);
+	    }
+	} else {
+	    $string.="$elm,"
+	}
+    }
+    chop($string);
+    $string.=")";
+    return $string;
+}
+
+sub showhashsubset {
+  my ($hash,$keyre) = @_;
   my $resultkey;
-  foreach $resultkey (sort keys %hash) {
-    if (ref($hash{$resultkey})) {
-      if ($hash{$resultkey} =~ /ARRAY/ ) {
-	my $string="$resultkey ---- (";
-	foreach my $elm (@{ $hash{$resultkey} }) {
-	  $string.="$elm,";
+  foreach $resultkey (sort keys %$hash) {
+    if ($resultkey =~ /$keyre/) {
+      if (ref($$hash{$resultkey})) {
+	if ($$hash{$resultkey} =~ /ARRAY/ ) {
+	    &Apache::lonxml::debug("$resultkey ---- ".
+				   &showarray($$hash{$resultkey}));
+	} elsif ($$hash{$resultkey} =~ /HASH/ ) {
+	    &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
+	    &showhashsubset($$hash{$resultkey},'.');
+	} else {
+	    &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
 	}
-	chop($string);
-	&Apache::lonxml::debug("$string)");
       } else {
-	&Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+	&Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
       }
-    } else {
-      &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
     }
   }
   &Apache::lonxml::debug("\n<br />restored values^</br>\n");
@@ -273,14 +337,76 @@ sub handle_save_or_undo {
   return $error;
 }
 
+sub analyze_header {
+    my ($request) = @_;
+    my $result.='<html>
+            <head><title>Analyzing a problem</title></head>
+            <body bgcolor="#FFFFFF">
+            <form name="lonhomework" method="POST" action="'.
+	      $ENV{'request.uri'}.'">
+            <input type="submit" name="problemmode" value="EditXML" />
+            <input type="submit" name="problemmode" value="Edit" />
+            <hr />
+            <input type="submit" name="submit" value="View" />
+            <hr />
+            List of possible answers:
+            </form>';
+    $request->print($result);
+    $request->rflush();
+}
+
+sub analyze_footer {
+    my ($request) = @_;
+    my $result='</body></html>';
+    $request->print($result);
+    $request->rflush();
+}
+
 sub analyze {
-  my ($request,$file) = @_;
-  &Apache::lonxml::debug("Analyze");
-  my $result=&Apache::lonnet::ssi($request->uri,('grade_target' => 'analyze'));
-  &Apache::lonxml::debug(":$result:");
-  (my $garbage,$result)=split(/_HASH_REF__/,$result,2);
-  &showhash(&Apache::lonnet::str2hash($result));
-  return $result;
+    my ($request,$file) = @_;
+    &Apache::lonxml::debug("Analyze");
+    my $result;
+    my %overall;
+    my %allparts;
+    my $rndseed=$ENV{'form.rndseed'};
+    &analyze_header($request);
+    for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
+	my $subresult=&Apache::lonnet::ssi($request->uri,
+					   ('grade_target' => 'analyze'),
+					   ('rndseed' => $i));
+	&Apache::lonxml::debug(":$subresult:");
+	(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
+	my %analyze=&Apache::lonnet::str2hash($subresult);
+	$Apache::lonxml::debug=1;
+	&Apache::lonhomework::showhash(%analyze);
+	$Apache::lonxml::debug=0;
+	my @parts = @{ $analyze{'parts'} };
+	foreach my $part (@parts) {
+	    if (!exists($allparts{$part})) {$allparts{$part}=1;};
+	    if ($analyze{$part.'.type'} eq 'numericalresponse'	||
+		$analyze{$part.'.type'} eq 'stringresponse'	||
+		$analyze{$part.'.type'} eq 'formularesponse'   ) {
+		push( @{ $overall{$part.'.answer'} },
+		      [@{ $analyze{$part.'.answer'} }]);
+	    }
+	}
+    }
+    foreach my $part (keys(%allparts)) {
+	if (defined(@{ $overall{$part.'.answer'} })) {
+	    $request->print('<table><tr><td>Part '.$part.'</td></tr>');
+	    foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
+		$request->print('<tr><td>'.join('</td><td>',@{ $answer }).
+				'</td></tr>');
+	    }
+	    $request->print('</table>');
+	} else {
+	    $request->print('<p>Part '.$part.
+			    ' is not analyzabale at this time</p>');
+	}
+    }
+    &analyze_footer($request);
+    &Apache::lonhomework::showhash(%overall);
+    return $result;
 }
 
 sub editxmlmode {
@@ -296,22 +422,42 @@ sub editxmlmode {
 				   \$ENV{'form.editxmltext'});
     if (!$error) { $problem=&Apache::lonnet::getfile($file); }
   }
-  my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
-  if ($cols > 80) { $cols = 80; }
-  $result.='<html><body bgcolor="#FFFFFF">
+  &Apache::lonhomework::showhashsubset(\%ENV,'^form');
+  if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
+    &Apache::lonhomework::showhashsubset(\%ENV,'^form');
+    $ENV{'form.problemmode'}='View';
+    &renderpage($request,$file);
+  } else {
+    my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
+    my $xml_help = '<table><tr><td>'.
+	&Apache::loncommon::help_open_topic("Problem_Editor_XML_Index",'Problem Editing Help')
+	    .'</td><td>'.
+	&Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+					    undef,undef,600)
+	    .'</td><td>'.
+        &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+					    undef,undef,600)
+	    .'</td></tr></table>';
+    if ($cols > 80) { $cols = 80; }
+    if ($cols < 70) { $cols = 70; }
+    if ($rows < 20) { $rows = 20; }
+    $result.='<html><body bgcolor="#FFFFFF">
             <form name="lonhomework" method="POST" action="'.
 	      $ENV{'request.uri'}.'">
             <input type="hidden" name="problemmode" value="EditXML" />
-            <input type="submit" name="problemmode" value="View" />
+            <input type="submit" name="problemmode" value="Discard Edits and View" />
             <input type="submit" name="problemmode" value="Edit" />
             <hr />
             <input type="submit" name="submit" value="Submit Changes" />
+            <input type="submit" name="submit" value="Submit Changes and View" />
             <input type="submit" name="Undo" value="undo" />
             <hr />
+            ' . $xml_help . '
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
 	      &HTML::Entities::encode($problem).'</textarea>
             </form></body></html>';
-  $request->print($result);
+    $request->print($result);
+  }
   return '';
 }
 
@@ -330,35 +476,21 @@ sub renderpage {
 
     my %mystyle;
     my $result = '';
-    &Apache::inputtags::initialize_inputtags;
-    &Apache::edit::initialize_edit;
-    if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); }
-    if ($target eq 'web') {
-      if (&Apache::lonnet::symbread() eq '') {
-	if ($ENV{'request.state'} eq "construct") {
-	} else {
-	  $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
-	}
-      }
-      #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
-    }
-    #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
+    if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); }
+    if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
+    if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
 
-    my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
-    if ($default == -1) {
-      &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
-      $default='';
-    }
     &Apache::lonxml::debug("Should be parsing now");
-    $result = &Apache::lonxml::xmlparse($target, $problem,
-			$default.&setup_vars($target),%mystyle);
-
+    $result = &Apache::lonxml::xmlparse($request, $target, $problem,
+			&setup_vars($target),%mystyle);
+    undef($Apache::lonhomework::parsing_a_problem);
     #$request->print("Result follows:");
     if ($target eq 'modified') {
       &handle_save_or_undo($request,\$problem,\$result);
     } else {
       if ($target eq 'analyze') {
 	$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);
+	undef(%Apache::lonhomework::analyze);
       }
       #my $td=&tv_interval($t0);
       #if ( $Apache::lonxml::debug) {
@@ -366,6 +498,7 @@ sub renderpage {
 	#$result.="<br />Spent $td seconds processing target $target\n</body>";
       #}
       $request->print($result);
+      $request->rflush();
     }
     #$request->print(":Result ends");
     #my $td=&tv_interval($t0);
@@ -377,6 +510,7 @@ sub renderpage {
 sub get_template_list {
   my ($namewanted,$extension) = @_;
   my $result;
+  my @allnames;
   &Apache::lonxml::debug("Looking for :$extension:");
   foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
     my $name=&Apache::lonnet::metadata($file,'title');
@@ -384,9 +518,13 @@ sub get_template_list {
       $result=$file;
       last;
     } else {
-      $result.="<option>$name</option>";
+	if ($name) { push (@allnames, $name); }
     }
   }
+  if (@allnames && !$result) {
+    $result="<option>Select a $extension type</option>\n<option>".
+      join('</option><option>',sort(@allnames)).'</option>';
+  }
   return $result;
 }
 
@@ -395,7 +533,8 @@ sub newproblem {
     my $extension=$request->uri;
     $extension=~s:^.*\.([\w]+)$:$1:;
     &Apache::lonxml::debug("Looking for :$extension:");
-    if ($ENV{'form.template'}) {
+    if ($ENV{'form.template'} &&
+	$ENV{'form.template'} ne "Select a $extension type") {
 	use File::Copy;
 	my $file = &get_template_list($ENV{'form.template'},$extension);
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
@@ -410,33 +549,26 @@ sub newproblem {
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	copy($templatefilename,$dest);
 	&renderpage($request,$dest);
-    }else {
+    } else {
 	my $templatelist=&get_template_list('',$extension);
 	my $url=$request->uri;
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
-	if (!defined($templatelist)) {
-	    # We didn't find a template, so just create a blank problem.
-	    $request->print(<<ENDNEWPROBLEM);
-<body bgcolor="#FFFFFF">
-The requested file $url doesn\'t exist. You can create a new $extension <br />
-<form action="$url" method="POST">
-<input type="submit" name="newfile" value="New $extension"><br />
-</form>
-</body>
-ENDNEWPROBLEM
-            return '';
-        }
+	my $instructions;
+	if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";}
 	$request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">
-The requested file $url doesn\'t exist. You can create a new $extension <br />
-<form action="$url" method="POST">
-<input type="submit" value="New $extension"><br />
-<select name="template">
-$templatelist
-</select>
-</form>
-</body>
+<h1>Creating a new $extension resource</h1>
+The requested file <tt>$url</tt> currently does not exist.
+<p>
+To create a new $extension$instructions click on the "Create $extension" button.
+</p>
+<p><form action="$url" method="POST">
 ENDNEWPROBLEM
+	if (defined($templatelist)) {
+	    $request->print("<select name=\"template\">$templatelist</select>");
+	}
+	$request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"Create $extension\" />");
+	$request->print("</form></p></body>");
     }
     return '';
 }
@@ -458,7 +590,8 @@ sub handler {
   #my $t0 = [&gettimeofday()];
   my $request=$_[0];
 
-  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
+#  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
+  $Apache::lonxml::debug=$ENV{'user.debug'};
 
   if (&setupheader($request)) { return OK; }
   $ENV{'request.uri'}=$request->uri;
@@ -469,8 +602,10 @@ sub handler {
   &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
   # some times multiple problemmodes are submitted, need to select
   # the last one
+  &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
   if ( defined($ENV{'form.problemmode'}) &&
-       defined(@{ $ENV{'form.problemmode'} })) {
+       ref($ENV{'form.problemmode'}) ) {
+    &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'}));
     my $mode=$ENV{'form.problemmode'}->[-1];
     undef $ENV{'form.problemmode'};
     $ENV{'form.problemmode'}=$mode;