--- rat/lonpage.pm	2009/10/26 10:17:58	1.92
+++ rat/lonpage.pm	2011/11/07 20:06:29	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.92 2009/10/26 10:17:58 foxr Exp $
+# $Id: lonpage.pm,v 1.97 2011/11/07 20:06:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,6 +158,19 @@ sub handler {
   my $number_of_columns = 1;
   my $requrl=$r->uri;  
   my $target = $env{'form.grade_target'};
+
+# Short term solution: define target as 'tex_answer' when retrieving answers
+# for resources in a .page when generating printouts.
+# A better long-term fix would be to modify the way problem rendering, and 
+# answer rendering are retrieved for individual resources when printing a .page,
+# so rendered problem and answer are sequential for individual resources in 
+# the .page
+#
+  if ($target eq 'answer') {
+      if ($env{'form.answer_output_mode'} eq 'tex') {
+          $target = 'tex_answer';
+      }
+  }
 #  &Apache::lonnet::logthis("Got a target of $target");
   if ($target eq 'meta') {
       &Apache::loncommon::content_type($r,'text/html');
@@ -201,6 +214,10 @@ sub handler {
                   my $lcm=1;
                   my $contents=0;
                   my $nforms=0;
+                  my $nuploads=0;
+                  my %turninpaths;
+                  my %multiresps;
+                  my $turninparent;
                   
                   my %ssibody=();
                   my %ssibgcolor=();
@@ -242,12 +259,14 @@ sub handler {
                               my %posthash=('request.prefix' => $prefix,
 					    'LONCAPA_INTERNAL_no_discussion' => 'true',
 					    'symb' => $symb);
-			      if ($env{'form.grade_target'} eq 'tex') {
+			      if (($env{'form.grade_target'} eq 'tex') ||
+                                 ($env{'form.answer_output_mode'} eq 'tex')) {
 				  $posthash{'grade_target'}=$env{'form.grade_target'};
 				  $posthash{'textwidth'}=$env{'form.textwidth'};
 				  $posthash{'problem_split'}=$env{'form.problem_split'};
 				  $posthash{'latex_type'}=$env{'form.latex_type'};
 				  $posthash{'rndseed'}=$env{'form.rndseed'};
+                                  $posthash{'answer_output_mode'} = $env{'form.answer_output_mode'};
 			      }
 			      my $submitted=exists($env{'form.all_submit'});
 			      if (!$submitted) {
@@ -271,7 +290,7 @@ sub handler {
 			      }
                               my $output=Apache::lonnet::ssi($src,%posthash);
 			      $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs;
-                              if ($target eq 'tex') {
+                              if (($target eq 'tex') || ($target eq 'tex_answer')) {
 				  $output =~ s/^([^&]+)\\begin{document}//;
 				  $output =~ s/\\end{document}//;
 #				  $output = '\parbox{\minipagewidth}{ '.$output.' }';
@@ -337,8 +356,23 @@ sub handler {
 				  $nforms++;
                                   $output=~s/\<form[^\>]*\>//gsi;
                                   $output=~s/\<\/form[^\>]*\>//gsi;
+                                  if ($output=~/\<input[^\>]+name\s*=\s*[\'\"]*HWFILE/) {
+                                      $nuploads++;
+                                  }
                                   $output=~
 				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
+                                  if ($nuploads) {
+                                      $output=~
+                                          s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\s*id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\)]*)\>/\<$1 id="$prefix$2" $3\>/gsi;
+                                       ($turninpaths{$prefix},$multiresps{$prefix}) = 
+                                           &Apache::loncommon::get_turnedin_filepath($symb,$env{'user.name'},$env{'user.domain'});
+                                       if ($turninparent eq '') {
+                                           $turninparent = $turninpaths{$prefix};
+                                           $turninparent =~ s{(/[^/]+)$}{}; 
+                                       }
+                                  }
+                                  $output=~
+                                      s/\<((?:input|select)[^\>]+\Qjavascript:setSubmittedPart\E)\(\s*[\'\"]([^\'\"]+)[\'\"]*\s*\)/\<$1('$2','$prefix')/gsi;
                               }
                               $thisdir=~s/\/[^\/]*$//;
 			      foreach (@rlinks) {
@@ -372,7 +406,7 @@ sub handler {
 # ------------------------------------------------------------------ Build page
 
 # ---------------------------------------------------------------- Send headers
-		      unless ($target eq 'tex') {
+		      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 			  if ($isxml) {
 			      &Apache::loncommon::content_type($r,'text/xml');
 			  } else {
@@ -386,17 +420,29 @@ sub handler {
 				  $allscript.
 				  "\n</script>\n";
 			  }
+                          if (($nforms) && ($nuploads)) {
+                              $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps);
+                          }
 # ------------------------------------------------------------------ Start body
 			  $r->print(&Apache::loncommon::start_page(undef,$allscript,
 								   {'force_register' => 1,
 								    'bgcolor'        => '#ffffff',}));
 # ------------------------------------------------------------------ Start form
 			  if ($nforms) {
-			      $r->print('<form name="lonhomework" method="post"  enctype="multipart/form-data" action="'.
+			      my $fmtag = '<form name="lonhomework" method="post"  enctype="multipart/form-data"';
+                              if ($nuploads) {
+                                  my $multi;
+                                  if ($nuploads > 1) {
+                                      $multi = 1;
+                                  }
+                                  $fmtag .= 'onsubmit="return file_submission_check(this,'."'$turninparent','$multi'".');"';
+                              }
+                              $fmtag .= ' action="'.
 					&Apache::lonenc::check_encrypt($requrl)
-					.'">');
+					.'">';
+                              $r->print($fmtag);
 			  }
-		      } elsif ($target eq 'tex') {
+		      } elsif (($target eq 'tex') || ($target eq 'tex_answer')) {
 			  #  I think this is not needed as the header
 			  # will be put in for each of the page parts
 			  # by the londefdef.pm now that we are opening up
@@ -410,7 +456,7 @@ sub handler {
                           #       \begin{document}');
 		      }
 # ----------------------------------------------------------------- Start table
-		      if ($target eq 'tex') {
+		      if (($target eq 'tex') || ($target eq 'tex_answer')) {
 #			 #  $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead ');
 			  if ($number_of_columns le $lcm) {$number_of_columns=$lcm;};
 		      } else {
@@ -419,7 +465,7 @@ sub handler {
 # generate rows
                       for ($i=0;$i<=$#rows;$i++) {
 			if ($rows[$i]) {
-			    unless ($target eq 'tex') {
+			    unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				$r->print("\n<tr>");
 			    }
                           my @colcont=split(/\&/,$rows[$i]);
@@ -428,11 +474,11 @@ sub handler {
                               my $rid=$colcont[$j];
 
 			      my $metainfo =&get_buttons(\%hash,$rid).'<br />';
-			    unless ($target eq 'tex') {
+			    unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				$r->print('<td colspan="'.$avespan.'"');
 			    }
                               if ($cellemb{$rid} eq 'ssi') {
-				  unless ($target eq 'tex') {
+				  unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				      if ($ssibgcolor{$rid}) {
 					  $r->print(' bgcolor="'.
 						    $ssibgcolor{$rid}.'"');
@@ -454,13 +500,13 @@ sub handler {
 				      $r->print('>');
 				  }
                                   $r->print($ssibody{$rid});	
-				  unless ($target eq 'tex') {
+				  unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				      $r->print('</font>');
                                   }
                                   if ($env{'course.'.
                                       $env{'request.course.id'}.
                                       '.pageseparators'} eq 'yes') {
-                                      unless($target eq 'tex') {
+                                      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
                                           $r->print('<hr />');
                                       } 
 				  }
@@ -475,7 +521,7 @@ sub handler {
                                   &mt('It is recommended that you use an up-to-date virus scanner before handling this file.').'</p><p><table>'.
                                   &Apache::londocs::entryline(0,&mt("Click to download or use your browser's Save Link function"),'/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).'</table></p><br />');
                               }
-			      unless ($target eq 'tex') {
+			      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				  $r->print('</td>');
 			      } else {
 #                                  for (my $incol=1;$incol<=$avespan;$incol++) {
@@ -483,14 +529,14 @@ sub handler {
 #				  }
 			      }
                           }
-			      unless ($target eq 'tex') {
+			      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				  $r->print('</tr>');
 			      } else {
 #				  $r->print('REMOVETHEHEADOFLONGTABLE\\\\');
 			      }
 		        }
                       }
-		      unless ($target eq 'tex') {
+		      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 			  $r->print("\n</table>");
 		      } else {
 #			  $r->print('\end{longtable}\strut');
@@ -501,7 +547,7 @@ sub handler {
 	                  '<input name="all_submit" value="Submit All" type="'.
 			  (($nforms>1)?'submit':'hidden').'"></input></form>');
                       }
-		      unless ($target eq 'tex') {
+		      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 			  $r->print(&Apache::loncommon::end_page({'discussion'
 								      => 1,}));
 		      } else {
@@ -538,10 +584,6 @@ sub handler {
 sub get_buttons {
     my ($hash,$rid) = @_;
 
-    # which icons do we use?
-    my $extension='png';
-    if ($env{'environment.icons'} eq 'classic') { $extension='gif'; }
-
     my $metainfo = '';
     my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
     my ($mapid,$resid)=split(/\./,$rid);
@@ -558,15 +600,15 @@ sub get_buttons {
 	    || !$hash->{'encrypted_'.$rid})) { 
 	$metainfo .='<a name="'.&escape($symb).'" />'.
 	    '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
-	    '<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'.
+	    '<img src="/adm/lonMisc/cat_button.png" class="LC_icon" />'.
 	    '</a>';
     }
     $metainfo .= '<a href="/adm/evaluate?postdata='.
 	&escape($esrc).
 	'" target="LONcatInfo">'.
-	'<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'.
+	'<img src="/adm/lonMisc/eval_button.png" class="LC_icon" />'.
 	'</a>';
-    if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
+    if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
 	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
 
 	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
@@ -574,12 +616,12 @@ sub get_buttons {
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=submission" target="LONcatInfo">'.
 		'&command=submission">'.
-		'<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'.
+		'<img src="/adm/lonMisc/subm_button.png" class="LC_icon" />'.
 		'</a>'.
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=gradingmenu" target="LONcatInfo">'.
 		'&command=gradingmenu">'.
-		'<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'.
+		'<img src="/adm/lonMisc/pgrd_button.png" class="LC_icon" />'.
 		'</a>';
 	}
 	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
@@ -587,7 +629,7 @@ sub get_buttons {
 		'<a href="/adm/parmset?symb='.&escape($symb).
 #               '" target="LONcatInfo">'.
 		'" >'.
-		'<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'.
+		'<img src="/adm/lonMisc/pprm_button.png" class="LC_icon" />'.
 		'</a>';
 	}
     }