[LON-CAPA-cvs] cvs: loncom /xml lonxml.pm

[sakharuk]

sakharuk		Mon Oct 27 14:00:11 2003 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
  Log:
  Bug 2323 (problem numbering when printing exam with answers) is fixed for resources from sequence (not for selected students yet). I want to know the Guy's opinion.
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.287 loncom/xml/lonxml.pm:1.288
--- loncom/xml/lonxml.pm:1.287	Fri Oct 24 17:31:05 2003
+++ loncom/xml/lonxml.pm	Mon Oct 27 14:00:11 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.287 2003/10/24 21:31:05 albertel Exp $
+# $Id: lonxml.pm,v 1.288 2003/10/27 19:00:11 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -395,7 +395,7 @@
 	$string =~ s/_/ /g;
     } else {
 	$string=~s/\\ /\\char92 /g;
-	$string=~s/\^/\\char94 /g;
+	$string=~s/\^/\\\^ /g;
 	$string=~s/\~/\\char126 /g;
 	$string=~s/(&[^A-Za-z\#])/\\$1/g;
 	$string=~s/([^&])\#/$1\\#/g;
@@ -845,12 +845,14 @@
 
 sub increment_counter {
     my ($increment) = @_;
-    if (defined($increment) && $increment gt 0) {
-	$Apache::lonxml::counter+=$increment;
-    } else {
-	$Apache::lonxml::counter++;
+    if ($ENV{'form.freeze_counter'} ne 'yes') {
+	if (defined($increment) && $increment gt 0) {
+	    $Apache::lonxml::counter+=$increment;
+	} else {
+	    $Apache::lonxml::counter++;
+	}
+	$Apache::lonxml::counter_changed=1;
     }
-    $Apache::lonxml::counter_changed=1;
 }
 
 sub init_counter {