--- loncom/interface/Attic/lonspreadsheet.pm	2002/04/11 13:35:23	1.84
+++ loncom/interface/Attic/lonspreadsheet.pm	2002/07/04 20:09:31	1.94
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.84 2002/04/11 13:35:23 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.94 2002/07/04 20:09:31 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -740,7 +740,25 @@ sub expandnamed {
 	    return 0;
         }
     } else {
-        return '$c{\''.$expression.'\'}';
+        # it is not a function, so it is a parameter name
+        # We should do the following:
+        #    1. Take the list of parameter names
+        #    2. look through the list for ones that match the parameter we want
+        #    3. If there are no collisions, return the one that matches
+        #    4. If there is a collision, return 'bad parameter name error'
+        my $returnvalue = '';
+        my @matches = ();
+        $#matches = -1;
+        study $expression;
+        foreach $parameter (keys(%c)) {
+            push @matches,$parameter if ($parameter =~ /$expression/);
+        }
+        if ($#matches == 0) {
+            $returnvalue = '$c{\''.$matches[0].'\'}';
+        } else {
+            $returnvalue =  "'bad parameter name : $expression'";
+        }
+        return $returnvalue;
     }
 }
 
@@ -760,11 +778,17 @@ sub sett {
 	      if ($_=~/A(\d+)/) {
 		my $trow=$1;
                 if ($trow) {
+                    # Get the name of this cell
 		    my $lb=$col.$trow;
+                    # Grab the template declaration
                     $t{$lb}=$f{'template_'.$col};
+                    # Replace '#' with the row number
                     $t{$lb}=~s/\#/$trow/g;
+                    # Replace '....' with ','
                     $t{$lb}=~s/\.\.+/\,/g;
+                    # Replace 'A0' with the value from 'A0'
                     $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+                    # Replace parameters
                     $t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
                 }
 	      }
@@ -787,6 +811,8 @@ sub sett {
             }
         }
     }
+    # For some reason 'A0' gets special treatment...  This seems superfluous
+    # but I imagine it is here for a reason.
     $t{'A0'}=$f{'A0'};
     $t{'A0'}=~s/\.\.+/\,/g;
     $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
@@ -837,9 +863,11 @@ sub outrowassess {
     my @cols=();
     if ($n) {
        my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{'A'.$n});
+      if ($rl{$usy}) {
        $cols[0]=$rl{$usy}.'<br>'.
                 '<select name="sel_'.$n.'" onChange="changesheet('.$n.
                 ')"><option name="default">Default</option>';
+      } else { $cols[0]=''; }
        foreach (@os) {
            $cols[0].='<option name="'.$_.'"';
             if ($ufn eq $_) {
@@ -1284,6 +1312,9 @@ sub readsheet {
           } else {
               $fn = $tmphash{'spreadsheet_default_'.$stype};
           } 
+          unless (($fn) && ($fn!~/^error\:/)) {
+ 	     $fn='default_'.$stype;
+          }
           $defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn; 
       }
   }
@@ -1316,17 +1347,11 @@ sub readsheet {
      } elsif($fn=~/\/*\.spreadsheet$/) {
          my $sheetxml=&Apache::lonnet::getfile
              (&Apache::lonnet::filelocation('',$fn));
-         print "<pre>$sheetxml</pre>";
          if ($sheetxml == -1) {
              $sheetxml='<field row="0" col="A">"Error loading spreadsheet '
                  .$fn.'"</field>';
          }
          %f=%{&parse_sheet(\$sheetxml)};
-         print "<pre>";
-         foreach (sort( keys(%f))) {
-             print "$_ = $f{$_}\n";
-         }
-         print "</pre>";
      } else {
          my $sheet='';
          my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum);
@@ -1443,6 +1468,7 @@ sub tmpread {
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
     my %fo=();
+    my $countrows=0;
     if ($fh=Apache::File->new($fn)) {
         my $name;
         while ($name=<$fh>) {
@@ -1450,6 +1476,11 @@ sub tmpread {
             my $value=<$fh>;
             chomp($value);
             $fo{$name}=$value;
+            if ($name=~/^A(\d+)$/) {
+		if ($1>$countrows) {
+		    $countrows=$1;
+                }
+            }
         }
     }
     if ($nform eq 'changesheet') {
@@ -1457,6 +1488,14 @@ sub tmpread {
         unless ($ENV{'form.sel_'.$nfield} eq 'Default') {
 	    $fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield};
         }
+    } elsif ($nfield eq 'insertrow') {
+        $countrows++;
+        my $newrow=substr('000000'.$i,-7);
+        if ($nform eq 'top') {
+	    $fo{'A'.$countrows}='--- '.$newrow;
+        } else {
+            $fo{'A'.$countrows}='~~~ '.$newrow;
+        }
     } else {
        if ($nfield) { $fo{$nfield}=$nform; }
     }
@@ -2377,17 +2416,8 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
 
 # --------------------------- Get query string for limited number of parameters
 
-    foreach (split(/&/,$ENV{'QUERY_STRING'})) {
-       my ($name, $value) = split(/=/,$_);
-       $value =~ tr/+/ /;
-       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-       if (($name eq 'uname') || ($name eq 'udom') || 
-           ($name eq 'usymb') || ($name eq 'ufn')) {
-           unless ($ENV{'form.'.$name}) {
-              $ENV{'form.'.$name}=$value;
-	   }
-       }
-    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['uname','udom','usymb','ufn']);
 
     if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) {
 	$ENV{'form.ufn'}='default_'.$1;
@@ -2425,8 +2455,8 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
 
     function celledit(cn,cf) {
         var cnf=prompt(cn,cf);
-	if (cnf!=null) {
-	    document.sheet.unewfield.value=cn;
+        if (cnf!=null) {
+            document.sheet.unewfield.value=cn;
             document.sheet.unewformula.value=cnf;
             document.sheet.submit();
         }
@@ -2438,6 +2468,12 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
         document.sheet.submit();
     }
 
+    function insertrow(cn) {
+	document.sheet.unewfield.value='insertrow';
+        document.sheet.unewformula.value=cn;
+        document.sheet.submit();
+    }
+
 </script>
 ENDSCRIPT
     $r->print('</head><body bgcolor="#FFFFFF">'.
@@ -2654,12 +2690,24 @@ ENDSCRIPT
        }
     }
     $r->print('>');
+
     if (&gettype($asheet) eq 'classcalc') {
        $r->print(
    ' Output CSV format: <input type=checkbox name=showcsv onClick="submit()"');
        if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
        $r->print('>');
     }
+
+# ------------------------------------------------------------------ Insertrows
+
+   $r->print(<<ENDINSERTBUTTONS);
+<br>
+<input type='button' onClick='insertrow("top");' 
+value='Insert Row Top'>
+<input type='button' onClick='insertrow("bottom");' 
+value='Insert Row Bottom'><br>
+ENDINSERTBUTTONS
+
 # ------------------------------------------------------------- Print out sheet
 
     &outsheet($r,$asheet);