--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/05 15:09:22	1.5
+++ loncom/interface/Attic/lonspreadsheet.pm	2000/12/06 23:23:38	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Spreadsheet/Grades Display Handler
 #
-# 11/11,11/15,11/27,12/04,12/05 Gerd Kortemeyer
+# 11/11,11/15,11/27,12/04,12/05,12/06 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
@@ -10,8 +10,9 @@ use Safe;
 use Safe::Hole;
 use Opcode;
 use Apache::lonnet;
-use Apache::Constants qw(:common);
+use Apache::Constants qw(:common :http);
 use HTML::TokeParser;
+use GDBM_File;
 
 # =============================================================================
 # ===================================== Implements an instance of a spreadsheet
@@ -31,31 +32,41 @@ sub initsheet {
 # f: formulas
 # t: intermediate format (variable references expanded)
 # v: output values
-#
+# c: preloaded constants (A-column)
+# rl: row label
 
 %v=(); 
 %t=();
 %f=();
+%c=();
+%rl=();
+
+$maxrow=0;
 $sheettype='';
 $filename='';
 
 sub mask {
     my ($lower,$upper)=@_;
 
-    $lower=~/([A-Z]|\*)(\d+|\*)/;
+    $lower=~/([A-Za-z]|\*)(\d+|\*)/;
     my $la=$1;
     my $ld=$2;
 
-    $upper=~/([A-Z]|\*)(\d+|\*)/;
+    $upper=~/([A-Za-z]|\*)(\d+|\*)/;
     my $ua=$1;
     my $ud=$2;
     my $alpha='';
     my $num='';
 
     if (($la eq '*') || ($ua eq '*')) {
-       $alpha='[A-Z]';
+       $alpha='[A-Za-z]';
     } else {
-       $alpha='['.$la.'-'.$ua.']';
+       if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) ||
+           ($la=~/[a-z]/) && ($ua=~/[a-z]/)) {
+          $alpha='['.$la.'-'.$ua.']';
+       } else {
+          $alpha='['.$la.'-Za-'.$ua.']';
+       }
     }   
 
     if (($ld eq '*') || ($ud eq '*')) {
@@ -77,11 +88,13 @@ sub mask {
        } else {
            my @lda=($ld=~m/\d/g);
            my @uda=($ud=~m/\d/g);
-           my $i; $j=0;
-           for ($i=0;$i<=$#lda;$i++) {
+           my $i; $j=0; $notdone=1;
+           for ($i=0;($i<=$#lda)&&($notdone);$i++) {
                if ($lda[$i]==$uda[$i]) {
 		   $num.=$lda[$i];
                    $j=$i;
+               } else {
+                   $notdone=0;
                }
            }
            if ($j<$#lda-1) {
@@ -99,7 +112,9 @@ sub mask {
                }
                $num.=')';
            } else {
-               $num.='['.$lda[$#lda].'-'.$uda[$#uda].']';
+               if ($lda[$#lda]!=$uda[$#uda]) {
+                  $num.='['.$lda[$#lda].'-'.$uda[$#uda].']';
+	       }
            }
        }
     }
@@ -230,9 +245,15 @@ sub sett {
     %t=();
     map {
 	if ($f{$_}) {
-	    $t{$_}=$f{$_};
-            $t{$_}=~s/\.+/\,/g;
-            $t{$_}=~s/(^|[^\"\'])([A-Z]\d+)/$1\$v\{\'$2\'\}/g;
+            if ($_=~/^A/) {
+	        unless ($f{$_}=~/^\!/) {
+		    $t{$_}=$c{$_};
+                }
+            } else {
+	       $t{$_}=$f{$_};
+               $t{$_}=~s/\.\.+/\,/g;
+               $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+            }
         }
     } keys %f;
 }
@@ -262,6 +283,25 @@ sub calc {
     return '';
 }
 
+sub outrow {
+    my $n=shift;
+    my @cols=();
+    if ($n) {
+       $cols[0]=$rl{$f{'A'.$n}};
+    } else {
+       $cols[0]='<b><font size=+1>Export</font></b>';
+    }
+    map {
+        my $fm=$f{$_.$n};
+        $fm=~s/[\'\"]/\&\#34;/g;
+        $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n};
+    } ('A','B','C','D','E','F','G','H','I','J','K','L','M',
+       'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+       'a','b','c','d','e','f','g','h','i','j','k','l','m',
+       'n','o','p','q','r','s','t','u','v','w','x','y','z');
+    return @cols;
+}
+
 # ------------------------------------------- End of "Inside of the safe space"
 ENDDEFS
     $safeeval->reval($code);
@@ -272,7 +312,21 @@ ENDDEFS
 
 sub setformulas {
     my ($safeeval,@f)=@_;
-    $safeeval->reval('%f=(%f,'."('".join("','",@f)."'));");
+    $safeeval->reval('%f='."('".join("','",@f)."');");
+}
+
+# ------------------------------------------------ Add or change formula values
+
+sub setconstants {
+    my ($safeeval,@c)=@_;
+    $safeeval->reval('%c='."('".join("','",@c)."');");
+}
+
+# ------------------------------------------------ Add or change formula values
+
+sub setrowlabels {
+    my ($safeeval,@rl)=@_;
+    $safeeval->reval('%rl='."('".join("','",@rl)."');");
 }
 
 # ------------------------------------------------------- Calculate spreadsheet
@@ -309,15 +363,28 @@ sub gettype {
     my $safeeval=shift;
     return $safeeval->reval('$sheettype');
 }
+# ------------------------------------------------------------------ Set maxrow
 
-# -------------------------------------------------------------------- Set type
+sub setmaxrow {
+    my ($safeeval,$row)=@_;
+    $safeeval->reval('$maxrow='.$row.';');
+}
+
+# ------------------------------------------------------------------ Get maxrow
+
+sub getmaxrow {
+    my $safeeval=shift;
+    return $safeeval->reval('$maxrow');
+}
+
+# ---------------------------------------------------------------- Set filename
 
 sub setfilename {
     my ($safeeval,$fn)=@_;
     $safeeval->reval('$filename='.$fn.';');
 }
 
-# -------------------------------------------------------------------- Get type
+# ---------------------------------------------------------------- Get filename
 
 sub getfilename {
     my $safeeval=shift;
@@ -328,6 +395,51 @@ sub getfilename {
 # =============================================================================
 
 
+# --------------------------------------------- Produce output row n from sheet
+
+sub rown {
+    my ($safeeval,$n)=@_;
+    my $rowdata="\n<tr><td><b><font size=+1>$n</font></b></td>";
+    my $showf=0;
+    map {
+       my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
+       if ($showf==0) { $vl=$_; }
+       if ($showf>1) {
+	   if ($vl eq '') {
+	       $vl='<font size=+2 color=white>&#35;</font>';
+           }
+           $rowdata.=
+           '<td><a href="javascript:prompt('.$fm.');">'.$vl.
+	       '</a></td>';
+       } else {
+           $rowdata.='<td>&nbsp;'.$vl.'&nbsp;</td>';
+       }
+       $showf++;
+    } $safeeval->reval('&outrow('.$n.')');
+    return $rowdata.'</tr>';
+}
+
+# ------------------------------------------------------------- Print out sheet
+
+sub outsheet {
+    my $safeeval=shift;
+    my $tabledata='<table border=2><tr><td colspan=2>&nbsp;</td>';
+    map {
+        $tabledata.="<td><b><font size=+1>$_</font></b></td>";
+    } ('A<br>Import','B','C','D','E','F','G','H','I','J','K','L','M',
+       'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+       'a','b','c','d','e','f','g','h','i','j','k','l','m',
+       'n','o','p','q','r','s','t','u','v','w','x','y','z');
+    $tabledata.='</tr>';
+    my $row;
+    my $maxrow=&getmaxrow($safeeval);
+    for ($row=0;$row<=$maxrow;$row++) {
+        $tabledata.=&rown($safeeval,$row);
+    }
+    $tabledata.='</table>';
+}
+
+
 
 # --------------------------------------- Read spreadsheet formulas from a file
 
@@ -411,7 +523,7 @@ sub updaterows {
 			    '___'.$resid.'___'.
 			    &Apache::lonnet::declutter($srcf);
 		 $allassess{$symb}=$bighash{'title_'.$id};
-                 if ($stype eq 'assesssheet') {
+                 if ($stype eq 'assesscalc') {
                    map {
                        if ($_=~/^stores\_(.*)/) {
 			  my $key=$_;
@@ -437,45 +549,125 @@ sub updaterows {
 # -------------------- Find discrepancies between the course row table and this
 #
         my %f=&getformulas($safeeval);
+        my $changed=0;
+
+        my %current=();
+        if ($stype eq 'assesscalc') {
+	    %current=%allkeys;
+        } elsif ($stype eq 'studentcalc') {
+            %current=%allassess;
+        }
+
+        my $maxrow=0;
+        my %existing=();
+
+# ----------------------------------------------------------- Now obsolete rows
 	map {
-	    if ($_=~/^A/) {
-		if ($stype eq 'assesssheet') {
-                } elsif ($stype eq 'coursesheet') {
+	    if ($_=~/^A(\d+)/) {
+                $maxrow=($1>$maxrow)?$1:$maxrow;
+                $existing{$f{$_}}=1;
+		unless (defined($current{$f{$_}})) {
+		   $f{$_}='!!! Obsolete';
+                   $changed=1;
                 }
             }
         } keys %f;
-# ------------------------------------------------ Find new and obsolete values
+
+# -------------------------------------------------------- New and unknown keys
+     
+        map {
+            unless ($existing{$_}) {
+		$changed=1;
+                $maxrow++;
+                $f{'A'.$maxrow}=$_;
+            }
+        } keys %current;        
+     
+        if ($changed) { &setformulas($safeeval,%f); }
+
+        &setmaxrow($safeeval,$maxrow);
+        &setrowlabels($safeeval,%current);
 
     } else {
         return 'Could not access course data';
     }
 }
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------ Load data for one assessment
 
-sub handler {
+sub rowaassess {
+    my ($safeeval,$uname,$udom,$symb)=@_;
+    my $uhome=&Apache::lonnet::homeserver($uname,$udom);
+    my $namespace;
+    unless ($namespace=$ENV{'request.course.id'}) { return ''; }
+    my $answer=reply("restore:$udom:$uname:$namespace:$symb",$uhome);
+    my %returnhash=();
+    map {
+	my ($name,$value)=split(/\=/,$_);
+        $returnhash{&unescape($name)}=&unescape($value);
+    } split(/\&/,$answer);
+    my $version;
+    for ($version=1;$version<=$returnhash{'version'};$version++) {
+       map {
+          $returnhash{$_}=$returnhash{$version.':'.$_};
+       } split(/\:/,$returnhash{$version.':keys'});
+    }
 
-    my $r=shift;
+    my %c=();
+    my %f=&getformulas($safeeval);
+    map {
+	if ($_=~/^A/) {
+            unless ($f{$_}=~/^\!/) {
+	       $c{$_}=$returnhash{$f{$_}};
+	    }
+        }
+    } keys %f;
+    &setconstants($safeeval,%c);
+}
 
-  $r->content_type('text/html');
-  $r->send_http_header;
 
-  $r->print('<html><head><title>LON-CAPA Spreadsheet</title></head>');
-  $r->print('<body bgcolor="#FFFFFF">');
- 
-    my $sheetone=initsheet();
+sub handler {
+    my $r=shift;
 
-    &setformulas($sheetone,('A1' => '5', 'B2' => '6', 'C4' => 'A1+B2'));
-    $r->print(&calcsheet($sheetone));
-    my %output=&getformulas($sheetone);
-    
-    $r->print('FORM:'.$output{'A1'}.' '.$output{'B2'}.' '.$output{'C4'});
+   if ($r->header_only) {
+      $r->content_type('text/html');
+      $r->send_http_header;
+      return OK;
+   }
 
-    my %output=&getvalues($sheetone);
-    
-    $r->print('<br>OUT:'.$output{'A1'}.' '.$output{'B2'}.' '.$output{'C4'});
+# ----------------------------------------------------- Needs to be in a course
+
+  if (($ENV{'request.course.fn'}) || 
+      ($ENV{'request.state'} eq 'construct')) { 
+ 
+    $r->content_type('text/html');
+    $r->send_http_header;
 
+    $r->print('<html><head><title>LON-CAPA Spreadsheet</title></head>');
+    $r->print('<body bgcolor="#FFFFFF">');
+ 
+    my $sheetone=initsheet();
+    &setformulas($sheetone,
+   'B3' => 5, 'C4' => 6, 'C6' => 'B3+C4', 'C2' => 'C6+B5', 'B5'=>'&SUM("A*")',
+   'A1' => 'da1', 'A2'=>'da2', 'A3'=>'da3','A4'=>'da4','A5'=>'da5','A6'=>'da6',
+   'a1' => '28.7', 'a2' => 'C4+a1','G1'=>'&SUM("*25")');
+    &setrowlabels($sheetone,
+   'da1'=>'A Points','da2'=>'B Points','da3'=>'C Points',
+   'da4'=>'Percentage Correct','da5'=>'Bonus Points','da6'=>'Points Awarded');
+    &setconstants($sheetone,
+   'A1' => '3', 'A2'=>'4', 'A3'=>'0','A4'=>'76','A5'=>'1.5','A6'=>'6');
+   
+    &setmaxrow($sheetone,6);
+    &calcsheet($sheetone);
+    $r->print(&outsheet($sheetone));
     $r->print('</body></html>');
+
+  } else {
+# ----------------------------- Not in a course, or not allowed to modify parms
+      $ENV{'user.error.msg'}=
+        $r->uri.":opa:0:0:Cannot modify spreadsheet";
+      return HTTP_NOT_ACCEPTABLE; 
+  }
     return OK;
 }