[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /homework matchresponse.pm

[raeburn]

raeburn		Thu Dec 11 01:20:32 2008 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/homework	matchresponse.pm 
  Log:
  _ Backport 1.74.  PDF Forms not included in 2.8.
  
  
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.73 loncom/homework/matchresponse.pm:1.73.2.1
--- loncom/homework/matchresponse.pm:1.73	Thu Dec 11 00:56:20 2008
+++ loncom/homework/matchresponse.pm	Thu Dec 11 01:20:32 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.73 2008/12/11 00:56:20 raeburn Exp $
+# $Id: matchresponse.pm,v 1.73.2.1 2008/12/11 01:20:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -513,27 +513,18 @@
 		$optionlist="<option></option>\n";
 	    } else {
 		if ($Apache::lonhomework::type ne 'exam') {
-                    if($env{'form.pdfFormFields'} eq 'yes') {
-                        my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&';
-                        $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);
-                    } else {
-                        $optionlist='\framebox[10 mm][s]{\tiny\strut}';
-                    }
-                 }
+                    $optionlist='\framebox[10 mm][s]{\tiny\strut}';
+                }
 	    }
 	    my $option;
 	    foreach $option (@used_letters) {
 		if ($option eq $last_letter) {
 		    if ($target ne 'tex') {
                         $optionlist.="<option selected=\"on\">$option</option>\n";
-                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
-                        $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
                     }
 		} else {
 		    if ($target ne 'tex') {
                         $optionlist.="<option>$option</option>\n";
-                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
-                        $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
                     }
 		}
 	    }
@@ -577,7 +568,7 @@
 		# Note that if left or right positioned, we must
 		# confine the bubbles to righttabsize:
 		#
-		if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') {
+		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
@@ -592,11 +583,7 @@
 		    $question .= '\end{list} \vskip -8 mm \strut ';
 		    $internal_counter++;
 	        } else {
-                    if($env{'form.pdfFormFields'} eq 'yes') {
-                        $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut';
-                    } else {
-                        $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
-                    }
+                    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
 		}
             } 
 	    $temp++;