--- loncom/interface/lonparmset.pm	2005/07/19 16:42:02	1.239
+++ loncom/interface/lonparmset.pm	2005/09/23 20:19:18	1.239.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.239 2005/07/19 16:42:02 raeburn Exp $
+# $Id: lonparmset.pm,v 1.239.2.2 2005/09/23 20:19:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1921,6 +1921,9 @@ sub crsenv {
 	     'disablesigfigs'
 	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
+	     'disableexampointprint'
+	         => '<b>'.&mt('Disable automatically printing point values onto exams.').'</b><br />'.
+                    ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
 	     'tthoptions'
 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>'
              ); 
@@ -1947,7 +1950,8 @@ sub crsenv {
                              'default_enrollment_start_date',
                              'default_enrollment_end_date',
 			     'tthoptions',
-			     'disablesigfigs'
+			     'disablesigfigs',
+			     'disableexampointprint'
                              );
 	foreach my $parameter (sort(keys(%values))) {
             unless ($parameter =~ m/^internal\./) {
@@ -2189,20 +2193,41 @@ sub listdata {
     my $pointer=0;
     $tableopen=0;
     my $foundkeys=0;
+    my %keyorder=&standardkeyorder();
     foreach my $thiskey (sort {
 	if ($sortorder eq 'realmstudent') {
-	    my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
-	    my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
-	    if (!defined($astudent) && !defined($bstudent) &&
-		!defined($arealm) && !defined($brealm)) {
-		($arealm)=($a=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/);
-		($brealm)=($b=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/);
+	    my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+	    my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+	    if (!defined($astudent)) {
+		($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+	    }
+	    if (!defined($bstudent)) {
+		($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+	    }
+	    $arealm=~s/\.type//;
+	    my ($ares, $aparm) = ($arealm=~/^(.*)\.(.*)$/);
+	    $aparm=$keyorder{'parameter_0_'.$aparm};
+	    $brealm=~s/\.type//;
+	    my ($bres, $bparm) = ($brealm=~/^(.*)\.(.*)$/);
+	    $bparm=$keyorder{'parameter_0_'.$bparm};	   
+	    if ($ares eq $bres) {
+		if (defined($aparm) && defined($bparm)) {
+		    ($aparm <=> $bparm);
+		} elsif (defined($aparm)) {
+		    -1;
+		} elsif (defined($bparm)) {
+		    1;
+		} else {
+		    ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+		}
+	    } else {
+		($arealm cmp $brealm) || ($astudent cmp $bstudent);
 	    }
-            ($arealm cmp $brealm) || ($astudent cmp $bstudent);
 	} else {
 	    $a cmp $b;
 	}
     } keys %{$listdata}) {
+	 
 	if ($$listdata{$thiskey.'.type'}) {
             my $thistype=$$listdata{$thiskey.'.type'};
             if ($$resourcedata{$thiskey.'.type'}) {