--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/08 17:16:37	1.9
+++ loncom/interface/Attic/lonspreadsheet.pm	2000/12/09 19:14:20	1.10
@@ -1,11 +1,12 @@
 # The LearningOnline Network with CAPA
 # Spreadsheet/Grades Display Handler
 #
-# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,12/08 Gerd Kortemeyer
+# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,12/08,12/09 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
 use strict;
+use vars qw(%spreadsheets);
 use Safe;
 use Safe::Hole;
 use Opcode;
@@ -413,7 +414,7 @@ sub rown {
 	       $vl='<font size=+2 color='.$bgcolor.'>&#35;</font>';
            }
            $rowdata.=
-        '<td bgcolor='.$bgcolor.'><a href="javascript:prompt('.$fm.');">'.$vl.
+       '<td bgcolor='.$bgcolor.'><a href="javascript:celledit('.$fm.');">'.$vl.
 	       '</a></td>';
        } else {
            $rowdata.='<td bgcolor='.$bgcolor.'>&nbsp;'.$vl.'&nbsp;</td>';
@@ -454,15 +455,17 @@ sub readsheet {
     $fn=~/\.(\w+)/;
     &settype($safeeval,$1);
     my %f=();
-    my $content='';
-    {
-      my $fh;
-      if ($fh=Apache::File->new($fn)) {
-         $content=join('',<$fh>);
-      }
+    unless ($spreadsheets{$fn}) {
+       $spreadsheets{$fn}='';
+       {
+         my $fh;
+         if ($fh=Apache::File->new($fn)) {
+            $spreadsheets{$fn}=join('',<$fh>);
+         }
+       }
     }
     {
-      my $parser=HTML::TokeParser->new(\$content);
+      my $parser=HTML::TokeParser->new(\$spreadsheets{$fn});
       my $token;
       while ($token=$parser->get_token) {
          if ($token->[0] eq 'S') {
@@ -476,6 +479,41 @@ sub readsheet {
     &setformulas($safeeval,%f);
 }
 
+# ----------------------------------------------- Make a temp copy of the sheet
+
+sub tmpwrite {
+    my ($safeeval,$tmpdir,$uname,$udom,$symb)=@_;
+    my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval);
+    $fn=~s/\W/\_/g;
+    $fn=$tmpdir.$fn.'.tmp';
+    my $fh;
+    if ($fh=Apache::File->new('>'.$fn)) {
+	print $fh join("\n",&getformulas($safeeval));
+    }
+}
+
+# ---------------------------------------------------------- Read the temp copy
+
+sub tmpread {
+    my ($safeeval,$tmpdir,$uname,$udom,$symb,$nfield,$nform)=@_;
+    my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval);
+    $fn=~s/\W/\_/g;
+    $fn=$tmpdir.$fn.'.tmp';
+    my $fh;
+    my %fo=();
+    if ($fh=Apache::File->new($fn)) {
+        my $name;
+        while ($name=<$fh>) {
+	    chomp($name);
+            my $value=<$fh>;
+            chomp($value);
+            $fo{$name}=$value;
+        }
+    }
+    $fo{$nfield}=$nform;
+    &setformulas($safeeval,%fo);
+}
+
 # --------------------------------------------------------------- Read metadata
 
 sub readmeta {
@@ -635,6 +673,31 @@ sub rowaassess {
     &setconstants($safeeval,%c);
 }
 
+# --------------------------------------------------------- Various form fields
+
+sub textfield {
+    my ($title,$name,$value)=@_;
+    return "\n<p><b>$title:</b><br>".
+           '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
+}
+
+sub hiddenfield {
+    my ($name,$value)=@_;
+    return "\n".'<input type=hidden name="'.$name.'" value="'.$value.'">';
+}
+
+sub selectbox {
+    my ($title,$name,$value,%options)=@_;
+    my $selout="\n<p><b>$title:</b><br>".'<select name="'.$name.'">';
+    map {
+        $selout.='<option value="'.$_.'"';
+        if ($_ eq $value) { $selout.=' selected'; }
+        $selout.='>'.$options{$_}.'</option>';
+    } sort keys %options;
+    return $selout.'</select>';
+}
+
+# ---------------------------------------------------------------- Main handler
 
 sub handler {
     my $r=shift;
@@ -649,20 +712,74 @@ sub handler {
 
   if (($ENV{'request.course.fn'}) || 
       ($ENV{'request.state'} eq 'construct')) { 
- 
+
+# --------------------------- Get query string for limited number of parameters
+    map {
+       my ($name, $value) = split(/=/,$_);
+       $value =~ tr/+/ /;
+       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+       if (($name='uname') || ($name='udom') || ($name='usymb')) {
+           unless ($ENV{'form.'.$name}) {
+              $ENV{'form.'.$name}=$value;
+	   }
+       }
+    } (split(/&/,$ENV{'QUERY_STRING'}));
+
+# ------------------------------------------- Nothing there? Must be login user
+
+    unless ($ENV{'form.uname'}) {
+	$ENV{'form.uname'}=$ENV{'user.name'};
+        $ENV{'form.udom'}=$ENV{'user.domain'};
+    }
+# ------------------------------------------------------------------- Open page
+
     $r->content_type('text/html');
     $r->send_http_header;
 
-    $r->print('<html><head><title>LON-CAPA Spreadsheet</title></head>');
-    $r->print('<body bgcolor="#FFFFFF">');
- 
+    $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
+    $r->print(<<ENDSCRIPT);
+<script language="JavaScript">
+
+    function celledit(cn,cf) {
+        var cnf=prompt(cn,cf);
+	if (cnf!=null) {
+	    document.sheet.unewfield.value=cn;
+            document.sheet.unewformula.value=cnf;
+            document.sheet.submit();
+        }
+    }
+
+</script>
+ENDSCRIPT
+    $r->print('</head><body bgcolor="#FFFFFF">'.
+       '<form action="'.$r->uri.'" name=sheet method=post>'.
+       &hiddenfield('uname',$ENV{'form.uname'}).
+       &hiddenfield('udom',$ENV{'form.udom'}).
+       &hiddenfield('usymb',$ENV{'form.usymb'}).
+       &hiddenfield('unewfield','').
+       &hiddenfield('unewformula',''));
     my $sheetone=initsheet();
-    &readsheet($sheetone,$r->filename);
+    if ($ENV{'form.unewfield'}) {
+        $r->print('<h2>Modified Workcopy</h2>');
+        $ENV{'form.unewformula'}=~s/\'/\"/g;
+        $r->print('New formula: '.$ENV{'form.unewfield'}.'='.
+                  $ENV{'form.unewformula'}.'<br>');
+	&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',
+                 $ENV{'form.uname'},$ENV{'form.udom'},$ENV{'form.usymb'},
+                 $ENV{'form.unewfield'},$ENV{'form.unewformula'});
+        &setfilename($sheetone,$r->filename);
+        $r->filename=~/\.(\w+)/;
+        &settype($sheetone,$1);
+   } else {
+        &readsheet($sheetone,$r->filename);
+    }
     &updaterows($sheetone);
+    &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/',
+              $ENV{'form.uname'},$ENV{'form.udom'},$ENV{'form.usymb'});
     &calcsheet($sheetone);
     $r->print(&outsheet($sheetone));
 
-    $r->print('</body></html>');
+    $r->print('</form></body></html>');
 
   } else {
 # ----------------------------- Not in a course, or not allowed to modify parms