--- loncom/interface/lonprintout.pm	2010/05/22 01:07:47	1.576
+++ loncom/interface/lonprintout.pm	2010/06/10 16:14:34	1.581
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.576 2010/05/22 01:07:47 raeburn Exp $
+# $Id: lonprintout.pm,v 1.581 2010/06/10 16:14:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -196,14 +196,19 @@ sub generate_code_selector {
     <message><br /><hr /> <br /></message>
     <message><h3>Generate new CODEd Assignments</h3></message>
     <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
-    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
             !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
-	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'} ) {
+
 	    return "You need to specify the number of assignments to print";
 	}
+        if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
+             (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
+            return 'Specifying number of codes to print and a specific code is not compatible';
+        }
 	return undef;
        </validator>
     </string>
@@ -228,6 +233,8 @@ sub generate_code_selector {
 	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
 						      \$helper->{'VARS'}{'CODE_OPTION'});
+	  } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
+	      return 'Specifying a code name is incompatible with specifying number of codes.';
 	   } else {
 	       return undef;	# Other forces control us.
 	   }
@@ -2450,7 +2457,11 @@ ENDPART
 		if ($i > 0) {
 		    $result .= '\cleardoublepage';
 		}
-		$result .= &include_pdf($urlp);
+                my $texfrompdf = &include_pdf($urlp);
+                if ($flag_latex_header_remove ne 'NO') {
+                    $texfrompdf = &latex_header_footer_remove($texfrompdf);
+                }
+                $result .= $texfrompdf;
 		if ($i != $#master_seq) {
 		    if ($numberofcolumns eq '1') {
 			$result .= '\newpage';
@@ -2574,7 +2585,8 @@ ENDPART
 	     $resources_printed .= ":";
 	     $print_array[$i].=$output;
 	     $student_names[$i].=$person.':'.$fullname.'_END_';
-	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
+#	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
+	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
 	     $flag_latex_header_remove = 'YES';
 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
 	 }
@@ -3723,7 +3735,7 @@ CHOOSE_STUDENTS1
     <message><br /><hr /> <br /></message>
     <message><h3>Generate new CODEd Assignments</h3></message>
     <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
-    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
@@ -3731,6 +3743,10 @@ CHOOSE_STUDENTS1
 	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	    return "You need to specify the number of assignments to print";
 	}
+        if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
+             (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
+            return 'Specifying number of codes to print and a specific code is not compatible';
+        }
 	return undef;
        </validator>
     </string>
@@ -3754,6 +3770,8 @@ CHOOSE_STUDENTS1
 	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
 						      \$helper->{'VARS'}{'CODE_OPTION'});
+	  } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
+	      return 'Specifying a code name is incompatible specifying number of codes.';
 	   } else {
 	       return undef;	# Other forces control us.
 	   }