[LON-CAPA-cvs] cvs: loncom /build Makefile /interface lonevaluate.pm lonmeta.pm /interface/statistics lonproblemstatistics.pm /lonnet/perl lonnet.pm /publisher lonpublisher.pm doc/loncapafiles reseval_fixup.piml
albertel
lon-capa-cvs@mail.lon-capa.org
Fri, 09 Aug 2002 19:49:30 -0000
albertel Fri Aug 9 15:49:30 2002 EDT
Added files:
/doc/loncapafiles reseval_fixup.piml
Modified files:
/loncom/interface lonevaluate.pm lonmeta.pm
/loncom/interface/statistics lonproblemstatistics.pm
/loncom/publisher lonpublisher.pm
/loncom/lonnet/perl lonnet.pm
/loncom/build Makefile
Log:
- fixes bug#257, moved resevaldata.db to nohist_resevaldata.db, and deletes hist file
- After installing these diffs you need to do a make install before restarting the webserver
Index: loncom/interface/lonevaluate.pm
diff -u loncom/interface/lonevaluate.pm:1.8 loncom/interface/lonevaluate.pm:1.9
--- loncom/interface/lonevaluate.pm:1.8 Fri Mar 29 10:15:54 2002
+++ loncom/interface/lonevaluate.pm Fri Aug 9 15:49:30 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Evaluate
#
-# $Id: lonevaluate.pm,v 1.8 2002/03/29 15:15:54 www Exp $
+# $Id: lonevaluate.pm,v 1.9 2002/08/09 19:49:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -67,7 +67,7 @@
my @retrieve=map{ $prefix.$_ } @items;
my %currenteval=
- &Apache::lonnet::get('resevaldata',\@retrieve,$rdomain,$rauth);
+ &Apache::lonnet::get('nohist_resevaldata',\@retrieve,$rdomain,$rauth);
my $already=($currenteval{$prefix.'timestamp'} ne '');
@@ -103,7 +103,7 @@
<h1>Thank you for your input!</h1>
ENDHEADER
$r->print('Storing feedback: '.
- &Apache::lonnet::put('resevaldata',\%currenteval,$rdomain,$rauth));
+ &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth));
unless ($already) {
$r->print('<br>Logging first evaluation');
}
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.15 loncom/interface/lonmeta.pm:1.16
--- loncom/interface/lonmeta.pm:1.15 Fri Mar 29 13:44:41 2002
+++ loncom/interface/lonmeta.pm Fri Aug 9 15:49:30 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.15 2002/03/29 18:44:41 www Exp $
+# $Id: lonmeta.pm,v 1.16 2002/08/09 19:49:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,8 +47,8 @@
my $regexp=&Apache::lonnet::escape($url);
$regexp=~s/(\W)/\\$1/g;
$regexp='___'.$regexp.'___';
- my %evaldata=&Apache::lonnet::dump
- ('resevaldata',$adomain,$aauthor,$regexp);
+ my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
+ $aauthor,$regexp);
my %sum;
my %cnt;
my %listitems=('count' => 'add',
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.16 loncom/interface/statistics/lonproblemstatistics.pm:1.17
--- loncom/interface/statistics/lonproblemstatistics.pm:1.16 Tue Aug 6 13:38:26 2002
+++ loncom/interface/statistics/lonproblemstatistics.pm Fri Aug 9 15:49:30 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonproblemstatistics.pm,v 1.16 2002/08/06 17:38:26 minaeibi Exp $
+# $Id: lonproblemstatistics.pm,v 1.17 2002/08/09 19:49:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -558,9 +558,10 @@
#check with Gerd
$urlres=~/^(\w+)\/(\w+)/;
- if ($StdNo) {
- &Apache::lonnet::put('resevaldata',\%storestats,$1,$2);
- }
+ if ($StdNo) {
+ &Apache::lonnet::put('nohist_resevaldata',\%storestats,
+ $1,$2);
+ }
#-------------------------------- Row of statistical table
&TableRow($cache,$join,$cIdx,($p_count-1),$r,$color,
\%TempCache);
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.91 loncom/publisher/lonpublisher.pm:1.92
--- loncom/publisher/lonpublisher.pm:1.91 Fri Aug 9 14:03:05 2002
+++ loncom/publisher/lonpublisher.pm Fri Aug 9 15:49:30 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.91 2002/08/09 18:03:05 matthew Exp $
+# $Id: lonpublisher.pm,v 1.92 2002/08/09 19:49:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -777,7 +777,8 @@
=> time);
$thisdep=~/^\/res\/(\w+)\/(\w+)\//;
if ((defined($1)) && (defined($2))) {
- &Apache::lonnet::put('resevaldata',\%temphash,$1,$2);
+ &Apache::lonnet::put('nohist_resevaldata',\%temphash,
+ $1,$2);
}
}
}
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.265 loncom/lonnet/perl/lonnet.pm:1.266
--- loncom/lonnet/perl/lonnet.pm:1.265 Fri Aug 9 14:12:19 2002
+++ loncom/lonnet/perl/lonnet.pm Fri Aug 9 15:49:30 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.265 2002/08/09 18:12:19 albertel Exp $
+# $Id: lonnet.pm,v 1.266 2002/08/09 19:49:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -820,7 +820,7 @@
my $entry=$_;
$entry=~/\_\_\_(\w+)\/(\w+)\/(.*)\_\_\_(\w+)$/;
my %temphash=($entry => $accesshash{$entry});
- if (&Apache::lonnet::put('resevaldata',\%temphash,$1,$2) eq 'ok') {
+ if (&Apache::lonnet::put('nohist_resevaldata',\%temphash,$1,$2) eq 'ok') {
delete $accesshash{$entry};
}
}
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.129 loncom/build/Makefile:1.130
--- loncom/build/Makefile:1.129 Tue Jul 23 18:17:22 2002
+++ loncom/build/Makefile Fri Aug 9 15:49:30 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Scott Harrison, your friendly neighborhood volunteer
-# $Id: Makefile,v 1.129 2002/07/23 22:17:22 harris41 Exp $
+# $Id: Makefile,v 1.130 2002/08/09 19:49:30 albertel Exp $
# TYPICAL USAGE of this Makefile is primarily for two targets:
# "make build" and "make install".
@@ -348,8 +348,14 @@
cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
+reseval_fixup:
+ cat $(SOURCE)/doc/loncapafiles/reseval_fixup.piml | \
+ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+ tee -a WARNINGS
+
postinstall:
make webserverconf
+ make reseval_fixup
make sanitycheck
VERSION:
Index: doc/loncapafiles/reseval_fixup.piml
+++ doc/loncapafiles/reseval_fixup.piml
<!-- sanitycheck.piml -->
<!-- Scott Harrison -->
<!-- $Id: reseval_fixup.piml,v 1.1 2002/08/09 19:49:30 albertel Exp $ -->
<!--
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/
-->
<piml>
<targetroot>/</targetroot>
<files>
<file>
<target dist="default">/home/httpd/lonUsers</target>
<perlscript mode="fg">
# get a list of all user directories
my @dirs=`find <TARGET /> -type d `;
my @userdirs=grep(m|/[^/]*/[^/]*/[^/]*/[^/]*/[^/]*/[^/]*/[^/]*/[^/]*|, @dirs);
foreach my $udir (@userdirs) {
chomp($udir);
print("$udir \n");
if (-e "$udir/resevaldata.hist") {
unlink("$udir/resevaldata.hist");
}
if (-e "$udir/resevaldata.db") {
`mv $udir/resevaldata.db $udir/nohist_resevaldata.db`;
}
}
</perlscript>
</file>
</files>
</piml>