loncom/interface/lonspreadsheet.pm - diff

Return to lonspreadsheet.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/Attic/lonspreadsheet.pm between versions 1.18 and 1.20

version 1.18, 2000/12/18 17:14:49	version 1.20, 2000/12/30 17:13:54
Line 2	Line 2
# Spreadsheet/Grades Display Handler	# Spreadsheet/Grades Display Handler
#	#
# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,	# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,
# 12/08,12/09,12/11,12/12,12/15,12/16,12/18 Gerd Kortemeyer	# 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30 Gerd Kortemeyer

package Apache::lonspreadsheet;	package Apache::lonspreadsheet;

Line 12 use Safe::Hole;	Line 12 use Safe::Hole;
use Opcode;	use Opcode;
use Apache::lonnet;	use Apache::lonnet;
use Apache::Constants qw(:common :http);	use Apache::Constants qw(:common :http);
use HTML::TokeParser;
use GDBM_File;	use GDBM_File;
	use HTML::TokeParser;

#	#
# These cache hashes need to be independent of user, resource and course	# These cache hashes need to be independent of user, resource and course
Line 267 sub sett {	Line 267 sub sett {
$pattern='[A-Z]';	$pattern='[A-Z]';
}	}
map {	map {
if ($f{$_}) {	if ($_=~/template\_(\w)/) {
	my $col=$1;
	unless ($col=~/^$pattern/) {
	map {
	if ($_=~/A(\d+)/) {
	my $trow=$1;
	if ($trow) {
	my $lb=$col.$trow;
	$t{$lb}=$f{'template_'.$col};
	$t{$lb}=~s/\#/$trow/g;
	$t{$lb}=~s/\.\.+/\,/g;
	$t{$lb}=~s/(^\|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
	}
	}
	} keys %f;
	}
	}
	} keys %f;
	map {
	if (($f{$_}) && ($_!~/template\_/)) {
if ($_=~/^$pattern/) {	if ($_=~/^$pattern/) {
unless ($f{$_}=~/^\!/) {	unless ($f{$_}=~/^\!/) {
$t{$_}=$c{$_};	$t{$_}=$c{$_};
Line 541 sub outsheet {	Line 560 sub outsheet {



# --------------------------------------- Read spreadsheet formulas from a file	# ------------------------------------- Read spreadsheet formulas from a course

sub readsheet {	sub readsheet {
my ($safeeval,$fn)=@_;	my ($safeeval,$fn,$r)=@_;
&setfilename($safeeval,$fn);
$fn=~/\.(\w+)/;
&settype($safeeval,$1);
my %f=();	my %f=();
unless ($spreadsheets{$fn}) {	unless ($fn) {
$spreadsheets{$fn}='';	my $sheetxml='';
{	{
my $fh;	my $fh;
if ($fh=Apache::File->new($fn)) {	if ($fh=Apache::File->new($r->dir_config('lonIncludes').
$spreadsheets{$fn}=join('',<$fh>);	'/default.'.&gettype($safeeval))) {
}	$sheetxml=join('',<$fh>);
	}
}	}
	my $parser=HTML::TokeParser->new(\$sheetxml);
	my $token;
	while ($token=$parser->get_token) {
	if ($token->[0] eq 'S') {
	if ($token->[1] eq 'field') {
	$f{$token->[2]->{'col'}.$token->[2]->{'row'}}=
	$parser->get_text('/field');
	}
	if ($token->[1] eq 'template') {
	$f{'template_'.$token->[2]->{'col'}}=
	$parser->get_text('/template');
	}
	}
	}
	&setfilename($safeeval,'default_'.&gettype($safeeval));
	} else {
	&setfilename($safeeval,$fn);
	unless ($spreadsheets{$fn}) {
	$spreadsheets{$fn}='';
	my $reply=&Apache::lonnet::reply('dump:'.
	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
	$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.$fn,
	$ENV{'course.'.$ENV{'request.course.id'}.'.home'});
	unless ($reply=~/^error\:/) {
	$spreadsheets{$fn}=$reply;
	}
	}
	map {
	my ($name,$value)=split(/\=/,$_);
	$f{&Apache::lonnet::unescape($name)}=
	&Apache::lonnet::unescape($value);
	} split(/\&/,$spreadsheets{$fn});
}	}
{
my $parser=HTML::TokeParser->new(\$spreadsheets{$fn});
my $token;
while ($token=$parser->get_token) {
if ($token->[0] eq 'S') {
if ($token->[1] eq 'field') {
$f{$token->[2]->{'col'}.$token->[2]->{'row'}}=
$parser->get_text('/field');
}
}
}
}
&setformulas($safeeval,%f);	&setformulas($safeeval,%f);
}	}

	# ------------------------------------------------------------ Save spreadsheet

	sub writesheet {
	my $safeeval=shift;
	if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
	my %f=&getformulas($safeeval);
	my $sheetdata='';
	map {
	$sheetdata.=&Apache::lonnet::escape($_).'='.
	&Apache::lonnet::escape($f{$_}).'&';
	} keys %f;
	$sheetdata=~s/\&$//;
	my $reply=&Apache::lonnet::reply('put:'.
	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
	$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.
	&getfilename($safeeval).':'.
	$sheetdata,
	$ENV{'course.'.$ENV{'request.course.id'}.'.home'});
	}
	}

# ----------------------------------------------- Make a temp copy of the sheet	# ----------------------------------------------- Make a temp copy of the sheet

sub tmpwrite {	sub tmpwrite {
Line 981 sub handler {	Line 1040 sub handler {
my ($name, $value) = split(/=/,$_);	my ($name, $value) = split(/=/,$_);
$value =~ tr/+/ /;	$value =~ tr/+/ /;
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;	$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')) {	if (($name eq 'uname') \|\| ($name eq 'udom') \|\|
	($name eq 'usymb') \|\| ($name eq 'ufn')) {
unless ($ENV{'form.'.$name}) {	unless ($ENV{'form.'.$name}) {
$ENV{'form.'.$name}=$value;	$ENV{'form.'.$name}=$value;
}	}
Line 989 sub handler {	Line 1049 sub handler {
} (split(/&/,$ENV{'QUERY_STRING'}));	} (split(/&/,$ENV{'QUERY_STRING'}));

# ------------------------------------------- Nothing there? Must be login user	# ------------------------------------------- Nothing there? Must be login user

unless ($ENV{'form.uname'}) {	unless ($ENV{'form.uname'}) {
$uname=$ENV{'user.name'};	$uname=$ENV{'user.name'};
$udom=$ENV{'user.domain'};	$udom=$ENV{'user.domain'};
Line 1031 ENDSCRIPT	Line 1090 ENDSCRIPT
&hiddenfield('uname',$ENV{'form.uname'}).	&hiddenfield('uname',$ENV{'form.uname'}).
&hiddenfield('udom',$ENV{'form.udom'}).	&hiddenfield('udom',$ENV{'form.udom'}).
&hiddenfield('usymb',$ENV{'form.usymb'}).	&hiddenfield('usymb',$ENV{'form.usymb'}).
	&hiddenfield('ufn',$ENV{'form.ufn'}).
&hiddenfield('unewfield','').	&hiddenfield('unewfield','').
&hiddenfield('unewformula',''));	&hiddenfield('unewformula',''));
}	}
Line 1038 ENDSCRIPT	Line 1098 ENDSCRIPT
# ---------------------------------------- Read new sheet or modified worksheet	# ---------------------------------------- Read new sheet or modified worksheet

my $sheetone=initsheet();	my $sheetone=initsheet();
	$r->uri=~/\/(\w+)$/;
	&settype($sheetone,$1);
if ($ENV{'form.unewfield'}) {	if ($ENV{'form.unewfield'}) {
$r->print('<h2>Modified Workcopy</h2>');	$r->print('<h2>Modified Workcopy</h2>');
$ENV{'form.unewformula'}=~s/\'/\"/g;	$ENV{'form.unewformula'}=~s/\'/\"/g;
$r->print('New formula: '.$ENV{'form.unewfield'}.'='.	$r->print('New formula: '.$ENV{'form.unewfield'}.'='.
$ENV{'form.unewformula'}.'<br>');	$ENV{'form.unewformula'}.'<br>');
&setfilename($sheetone,$r->filename);	&setfilename($sheetone,$ENV{'form.ufn'});
$r->filename=~/\.(\w+)/;
&settype($sheetone,$1);
&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',	&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',
$ENV{'form.usymb'},	$ENV{'form.usymb'},
$ENV{'form.unewfield'},$ENV{'form.unewformula'});	$ENV{'form.unewfield'},$ENV{'form.unewformula'});
} else {	} else {
&readsheet($sheetone,$r->filename);	&readsheet($sheetone,$ENV{'form.ufn'},$r);
}	}

# --------------------------------------------- See if all import rows uptodate	# --------------------------------------------- See if all import rows uptodate

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.18
changed lines
	Added in v.1.20