--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/06 14:50:47 1.6
+++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/06 23:23:38 1.7
@@ -10,7 +10,7 @@ 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;
@@ -48,20 +48,25 @@ $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 '*')) {
@@ -83,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) {
@@ -105,7 +112,9 @@ sub mask {
}
$num.=')';
} else {
- $num.='['.$lda[$#lda].'-'.$uda[$#uda].']';
+ if ($lda[$#lda]!=$uda[$#uda]) {
+ $num.='['.$lda[$#lda].'-'.$uda[$#uda].']';
+ }
}
}
}
@@ -242,8 +251,8 @@ sub sett {
}
} else {
$t{$_}=$f{$_};
- $t{$_}=~s/\.+/\,/g;
- $t{$_}=~s/(^|[^\"\'])([A-Z]\d+)/$1\$v\{\'$2\'\}/g;
+ $t{$_}=~s/\.\.+/\,/g;
+ $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
}
}
} keys %f;
@@ -287,7 +296,9 @@ sub outrow {
$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');
+ '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;
}
@@ -416,7 +427,9 @@ sub outsheet {
map {
$tabledata.="| $_ | ";
} ('A
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');
+ '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.='';
my $row;
my $maxrow=&getmaxrow($safeeval);
@@ -614,22 +627,33 @@ sub rowaassess {
sub handler {
-
my $r=shift;
- $r->content_type('text/html');
- $r->send_http_header;
+ if ($r->header_only) {
+ $r->content_type('text/html');
+ $r->send_http_header;
+ return OK;
+ }
+
+# ----------------------------------------------------- Needs to be in a course
- $r->print('LON-CAPA Spreadsheet');
- $r->print('');
+ if (($ENV{'request.course.fn'}) ||
+ ($ENV{'request.state'} eq 'construct')) {
+
+ $r->content_type('text/html');
+ $r->send_http_header;
+
+ $r->print('LON-CAPA Spreadsheet');
+ $r->print('');
my $sheetone=initsheet();
&setformulas($sheetone,
'B3' => 5, 'C4' => 6, 'C6' => 'B3+C4', 'C2' => 'C6+B5', 'B5'=>'&SUM("A*")',
- 'A1' => 'a1', 'A2'=>'a2', 'A3'=>'a3','A4'=>'a4','A5'=>'a5','A6'=>'a6');
+ 'A1' => 'da1', 'A2'=>'da2', 'A3'=>'da3','A4'=>'da4','A5'=>'da5','A6'=>'da6',
+ 'a1' => '28.7', 'a2' => 'C4+a1','G1'=>'&SUM("*25")');
&setrowlabels($sheetone,
- 'a1'=>'A Points','a2'=>'B Points','a3'=>'C Points',
- 'a4'=>'Percentage Correct','a5'=>'Bonus Points','a6'=>'Points Awarded');
+ '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');
@@ -637,6 +661,13 @@ sub handler {
&calcsheet($sheetone);
$r->print(&outsheet($sheetone));
$r->print('');
+
+ } 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;
}