[LON-CAPA-cvs] cvs: loncom(version_0_6) /interface lonspreadsheet.pm

[matthew]

matthew		Wed Mar 19 12:16:23 2003 EDT

  Modified files:              (Branch: version_0_6)
    /loncom/interface	lonspreadsheet.pm 
  Log:
  Fix two bugs - Bug 1321 (multipart problems don't work with default assess
  spreadsheet) and a bug which caused the incorrect spreadsheet to be loaded
  at the student level.
  
  
Index: loncom/interface/lonspreadsheet.pm
diff -u loncom/interface/lonspreadsheet.pm:1.160.2.3 loncom/interface/lonspreadsheet.pm:1.160.2.4
--- loncom/interface/lonspreadsheet.pm:1.160.2.3	Fri Mar 14 17:54:26 2003
+++ loncom/interface/lonspreadsheet.pm	Wed Mar 19 12:16:23 2003
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.160.2.3 2003/03/14 22:54:26 albertel Exp $
+# $Id: lonspreadsheet.pm,v 1.160.2.4 2003/03/19 17:16:23 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -833,7 +833,7 @@
             push @matches,$parameter if ($parameter =~ /$expression/);
         }
         if (scalar(@matches) == 0) {
-            $returnvalue = 'unmatched parameter: '.$parameter;
+            $returnvalue = undef; #'unmatched parameter: '.$parameter;
         } elsif (scalar(@matches) == 1) {
             $returnvalue = '$c{\''.$matches[0].'\'}';
         } elsif (scalar(@matches) > 0) {
@@ -3035,9 +3035,9 @@
                                              $ENV{'form.ufn'} eq 'default')) {
         $ENV{'form.ufn'}='default_'.$1;
     }
-    if (!$ENV{'form.ufn'} || $ENV{'form.ufn'} eq 'default') {
-        $ENV{'form.ufn'}='course_default_'.$sheettype;
-    }
+#    if (!$ENV{'form.ufn'} || $ENV{'form.ufn'} eq 'default') {
+#        $ENV{'form.ufn'}='course_default_'.$sheettype;
+#    }
     #
     # Interactive loading of specific sheet?
     #