From KILKISBI@wattsind.com Mon Apr 7 16:04:48 2003
From: KILKISBI@wattsind.com (Kilkis, Birol I.)
Date: Mon, 7 Apr 2003 11:04:48 -0400
Subject: [LON-CAPA-cvs] MIME coded data
Message-ID: <750A7AC5DCCAD4119FF800306E00646302E970EE@and998nts.wattsind.com>
This message is in MIME format. Since your mail reader does not understand
this format, some or all of this message may not be legible.
------_=_NextPart_001_01C2FD17.080CD8D0
Content-Type: text/plain;
charset="iso-8859-1"
Dear Matthew,Is there a way to get the following data without MIME encoding?
is a MIME encoded message --matthew1026420578 Content-Type: text/plain
matthew Thu Jul 11 16:49:38 2002 EDT Added files: /loncom/thesaurus
rawkey.txt Log: BIG list of metadata keywords. --matthew1026420578
Content-Type: text/plain Content-Disposition: attachment;
filename="matthew-20020711164938.txt" Index: loncom/thesaurus/rawkey.txt +++
loncom/thesaurus/rawkey.txt board,diver,diving,torque
Sincerely yours,
Prof. Dr. Birol I.. Kilkis
------_=_NextPart_001_01C2FD17.080CD8D0
Content-Type: text/html;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME coded data
Dear Matthew,Is there a way to get the =
following data without MIME encoding?
is a MIME encoded message =
--matthew1026420578 Content-Type: text/plain matthew Thu Jul 11 =
16:49:38 2002 EDT Added files: /loncom/thesaurus rawkey.txt Log: BIG =
list of metadata keywords. --matthew1026420578 Content-Type: text/plain =
Content-Disposition: attachment; =
filename=3D"matthew-20020711164938.txt" Index: =
loncom/thesaurus/rawkey.txt +++ loncom/thesaurus/rawkey.txt =
board,diver,diving,torque
Sincerely yours,
Prof. Dr. Birol I.. Kilkis
------_=_NextPart_001_01C2FD17.080CD8D0--
From lon-capa-cvs@mail.lon-capa.org Mon Apr 7 18:37:09 2003
From: lon-capa-cvs@mail.lon-capa.org (www)
Date: Mon, 07 Apr 2003 17:37:09 -0000
Subject: [LON-CAPA-cvs] cvs: modules /gerd/blackboard 0004.jpg 0005.gif 0006.gif 0007.jpg 0008.gif 0009.gif 0010.gif 0011.gif 0013.gif 0014.md 0015.pool 0017.md 0018.course Blackboard.md Comments IMS.md export_Translationpool for /gerd/blackboard/META-INF MANIFEST.IMS
Message-ID:
This is a MIME encoded message
--www1049737029
Content-Type: text/plain
www Mon Apr 7 13:37:09 2003 EDT
Added files:
/modules/gerd/blackboard 0004.jpg 0005.gif 0006.gif 0007.jpg
0008.gif 0009.gif 0010.gif 0011.gif
0013.gif 0014.md 0015.pool 0017.md
0018.course Blackboard.md
export_Translationpool IMS.md
/modules/gerd/blackboard/META-INF MANIFEST.IMS
Modified files:
/modules/gerd/blackboard Comments for
Log:
BlackBoard Sample Course Export Data
--www1049737029
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20030407133709.txt"
Index: modules/gerd/blackboard/0014.md
+++ modules/gerd/blackboard/0014.md
Translation poolA pool containing questions of all types for use in exploring translation of Courseinfo pools to other systems
Index: modules/gerd/blackboard/0015.pool
+++ modules/gerd/blackboard/0015.pool
Translation poolA pool containing questions of all types for use in exploring translation of Courseinfo pools to other systemsDescribe the most recent glacial episode in the last Great Ice Age, and explain briefly how it affected the American midwest.The most recent glacial in the last Great Ice Age reached its peak about 20,000 years ago.
The Laurentide ice sheet covered much of Canada and the American midwest as far south as
Illinois and Ohio. The Cordilleran ice sheet in the western US covered western Canada and the
northwestern US. In addition in North America there were smaller ice bodies, called ice caps
in the Rocky Mountains, and the Sierra Nevada. Elsewhere ice caps existed in the Andes in
South America and in the Himalayas in Asia. Sea level was about 150 meters lower than today
and broad expanses of the continental; shelves were exposed along the eastern continental
margin of the US. Pollen data indicate that spruce trees, which prefer cooler climates grew in
what is now Alabama and Georgia during the last glacial maximum, and migrated northwards
to Canada during the present interglacial.
The most recent glacial ended about 14,000 years ago when our present interglacial began.
Although the period 14,000 years to the present has been a period of general warming there
have been occasional reversals to colder conditions. The younger Dryas cold period that
occurred about 10,000 years ago is thought to have been the result of a temporary change in
ocean circulation caused by the large volumes of fresh water arriving in the North Atlantic from
melting of the retreating Laurentide ice sheet. Even more recently, the Little Ice age was a
period of colder temperatures in northern Europe between the 15th and 19th centuries, split into
two segments by a warm period in the 17th century.
The Laurentide ice sheet covered Michigan during the last glacial maximum. The present
surface coverage of drift which blankets the lower peninsular owes its origins to the last glacial
period. Retreat of the ice left behind a number of depositional landforms. There are abundant
kettle lakes, eskers and moraines. Terminal moraines were formed after the glacial maximum
when the ice had retreated from its maximum extent south of Michigan. Retreat was punctuated
by minor readvances, and the large number of terminal moraines allow reconstruction of the
direction of ice flow in Michigan during this time. The Great Lakes themselves were the
product of deepening of pre-existing valleys by glacial action. The lakes only achieved their
present configuration relatively recently. Water levels and the locations of shorelines changed
considerably during the period following ice retreat. Locations of outflows from the lakes
changed as the elevation of the land was modified by a process known as isostatic rebound.
Whenever the lithosphere is loaded with a large load, such as a big ice sheet, it is depressed.
When the load is removed the lithosphere slowly rebounds to its former position. Depression
and rebound are possible because beneath the lithosphere is the weaker asthenosphere which
can flow. In the same way that a heavily laden boat sits lower in the water, so ice-covered
lithosphere sinks and asthenosphere flows out from underneath it to accommodate the sinking.
The asthenosphere flows back underneath it when the load is removed. The effects of the last
glacial are still evident from changes in elevation across the northern hemisphere. Areas
previously loaded with ice such as the Canadian shield (Ontario, Quebec, Manitoba) and
Scandinavia are now rising. Areas to the south (e.g., Holland) which previously were uplifted
by the displaced aesthenosphere flowing into them are now sinking as the asthenosphere
returns northwards. Michigan is now no longer rising, and neither is it sinking. Areas to the
south are sinking somewhat and the Canadian shield is rising somewhat (at a maximum rate of
1 cm/yr.).The number of officially recognised Great Lakes is ...5FivefiveFIVEThere are 5 Great Lakes:
Lake Superior
Lake Ontario
Lake Michigan
Lake Erie
Lake HuronThe total number of Great lakes is 5.5FivefiveFIVEWhich of the following are considered to be Great Lakes?Lake MichiganLake HuronLake SuperiorLake ChamplainLake CuyahogaLake BaikalThere are 5 Great Lakes:
Michigan, Huron, Superior, Ontario and ErieAlthough Lake Champlain and Lake Cuyahoga are in the northeastern US they are not considered "Great Lakes". Lake Baikal is in Siberia.Each of the following states has shoreline on only one of the Great Lakes. Match the state to the lake.MinnesotaIllinoisIndianaPennsylvaniaOhioLake OntarioLake MichiganLake SuperiorLake ErieLake HuronLake Superior borders:
Minnesota, Wisconsin, Michigan and Ontario
Lake Michigan borders:
Wisconsin, Illinois, Indiana and Michigan
Lake Huron borders:
Michigan and Ontario
Lake Erie borders:
Ohio, Michigan, Pennsylvnia, New York and Ontario
Lake Ontario borders:
New York, OntarioYour answers will be chosen from:
Lake Michigan (Illinois & Indiana); Lake Superior (Minnesota), and Lake Erie (Pennsylvania and Ohio).The deepest of the Great Lakes is ...Lake MichiganLake HuronLake SuperiorLake EriesLake Superior is the deepest of the Great Lakes.
Maximum depths are as follows:
Superior: 406.3 m
Michigan: 281.3 m
Ontario: 244.45
Huron: 228.6 m
Erie: 64 mThe deepest of the Great Lakes is: Lake Superior.
Average depths are:
Superior: 146.3 m
Ontario: 86.26 m
Michigan: 85.04 m
Huron: 59.44 m
Erie: 19.9 mList the following states in order from highest to lowest by the number of Great Lakes on which they have shoreline.WisconsinIndianaVermontMichiganMichigan has shoreline on 4 lakes (Superior, Michigan, Huron and Erie)
Wisconsin has shoreline on 2 Great Lakes (Superior and Michigan)
Indiana has shoreline on 1 Great Lake (Michigan)
Vermont does not have shoreline on any of the Great Lakes (although it does have shoreline on Lake Champlain).The correct order is:
Michigan
Wisconsin
Indiana
VermontThe Great Lakes were formed as a result of deepening of existing depressions due to glacial action during the last ice age.FALSETRUEAlthough the Great Lakes did not reach their current configuration and drainage patterns until about 4000 years ago, the depressions now occupied by the lakes were formed by deepening of existing valleys during movement of the Laurentide ice sheet during the last Ice Age which ended about 10,000 years ago.The Great Lakes were indeed formed during the last ice age. There were a number of precursor lakes during the retreat of the Laurentide ice sheet (e.g., Lake Chicago and Lake Algonquin), but the work of deepening existing valleys to create the depressions that noew hold the Great Lakes occurred as a result of movement of the Laurentide ice sheet.
Index: modules/gerd/blackboard/0017.md
+++ modules/gerd/blackboard/0017.md
Testing Blackboard v. 4.11Testing onlyEducationOnline Teaching and Learning
Index: modules/gerd/blackboard/0018.course
+++ modules/gerd/blackboard/0018.course
Testing Blackboard v. 4.11Testing only
Index: modules/gerd/blackboard/Blackboard.md
+++ modules/gerd/blackboard/Blackboard.md
Index: modules/gerd/blackboard/IMS.md
+++ modules/gerd/blackboard/IMS.md
Index: modules/gerd/blackboard/META-INF/MANIFEST.IMS
+++ modules/gerd/blackboard/META-INF/MANIFEST.IMS
--www1049737029--
From lon-capa-cvs@mail.lon-capa.org Mon Apr 7 19:19:23 2003
From: lon-capa-cvs@mail.lon-capa.org (albertel)
Date: Mon, 07 Apr 2003 18:19:23 -0000
Subject: [LON-CAPA-cvs] cvs: loncom / loncron
Message-ID:
albertel Mon Apr 7 14:19:23 2003 EDT
Modified files:
/loncom loncron
Log:
- allow for larger log files, as things have gotten more noisy
Index: loncom/loncron
diff -u loncom/loncron:1.37 loncom/loncron:1.38
--- loncom/loncron:1.37 Mon Mar 10 12:39:21 2003
+++ loncom/loncron Mon Apr 7 14:19:23 2003
@@ -403,7 +403,7 @@
$atime,$mtime,$ctime,
$blksize,$blocks)=stat($fname);
- if ($size>40000) {
+ if ($size>200000) {
print $fh "Rotating logs ...
";
rename("$fname.2","$fname.3");
rename("$fname.1","$fname.2");
From lon-capa-cvs@mail.lon-capa.org Mon Apr 7 19:24:05 2003
From: lon-capa-cvs@mail.lon-capa.org (www)
Date: Mon, 07 Apr 2003 18:24:05 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /auth lonauth.pm lonroles.pm
Message-ID:
www Mon Apr 7 14:24:05 2003 EDT
Modified files:
/loncom/auth lonauth.pm lonroles.pm
Log:
New environment variable $ENV{'request.role.adv'} to check if the *current*
role is advanced.
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.47 loncom/auth/lonauth.pm:1.48
--- loncom/auth/lonauth.pm:1.47 Thu Apr 3 11:50:46 2003
+++ loncom/auth/lonauth.pm Mon Apr 7 14:24:05 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonauth.pm,v 1.47 2003/04/03 16:50:46 www Exp $
+# $Id: lonauth.pm,v 1.48 2003/04/07 18:24:05 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -130,6 +130,7 @@
print $idf "request.course.uri=\n";
print $idf "request.course.sec=\n";
print $idf "request.role=cm\n";
+ print $idf "request.role.adv=$ENV{'user.adv'}\n";
print $idf "request.host=$ENV{'REMOTE_ADDR'}\n";
if ($FORM{'interface'}) {
$FORM{'interface'}=~s/\W//gs;
@@ -147,6 +148,7 @@
$idf->close();
}
$ENV{'request.role'}='cm';
+ $ENV{'request.role.adv'}=$ENV{'user.adv'};
$ENV{'browser.type'}=$clientbrowser;
# -------------------------------------------------------------------- Log this
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.55 loncom/auth/lonroles.pm:1.56
--- loncom/auth/lonroles.pm:1.55 Mon Mar 24 13:46:44 2003
+++ loncom/auth/lonroles.pm Mon Apr 7 14:24:05 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.55 2003/03/24 18:46:44 albertel Exp $
+# $Id: lonroles.pm,v 1.56 2003/04/07 18:24:05 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -72,6 +72,7 @@
"request.course.uri" => '',
"request.course.sec" => '',
"request.role" => 'cm',
+ "request.role.adv" => $ENV{'user.adv'},
"request.role.domain" => $ENV{'user.domain'});
foreach $envkey (keys %ENV) {
next if ($envkey!~/^user\.role\./);
@@ -129,9 +130,15 @@
}
}
}
- &Apache::lonnet::appenv('request.role' => $trolecode,
- 'request.role.domain' => $cdom,
- 'request.course.sec' => $csec);
+ my $tadv=0;
+ if (($trolecode!~/^st/) &&
+ ($trolecode!~/^ta/) &&
+ ($trolecode!~/^cm/)) { $tadv=1; }
+ &Apache::lonnet::appenv(
+ 'request.role' => $trolecode,
+ 'request.role.adv' => $tadv,
+ 'request.role.domain' => $cdom,
+ 'request.course.sec' => $csec);
my $msg='Entering course ...';
if (($cnum) && ($role ne 'ca')) {
my ($furl,$ferr)=
From lon-capa-cvs@mail.lon-capa.org Mon Apr 7 21:47:06 2003
From: lon-capa-cvs@mail.lon-capa.org (www)
Date: Mon, 07 Apr 2003 20:47:06 -0000
Subject: [LON-CAPA-cvs] cvs: rat / lonratedt.pm lonsequence.pm
Message-ID:
www Mon Apr 7 16:47:06 2003 EDT
Modified files:
/rat lonratedt.pm lonsequence.pm
Log:
Bug #1354 - show warning if it was not possible to show map in linear order.
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.43 rat/lonratedt.pm:1.44
--- rat/lonratedt.pm:1.43 Wed Jan 22 12:25:03 2003
+++ rat/lonratedt.pm Mon Apr 7 16:47:06 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.43 2003/01/22 17:25:03 www Exp $
+# $Id: lonratedt.pm,v 1.44 2003/04/07 20:47:06 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -913,6 +913,9 @@
}
my $idx=0;
$r->print('
'.$url.'
');
+ if ($adv) {
+ $r->print('
Map contents are not shown in order.
');
+ }
foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
if (defined($_)) {
$idx++;
Index: rat/lonsequence.pm
diff -u rat/lonsequence.pm:1.14 rat/lonsequence.pm:1.15
--- rat/lonsequence.pm:1.14 Fri Aug 30 20:43:13 2002
+++ rat/lonsequence.pm Mon Apr 7 16:47:06 2003
@@ -2,7 +2,7 @@
#
# Sequence Handler
#
-# $Id: lonsequence.pm,v 1.14 2002/08/31 00:43:13 www Exp $
+# $Id: lonsequence.pm,v 1.15 2003/04/07 20:47:06 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -62,6 +62,16 @@
}
}
+sub mapread {
+ my $fn=shift;
+ &Apache::lonnet::repcopy($fn);
+ if (-e $fn) {
+ return &Apache::lonratedt::mapread($fn,'');
+ } else {
+ return ();
+ }
+}
+
# ---------------------------------------------------------------- View Handler
sub viewmap {
@@ -152,6 +162,10 @@
}
}
# ----------------------------- successtied is now '1' if in working selectmode
+ my ($errtext,$fatal)=&mapread(&Apache::lonnet::filelocation('',$url),'');
+ if ($fatal==1) {
+ $r->print('
Map contents are not shown in order.
');
+ }
my $idx=0;
foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
if (defined($_)) {
From lon-capa-cvs@mail.lon-capa.org Mon Apr 7 21:52:58 2003
From: lon-capa-cvs@mail.lon-capa.org (albertel)
Date: Mon, 07 Apr 2003 20:52:58 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /homework inputtags.pm
Message-ID:
albertel Mon Apr 7 16:52:58 2003 EDT
Modified files:
/loncom/homework inputtags.pm
Log:
- striving for a cleaner, leaner data storage
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.86 loncom/homework/inputtags.pm:1.87
--- loncom/homework/inputtags.pm:1.86 Wed Apr 2 14:51:24 2003
+++ loncom/homework/inputtags.pm Mon Apr 7 16:52:58 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.86 2003/04/02 19:51:24 sakharuk Exp $
+# $Id: inputtags.pm,v 1.87 2003/04/07 20:52:58 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -340,6 +340,16 @@
return ($button,$message,$previousmsg);
}
+sub remove_alldata {
+ my ($id)=@_;
+ foreach my $key (keys(%Apache::lonhomework::results)) {
+ if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) {
+ &Apache::lonxml::debug("Removing $key");
+ delete($Apache::lonhomework::results{$key});
+ }
+ }
+}
+
sub setgradedata {
my ($award,$id,$previously_used) = @_;
# if the student already has it correct, don't modify the status
@@ -372,7 +382,9 @@
} elsif ( $award eq 'DRAFT' ) {
$Apache::lonhomework::results{"resource.$id.solved"} = '';
} elsif ( $award eq 'NO_RESPONSE' ) {
- return '';
+ #no real response so delete any data that got stored
+ &removealldata($id);
+ return '';
} else {
$Apache::lonhomework::results{"resource.$id.solved"} =
'incorrect_attempted';
@@ -386,12 +398,7 @@
} elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
#delete all data as they student didn't do anything, but save
#the list of collaborators.
- foreach my $key (keys(%Apache::lonhomework::results)) {
- if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
- &Apache::lonxml::debug("Removing $key");
- delete($Apache::lonhomework::results{$key});
- }
- }
+ &removealldata($id);
#and since they didn't do anything we were never here
return '';
} else {
@@ -400,12 +407,7 @@
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
/^correct/ ) {
#delete all data as they student already has it correct
- foreach my $key (keys(%Apache::lonhomework::results)) {
- if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
- &Apache::lonxml::debug("Removing $key");
- delete($Apache::lonhomework::results{$key});
- }
- }
+ &removealldata($id);
#and since they didn't do anything we were never here
return '';
}
From lon-capa-cvs@mail.lon-capa.org Mon Apr 7 23:18:11 2003
From: lon-capa-cvs@mail.lon-capa.org (albertel)
Date: Mon, 07 Apr 2003 22:18:11 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /homework inputtags.pm
Message-ID:
albertel Mon Apr 7 18:18:11 2003 EDT
Modified files:
/loncom/homework inputtags.pm
Log:
- I can type
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.87 loncom/homework/inputtags.pm:1.88
--- loncom/homework/inputtags.pm:1.87 Mon Apr 7 16:52:58 2003
+++ loncom/homework/inputtags.pm Mon Apr 7 18:18:11 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.87 2003/04/07 20:52:58 albertel Exp $
+# $Id: inputtags.pm,v 1.88 2003/04/07 22:18:11 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -340,7 +340,7 @@
return ($button,$message,$previousmsg);
}
-sub remove_alldata {
+sub removealldata {
my ($id)=@_;
foreach my $key (keys(%Apache::lonhomework::results)) {
if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) {
From lon-capa-cvs@mail.lon-capa.org Mon Apr 7 23:28:08 2003
From: lon-capa-cvs@mail.lon-capa.org (albertel)
Date: Mon, 07 Apr 2003 22:28:08 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /homework optionresponse.pm radiobuttonresponse.pm /xml lonxml.pm
Message-ID:
albertel Mon Apr 7 18:28:08 2003 EDT
Modified files:
/loncom/homework radiobuttonresponse.pm optionresponse.pm
/loncom/xml lonxml.pm
Log:
- better handling of counters
- always increment the counters for modes with output
- option/radiobutton responses now use new method for getting current response
supporting scantron mode
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.66 loncom/homework/radiobuttonresponse.pm:1.67
--- loncom/homework/radiobuttonresponse.pm:1.66 Fri Apr 4 18:37:04 2003
+++ loncom/homework/radiobuttonresponse.pm Mon Apr 7 18:28:08 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.66 2003/04/04 23:37:04 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.67 2003/04/07 22:28:08 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -169,9 +169,7 @@
}
}
}
- if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
- &Apache::lonxml::increment_counter();
- }
+ &Apache::lonxml::increment_counter();
return $result;
}
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.73 loncom/homework/optionresponse.pm:1.74
--- loncom/homework/optionresponse.pm:1.73 Wed Apr 2 13:40:37 2003
+++ loncom/homework/optionresponse.pm Mon Apr 7 18:28:08 2003
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.73 2003/04/02 18:40:37 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.74 2003/04/07 22:28:08 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -185,7 +185,10 @@
my $wrong=0;
my $ignored=0;
foreach $name (@whichopt) {
- my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
+ my $response=&Apache::response::getresponse($temp);
+ if ($ENV{'form.submitted'} eq 'scantron') {
+ $response = $opt[$response];
+ }
$responsehash{$name}=$response;
if ( $response =~ /[^\s]/) {
my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -227,10 +230,13 @@
&Apache::response::handle_previous(\%previous,$ad);
}
}
+ &Apache::lonxml::increment_counter(&getfoilcounts($max));
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
- }
- if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {$result .= '\end{enumerate}';}
+ }
+ if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
+ $result .= '\end{enumerate}';
+ }
return $result;
}
@@ -505,7 +511,6 @@
}
}
- &Apache::lonxml::increment_counter();
return $result;
}
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.246 loncom/xml/lonxml.pm:1.247
--- loncom/xml/lonxml.pm:1.246 Thu Apr 3 17:34:26 2003
+++ loncom/xml/lonxml.pm Mon Apr 7 18:28:08 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.246 2003/04/03 22:34:26 albertel Exp $
+# $Id: lonxml.pm,v 1.247 2003/04/07 22:28:08 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -898,18 +898,23 @@
}
sub increment_counter {
- $Apache::lonxml::counter++;
+ my ($increment) = @_;
+ if (defined($increment) && $increment gt 0) {
+ $Apache::lonxml::counter+=$increment;
+ } else {
+ $Apache::lonxml::counter++;
+ }
$Apache::lonxml::counter_changed=1;
}
sub init_counter {
if (defined($ENV{'form.counter'})) {
$Apache::lonxml::counter=$ENV{'form.counter'};
+ $Apache::lonxml::counter_changed=0;
} else {
$Apache::lonxml::counter=1;
- &store_counter();
+ $Apache::lonxml::counter_changed=1;
}
- $Apache::lonxml::counter_changed=0;
}
sub store_counter {
From lon-capa-cvs@mail.lon-capa.org Mon Apr 7 23:44:32 2003
From: lon-capa-cvs@mail.lon-capa.org (albertel)
Date: Mon, 07 Apr 2003 22:44:32 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /homework/caparesponse caparesponse.pm
Message-ID:
albertel Mon Apr 7 18:44:32 2003 EDT
Modified files:
/loncom/homework/caparesponse caparesponse.pm
Log:
- switch to general getresponse routine
- prepped for exam bubble submission
- removing useless code
Index: loncom/homework/caparesponse/caparesponse.pm
diff -u loncom/homework/caparesponse/caparesponse.pm:1.86 loncom/homework/caparesponse/caparesponse.pm:1.87
--- loncom/homework/caparesponse/caparesponse.pm:1.86 Wed Mar 26 13:44:13 2003
+++ loncom/homework/caparesponse/caparesponse.pm Mon Apr 7 18:44:32 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.86 2003/03/26 18:44:13 sakharuk Exp $
+# $Id: caparesponse.pm,v 1.87 2003/04/07 22:44:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -46,7 +46,7 @@
if ( $target eq 'grade' ) {
if ( defined $ENV{'form.submitted'}) {
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
- my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+ my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
if ( $response =~ /[^\s]/) {
my $id = $Apache::inputtags::response['-1'];
my $previous= &Apache::response::check_for_previous($response,$id,$response);
@@ -133,31 +133,34 @@
&Apache::response::setup_params($$tagstack[-1]);
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
my $partid = $Apache::inputtags::part;
- my $id = $Apache::inputtags::response['-1'];
- my $response = $ENV{'form.HWVAL'.$id};
+ my $response = &Apache::response::getresponse();
if ( $response =~ /[^\s]/) {
my %previous = &Apache::response::check_for_previous($response,$partid,$id);
$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
&Apache::lonxml::debug("submitted a $response \n");
&Apache::lonxml::debug($$parstack[$#$parstack] . "\n ");
- $response =~ s/\\/\\\\/g;
- $response =~ s/\'/\\\'/g;
- &Apache::lonxml::debug("current $response");
- my $expression="&caparesponse_check_list('".$response."','".
- $$parstack[-1];
- foreach my $key (keys(%Apache::inputtags::params)) {
- $expression.= ';my $'. #'
- $key.'="'.$Apache::inputtags::params{$key}.'"';
- }
- if ($$tagstack[-1] eq 'formularesponse') {
- $expression.=';my $type="fml";';
- } elsif ($$tagstack[-1] eq 'numericalresponse') {
- $expression.=';my $type="float";';
+ if ($Apache::lonhomework::type eq 'exam') {
+
+ } else {
+ $response =~ s/\\/\\\\/g;
+ $response =~ s/\'/\\\'/g;
+ &Apache::lonxml::debug("current $response");
+ my $expression="&caparesponse_check_list('".$response."','".
+ $$parstack[-1];
+ foreach my $key (keys(%Apache::inputtags::params)) {
+ $expression.= ';my $'. #'
+ $key.'="'.$Apache::inputtags::params{$key}.'"';
+ }
+ if ($$tagstack[-1] eq 'formularesponse') {
+ $expression.=';my $type="fml";';
+ } elsif ($$tagstack[-1] eq 'numericalresponse') {
+ $expression.=';my $type="float";';
+ }
+ $expression.="');";
+ $result = &Apache::run::run($expression,$safeeval);
+ my ($awards) = split /:/ , $result;
+ my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
}
- $expression.="');";
- $result = &Apache::run::run($expression,$safeeval);
- my ($awards) = split /:/ , $result;
- my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
&Apache::lonxml::debug("$expression");
@@ -221,8 +224,6 @@
my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers
my $factors_number = 5; #default values for number of factors
my $powers_number = 8; #default values for number of powers
- my $symb;
- if ($ENV{'form.symb'}=~/___\d+___/) {$symb=$ENV{'form.symb'};} else {$symb=$ENV{'request.symb'};}
&Apache::response::setrandomnumber();
my $ind=&Math::Random::random_uniform_integer(1,0,$#powers);
@@ -255,7 +256,7 @@
}
$ans = sprintf('%.'.$format,$bubbles_values[$ind]);
}
- $result.='
'.$alphabet[$ind].': '.$ans.'
';
+ $result.='
'.$alphabet[$ind].': '.$ans.'
';
}
$result.='';
} elsif ($$tagstack[-1] eq 'formularesponse') {
From lon-capa-cvs@mail.lon-capa.org Tue Apr 8 00:02:07 2003
From: lon-capa-cvs@mail.lon-capa.org (albertel)
Date: Mon, 07 Apr 2003 23:02:07 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /homework hint.pm
Message-ID:
albertel Mon Apr 7 19:02:07 2003 EDT
Modified files:
/loncom/homework hint.pm
Log:
- logic was incorrect here, so sometimes endredirection was called when startredirection wasn't
Index: loncom/homework/hint.pm
diff -u loncom/homework/hint.pm:1.37 loncom/homework/hint.pm:1.38
--- loncom/homework/hint.pm:1.37 Wed Apr 2 13:51:11 2003
+++ loncom/homework/hint.pm Mon Apr 7 19:02:06 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# implements the tags that control the hints
#
-# $Id: hint.pm,v 1.37 2003/04/02 18:51:11 sakharuk Exp $
+# $Id: hint.pm,v 1.38 2003/04/07 23:02:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,14 +50,14 @@
my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
if ( $hinttries eq '') { $hinttries = 1; }
&Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
- if ( $numtries < $hinttries ) {
- $skiptoend='1';
- } else {
- if ($target eq 'web' && $Apache::lonhomework::type ne 'exam') {
- $result='
';
}
return $row_html;
}
sub create_excel_spreadsheet {
my $self = shift;
my ($r) = @_;
my $filename = '/prtspool/'.
$ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
time.'_'.rand(1000000000).'.xls';
my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
if (! defined($workbook)) {
$r->log_error("Error creating excel spreadsheet $filename: $!");
$r->print("Problems creating new Excel file. ".
"This error has been logged. ".
"Please alert your LON-CAPA administrator");
return undef;
}
#
# The excel spreadsheet stores temporary data in files, then put them
# together. If needed we should be able to disable this (memory only).
# The temporary directory must be specified before calling 'addworksheet'.
# File::Temp is used to determine the temporary directory.
$workbook->set_tempdir('/home/httpd/perl/tmp');
#
# Determine the name to give the worksheet
return ($workbook,$filename);
}
############################################
## XML output routines ##
############################################
sub outsheet_xml {
my $self = shift;
my ($r) = @_;
## Someday XML
## Will be rendered for the user
## But not on this day
}
############################################
### Filesystem routines ###
############################################
sub parse_sheet {
# $sheetxml is a scalar reference or a scalar
my ($sheetxml) = @_;
if (! ref($sheetxml)) {
my $tmp = $sheetxml;
$sheetxml = \$tmp;
}
my %f;
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');
}
}
}
return \%f;
}
my %defaultsheets;
my %spreadsheets;
sub load {
my $self = shift;
my ($fn)=@_;
my $includedir = $Apache::lonnet::perlvar{'lonIncludes'};
#
my $stype = $self->{'type'};
my $cnum = $self->{'cnum'};
my $cdom = $self->{'cdom'};
my $chome = $self->{'chome'};
#
if (! defined($fn)) {
# There is no filename. Look for defaults in course and global, cache
unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) {
my %tmphash = &Apache::lonnet::get('environment',
['spreadsheet_default_'.$stype],
$cdom,$cnum);
my ($tmp) = keys(%tmphash);
if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
$fn = 'default_'.$stype;
} else {
$fn = $tmphash{'spreadsheet_default_'.$stype};
}
unless (($fn) && ($fn!~/^error\:/)) {
$fn='default_'.$stype;
}
$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn;
}
}
# $fn now has a value
$self->{'filename'} = $fn;
# see if sheet is cached
if (exists($spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn})) {
my %tmp = split(/___;___/,
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn});
$self->formulas(\%tmp);
} else {
# Not cached, need to read
my %f=();
if ($fn=~/^default_/) {
my $sheetxml='';
my $fh;
my $dfn=$fn;
$dfn=~s/\_/\./g;
if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
$sheetxml=join('',<$fh>);
} else {
# $sheetxml='"Error"';
$sheetxml='';
}
%f=%{&parse_sheet(\$sheetxml)};
} elsif($fn=~/\/*\.spreadsheet$/) {
my $sheetxml=&Apache::lonnet::getfile
(&Apache::lonnet::filelocation('',$fn));
if ($sheetxml == -1) {
$sheetxml='"Error loading spreadsheet '
.$fn.'"';
}
%f=%{&parse_sheet(\$sheetxml)};
} else {
my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum);
my ($tmp) = keys(%tmphash);
if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
foreach (keys(%tmphash)) {
$f{$_}=$tmphash{$_};
}
} else {
# Unable to grab the specified spreadsheet,
# so we get the default ones instead.
$fn = 'default_'.$stype;
$self->{'filename'} = $fn;
my $dfn = $fn;
$dfn =~ s/\_/\./g;
my $sheetxml;
if (my $fh=Apache::File->new($includedir.'/'.$dfn)) {
$sheetxml = join('',<$fh>);
} else {
$sheetxml=''.
'"Unable to load spreadsheet"';
}
%f=%{&parse_sheet(\$sheetxml)};
}
}
# Cache and set
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
$self->formulas(\%f);
}
$self->set_row_numbers();
}
sub save {
my $self = shift;
my ($makedef)=@_;
my $cid=$self->{'cid'};
if (&Apache::lonnet::allowed('opa',$cid)) {
my %f=$self->formulas();
my $stype= $self->{'type'};
my $cnum = $self->{'cnum'};
my $cdom = $self->{'cdom'};
my $chome= $self->{'chome'};
my $fn = $self->{'filename'};
# Cache new sheet
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
# Write sheet
foreach (keys(%f)) {
delete($f{$_}) if ($f{$_} eq 'import');
}
my $reply = &Apache::lonnet::put($fn,\%f,$cdom,$cnum);
if ($reply eq 'ok') {
$reply = &Apache::lonnet::put($stype.'_spreadsheets',
{$fn => $ENV{'user.name'}.'@'.$ENV{'user.domain'}},
$cdom,$cnum);
if ($reply eq 'ok') {
if ($makedef) {
$reply = &Apache::lonnet::put('environment',
{'spreadsheet_default_'.$stype => $fn },
$cdom,$cnum);
if ($reply eq 'ok' &&
($self->{'type'} eq 'studentcalc' ||
$self->{'type'} eq 'assesscalc')) {
# Expire the spreadsheets of the other students.
&Apache::lonnet::expirespread('','','studentcalc','');
}
return $reply;
}
return $reply;
}
return $reply;
}
return $reply;
}
return 'unauthorized';
}
sub save_tmp {
my $self = shift;
my $fn=$ENV{'user.name'}.'_'.
$ENV{'user.domain'}.'_spreadsheet_'.$self->{'usymb'}.'_'.
$self->{'filename'};
$fn=~s/\W/\_/g;
$fn=$Apache::lonnet::tmpdir.$fn.'.tmp';
my $fh;
if ($fh=Apache::File->new('>'.$fn)) {
my %f = $self->formulas();
while( my ($cell,$formula) = each(%f)) {
print $fh &Apache::lonnet::escape($cell)."=".&Apache::lonnet::escape($formula)."\n";
}
}
}
sub load_tmp {
my $self = shift;
my ($nfield,$nform)=@_;
my $fn=$ENV{'user.name'}.'_'.
$ENV{'user.domain'}.'_spreadsheet_'.$self->{'usymb'}.'_'.
$self->{'filename'};
$fn=~s/\W/\_/g;
$fn=$Apache::lonnet::tmpdir.$fn.'.tmp';
my $fh;
my %fo=();
my $countrows=0;
if ($fh=Apache::File->new($fn)) {
while (<$fh>) {
chomp;
my ($cell,$formula) = split(/=/);
$cell = &Apache::lonnet::unescape($cell);
$formula = &Apache::lonnet::unescape($formula);
$fo{$cell} = $formula;
}
}
if ($nform eq 'changesheet') {
$fo{'A'.$nfield}=(split(/__&&&\__/,$fo{'A'.$nfield}))[0];
unless ($ENV{'form.sel_'.$nfield} eq 'Default') {
$fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield};
}
} else {
if ($nfield) { $fo{$nfield}=$nform; }
}
$self->formulas(\%fo);
$self->set_row_numbers();
}
###########################################
# othersheets: Returns the list of other spreadsheets available
###########################################
sub othersheets {
my $self = shift;
my $stype = $self->{'type'};
#
my $cnum = $self->{'cnum'};
my $cdom = $self->{'cdom'};
my $chome = $self->{'chome'};
#
my @alternatives=();
my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum);
my ($tmp) = keys(%results);
unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
@alternatives = sort (keys(%results));
}
return @alternatives;
}
sub get_row {
my $self = shift;
my ($n)=@_;
my @cols=();
foreach ('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') {
push(@cols,{ name => $_.$n,
formula => $self->formula($_.$n),
value => $self->value($_.$n)});
}
return @cols;
}
sub get_template_row {
my $self = shift;
my @cols=();
foreach my $col ('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') {
push(@cols,{ name => 'template_'.$col,
formula => $self->formula('template_'.$col),
value => $self->value('template_'.$col) });
}
return @cols;
}
sub set_row_numbers {
my $self = shift;
my %f=$self->formulas();
while (my ($cell,$value) = each(%{$self->{'formulas'}})) {
next if ($cell !~ /^A(\d+)$/);
next if (! defined($value));
$self->{'row_numbers'}->{$value} = $1;
}
}
sub get_row_number_from_key {
my $self = shift;
my ($key) = @_;
if (! exists($self->{'row_numbers'}->{$key}) ||
! defined($self->{'row_numbers'}->{$key})) {
$self->{'maxrow'}++;
$self->set_formula('A'.$self->{'maxrow'},$key);
$self->{'row_numbers'}->{$key} = $self->{'maxrow'};
}
return $self->{'row_numbers'}->{$key};
}
1;
__END__
Index: modules/matthew/spreadsheet/assesscalc.pm
+++ modules/matthew/spreadsheet/assesscalc.pm
#
# $Id: assesscalc.pm,v 1.1 2003/04/09 20:57:56 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
#
# LON-CAPA is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# LON-CAPA is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LON-CAPA; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# /home/httpd/html/adm/gpl.txt
#
# http://www.lon-capa.org/
#
# The LearningOnline Network with CAPA
# Spreadsheet/Grades Display Handler
#
# POD required stuff:
=head1 NAME
assesscalc
=head1 SYNOPSIS
=head1 DESCRIPTION
=over 4
=cut
###################################################
### AssessSheet ###
###################################################
package Apache::assesscalc;
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonnet;
use Apache::Spreadsheet;
use HTML::Entities();
use Spreadsheet::WriteExcel;
use GDBM_File;
use Time::HiRes;
@Apache::assesscalc::ISA = ('Apache::Spreadsheet');
my %Exportrows;
my $current_name;
my $current_domain;
my $current_course;
my %useropt;
my %courseopt;
my %parmhash;
my $count = 0;
sub initialize_package {
my ($sname,$sdomain) = @_;
$current_name = $sname;
$current_domain = $sdomain;
############################
## Set up the export rows ##
############################
%Exportrows = undef;
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets_'.
$ENV{'request.course.id'},
$sname,$sdomain);
if ($tmp[0]!~/^error/) {
my %tmp = @tmp;
# We only got one key, so we will access it directly.
while (my ($key,$sheetdata) = each(%tmp)) {
my ($sname,$sdom,$sheettype,$symb) = split(':',$key);
if ($symb =~ /\.time/) {
$Exportrows{$symb}->{'time'} = $sheetdata;
} else {
$sheetdata =~ s/^___=___//;
$Exportrows{$symb}->{'data'} = {split('___;___',$sheetdata)};
}
}
}
}
sub setup_parameter_caches {
my $userprefix = $current_name.':'.$current_domain.'_';
$userprefix =~ s/:/_/g;
#
# Course Parameters Cache
if (! defined($current_course) ||
$current_course ne $ENV{'request.course.id'}) {
$current_course = $ENV{'request.course.id'};
undef(%courseopt);
if (! defined($current_name) || ! defined($current_domain)) {
&Apache::lonnet::logthis('bad call to setup_parameter_caches');
return;
}
my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
my $id = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
my %Tmp = &Apache::lonnet::dump('resourcedata',$dom,$id);
while (my ($name,$value) = each(%Tmp)) {
$courseopt{$userprefix.$name}=$value;
}
}
undef(%useropt);
my %Tmp = &Apache::lonnet::dump('resourcedata',
$current_domain,$current_name);
while (my ($name,$value) = each(%Tmp)) {
if ($name =~ /^error: 2/ || $name =~ /no such file/) {
undef(%useropt);
last;
}
$useropt{$userprefix.$name}=$value;
}
}
sub clear_package {
undef(%Exportrows);
undef($current_name);
undef($current_domain);
undef(%useropt);
undef(%courseopt);
}
##################################################
##################################################
=pod
=item &parmval()
Determine the value of a parameter.
Inputs: $what, the parameter needed, $symb, $uname, $udom, $csec
Returns: The value of a parameter, or '' if none.
This function cascades through the possible levels searching for a value for
a parameter. The levels are checked in the following order:
user, course (at section level and course level), map, and lonnet::metadata.
This function uses %parmhash, which must be tied prior to calling it.
This function also requires %courseopt and %useropt to be initialized for
this user and course.
=cut
##################################################
##################################################
sub parmval {
my $self = shift;
my ($what,$symb,$uname,$udom,$csec)=@_;
$uname = $self->{'name'} if (! defined($uname));
$udom = $self->{'domain'} if (! defined($udom));
$csec = $self->{'section'} if (! defined($csec));
$symb = $self->{'symb'} if (! defined($symb));
#
my $result='';
#
# This should be a
my ($mapname,$id,$fn)=split(/___/,$symb);
# Cascading lookup scheme
my $rwhat=$what;
$what =~ s/^parameter\_//;
$what =~ s/\_([^\_]+)$/\.$1/;
#
my $symbparm = $symb.'.'.$what;
my $mapparm = $mapname.'___(all).'.$what;
my $usercourseprefix = $uname.'_'.$udom.'_'.$self->{'cid'};
#
my $seclevel = $usercourseprefix.'.['.$csec.'].'.$what;
my $seclevelr = $usercourseprefix.'.['.$csec.'].'.$symbparm;
my $seclevelm = $usercourseprefix.'.['.$csec.'].'.$mapparm;
#
my $courselevel = $usercourseprefix.'.'.$what;
my $courselevelr = $usercourseprefix.'.'.$symbparm;
my $courselevelm = $usercourseprefix.'.'.$mapparm;
foreach ($symbparm, $mapparm,$usercourseprefix,$seclevel,
$seclevelr,$seclevelm,$courselevel,$courselevelr,$courselevelm) {
# $self->logthis('level = '.$_);
# $self->logthis('value = '.$courseopt{$_}) if (exists($courseopt{$_}));
}
# fourth, check user
if (defined($uname)) {
return $useropt{$courselevelr} if (defined($useropt{$courselevelr}));
return $useropt{$courselevelm} if (defined($useropt{$courselevelm}));
return $useropt{$courselevel} if (defined($useropt{$courselevel}));
}
# third, check course
if (defined($csec)) {
return $courseopt{$seclevelr} if (defined($courseopt{$seclevelr}));
return $courseopt{$seclevelm} if (defined($courseopt{$seclevelm}));
return $courseopt{$seclevel} if (defined($courseopt{$seclevel}));
}
#
return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr}));
return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));
return $courseopt{$courselevel} if (defined($courseopt{$courselevel}));
# second, check map parms
my $thisparm = $parmhash{$symbparm};
return $thisparm if (defined($thisparm));
# first, check default
$thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default');
return $thisparm if (defined($thisparm));
#Cascade Up
my $space=$what;
$space=~s/\.\w+$//;
if ($space ne '0') {
my @parts=split(/_/,$space);
my $id=pop(@parts);
my $part=join('_',@parts);
if ($part eq '') { $part='0'; }
my $newwhat=$rwhat;
$newwhat=~s/\Q$space\E/$part/;
my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec);
if (defined($partgeneral)) { return $partgeneral; }
}
#nothing defined
return '';
}
sub gettitle {
my $self = shift;
my $title;
if (($self->{'usymb'} eq '_feedback') ||
($self->{'usymb'} eq '_evaluation') ||
($self->{'usymb'} eq '_discussion') ||
($self->{'usymb'} eq '_tutoring')) {
$title = $self->{'usymb'};
$title =~ s/^_//;
$title = ucfirst($title);
return $title;
}
my $navmap = Apache::lonnavmaps::navmap->new(Apache->request,
$ENV{'request.course.fn'}.'.db',
$ENV{'request.coures.fn'}.'_parms.db',0,0);
my $resource = $navmap->getBySymb($self->{'symb'});
$title = $resource->title();
$navmap->untieHashes();
}
sub outsheet_html {
my $self = shift;
my ($r) = @_;
###################################
# Determine table structure
###################################
my $num_uneditable = 1;
my $num_left = 52-$num_uneditable;
my $tableheader =<<"END";
Assessment
Calculations
END
my $label_num = 0;
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
if ($label_num<$num_uneditable) {
$tableheader .= '
';
} else {
$tableheader .= '
';
}
$tableheader .= "$_
";
$label_num++;
}
$tableheader.="
\n";
#
$r->print($tableheader);
#
# Print out template row
$r->print('
Template
'.
$self->html_row($num_uneditable,'-')."
\n");
#
# Print out summary/export row
$r->print('
Export
0
'.
$self->html_row(0,0)."
\n");
#
# Prepare to output rows
$tableheader =<<"END";
row
Item
END
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
if ($label_num<$num_uneditable) {
$tableheader.='
';
} else {
$tableheader.='
';
}
$tableheader.="$_
";
}
#
my $num_output = 0;
foreach my $rownum ($self->rows()) {
if ($num_output++ % 50 == 0) {
$r->print("
\n");
return;
}
sub assess_html_row {
my $self = shift();
my ($num_uneditable,$row) = @_;
my $requester_is_student = ($ENV{'request.role'} =~ /^st\./);
my $parameter_name = $self->{'formulas'}->{'A'.$row};
my @rowdata = $self->get_row($row);
my $num_cols_output = 0;
my $row_html = '
'.$parameter_name.'
';
foreach my $cell (@rowdata) {
if ($requester_is_student ||
$num_cols_output++ < $num_uneditable) {
$row_html .= '
';
}
return $row_html;
}
sub outsheet_csv {
my $self = shift;
my ($r)=@_;
}
sub outsheet_excel {
my $self = shift;
my ($r)=@_;
}
sub display {
my $self = shift;
my ($r) = @_;
$self->compute();
$self->outsheet_html($r);
}
my %CourseResourceData;
my %UserResourceData;
sub compute {
my $self = shift;
$self->logthis('computing');
$self->initialize_safe_space();
#
# Definitions
my %parameters; # holds underscored parameters by name
my %parameter_names; # I have no idea.
#
# Get the metadata fields and determine their proper names
my ($symap,$syid,$srcf)=split(/___/,$self->{'symb'});
my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
foreach my $parm (@Metadata) {
next if ($parm !~ /^(resource\.|stores|parameter)_/);
my $cleaned_name = $parm;
$cleaned_name =~ s/^resource\./stores_/;
$cleaned_name =~ s/\./_/g;
my $display = &Apache::lonnet::metadata($srcf,
$cleaned_name.'.display');
if (! $display) {
$display .= &Apache::lonnet::metadata($srcf,$cleaned_name.'.name');
}
$parameters{$cleaned_name}++;
$parameter_names{$cleaned_name} = $display;
}
#
# Get the values of the metadata fields
$current_name = $self->{'name'};
$current_domain = $self->{'domain'};
&setup_parameter_caches();
my $filename = $self->{'coursefilename'}.'_parms.db';
if (tie(%parmhash,'GDBM_File',
$self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {
foreach my $parmname (keys(%parameters)) {
my $value = $self->parmval($parmname);
$parameters{$parmname} =$value;
}
untie(%parmhash);
} else {
$self->logthis('unable to tie '.$filename);
}
#
# Get the students performance data
my %student_parameters;
%student_parameters =
&Apache::loncoursedata::get_current_state($self->{'name'},
$self->{'domain'},
$self->{'symb'},
$self->{'cid'});
while (my ($parm,$value) = each(%student_parameters)) {
$parm =~ s/^resource\./stores_/;
$parm =~ s/\./_/g;
$parameters{$parm} = $value;
}
#
# Clean out unnecessary parameters
foreach (keys(%parameters)) {
delete($parameters{$_}) if (! /(resource\.|stores_|parameter_)/);
}
#
# Set up the formulas and parameter values
my %f=$self->formulas();
my %c;
my %have_seen;
while (my ($cell,$formula) = each(%f)) {
next if ($cell !~ /^A/ || $cell eq 'A0');
$c{$formula}=$parameters{$formula};
$have_seen{$formula}++;
$self->logthis('seen '.$formula);
}
while (my ($parm,$value) = each(%parameters)) {
next if ($have_seen{$parm});
my $cell = 'A'.(++$self->{'maxrows'});
$f{$cell} = $parm;
$c{$parm} = $value;
}
$self->formulas(%f);
$self->constants(%c);
# calculate sheet
$self->calcsheet();
#
# Store export row in cache
my @exportarray=();
foreach ('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') {
push(@exportarray,$self->value($_.'0'));
}
$Exportrows{$self->{'symb'}}->{'time'} = time;
$Exportrows{$self->{'symb'}}->{'data'} = \@exportarray;
#
# Save the export data
$self->save_export_data();
return;
}
sub sett {
my $self = shift;
my %t=();
#
# Deal with the template row by copying the template formulas into each
# row.
foreach my $col ($self->template_cells()) {
next if ($col=~/^A/);
foreach my $row ($self->rows()) {
# Get the name of this cell
my $cell=$col.$row;
# Grab the template declaration
$t{$cell}=$self->formula('template_'.$col);
# Replace '#' with the row number
$t{$cell}=~s/\#/$row/g;
# Replace '....' with ','
$t{$cell}=~s/\.\.+/\,/g;
# Replace 'A0' with the value from 'A0'
$t{$cell}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
# Replace parameters
$t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/ge;
}
}
#
# Deal with the cells which have formulas
while (my ($cell,$formula) = each(%{$self->{'formulas'}})) {
next if ($cell =~ /template_/);
if ($cell =~ /^A/ && $cell ne 'A0') {
if ($formula !~ /^\!/) {
$t{$cell}=$self->{'constants'}->{$formula};
}
} else {
$t{$cell}=$formula;
$t{$cell}=~s/\.\.+/\,/g;
$t{$cell}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
$t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/ge;
}
}
# Put %t into the safe space
%{$self->{'safe'}->varglob('t')}=%t;
}
sub export_data {
my $self = shift;
my $symb = $self->{'symb'};
if (! exists($Exportrows{$symb}) || ! defined($Exportrows{$symb}) ||
! $self->check_expiration_time($Exportrows{$symb}->{'time'})) {
$self->compute();
}
return @{$Exportrows{$symb}->{'data'}};
}
sub save_export_data {
return;
my $self = shift;
my $student = $self->{'name'}.':'.$self->{'domain'};
my $symb = $self->{'symb'};
return if (! exists($Exportrows{$symb}));
my $key = join(':',($self->{'name'},$self->{'domain'},'assesscalc',$symb));
my $timekey = $key.'.time';
my $newstore = join('___;___',
@{$Exportrows{$symb}->{'data'}});
$newstore = $self->{'filename'}.'___=___'.$newstore;
&Apache::lonnet::put('nohist_calculatedsheets',
{ $key => $newstore,
$timekey => $Exportrows{$symb}->{'time'} },
$self->{'domain'},
$self->{'name'});
return;
}
1;
__END__
Index: modules/matthew/spreadsheet/classcalc.pm
+++ modules/matthew/spreadsheet/classcalc.pm
#
# $Id: classcalc.pm,v 1.1 2003/04/09 20:57:56 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
#
# LON-CAPA is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# LON-CAPA is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LON-CAPA; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# /home/httpd/html/adm/gpl.txt
#
# http://www.lon-capa.org/
#
# The LearningOnline Network with CAPA
# Spreadsheet/Grades Display Handler
#
# POD required stuff:
=head1 NAME
classcalc
=head1 SYNOPSIS
=head1 DESCRIPTION
=over 4
=cut
###################################################
### CourseSheet ###
###################################################
package Apache::classcalc;
use strict;
use Apache::Constants qw(:common :http);
use Apache::loncoursedata;
use Apache::Spreadsheet;
use Apache::studentcalc;
use HTML::Entities();
use Spreadsheet::WriteExcel;
use Apache::lonnet;
use Time::HiRes;
@Apache::classcalc::ISA = ('Apache::Spreadsheet');
sub get_classlist {
my $self = shift;
# Retrieve the classlist
my @Students = ();
my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist
($self->{'cid'},$self->{'cdom'},$self->{'cnum'});
while (my ($student,$student_data) = each (%$classlist)) {
my $studenthash = ();
for (my $i=0; $i< scalar(@$field_names);$i++) {
my $field = $field_names->[$i];
$studenthash->{$field}=$student_data->[$i];
}
# This is where we can skip students because they are in
# the wrong section, have expired or pending roles, whatever...
push (@Students,$studenthash);
}
return @Students;
}
sub gettitle {
my $self = shift;
my $title = '
'.$self->{'coursedesc'}."
\n";
# Section info should be included
return $title;
}
sub outsheet_html {
my $self = shift;
my ($r) = @_;
###################################
# Determine table structure
###################################
my $num_uneditable = 26;
my $num_left = 52-$num_uneditable;
my $tableheader =<<"END";
Course
Import
Calculations
END
my $label_num = 0;
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
if ($label_num<$num_uneditable) {
$tableheader.='
';
} else {
$tableheader.='
';
}
$tableheader.="$_
";
$label_num++;
}
$tableheader.="
\n";
#
$r->print($tableheader);
#
# Print out template row
$r->print('
Template
'.
$self->html_row($num_uneditable,'-')."
\n");
#
# Print out summary/export row
$r->print('
Summary
0
'.
$self->html_row($num_uneditable,0)."
\n");
$r->print("
\n");
#
# Prepare to output rows
$tableheader =<<"END";
student
username
domain
section
status
END
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
if ($label_num<$num_uneditable) {
$tableheader.='
';
} else {
$tableheader.='
';
}
$tableheader.="$_
";
}
#
my $num_output = 1;
foreach my $student ($self->get_classlist()) {
if ($num_output++ % 50 == 0) {
$r->print("
\n".$tableheader);
}
my $rownum = $self->get_row_number_from_key($student);
my $link = '';
$r->print('