[LON-CAPA-cvs] cvs: loncom /interface groupsort.pm loncommon.pm lonindexer.pm lonnavmaps.pm lonparmset.pm lonspreadsheet.pm lontest.pm /interface/statistics lonproblemstatistics.pm rat lonambiguous.pm lonpage.pm lonpageflip.pm lonsequence.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 12 Aug 2002 18:21:42 -0000


This is a MIME encoded message

--albertel1029176502
Content-Type: text/plain

albertel		Mon Aug 12 14:21:42 2002 EDT

  Modified files:              
    /loncom/interface	groupsort.pm loncommon.pm lonindexer.pm 
                     	lonnavmaps.pm lonparmset.pm lonspreadsheet.pm 
                     	lontest.pm 
    /rat	lonambiguous.pm lonpageflip.pm lonpage.pm lonsequence.pm 
    /loncom/interface/statistics	lonproblemstatistics.pm 
  Log:
  - i think the last of bug#574
  
  
--albertel1029176502
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20020812142142.txt"

Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.12 loncom/interface/groupsort.pm:1.13
--- loncom/interface/groupsort.pm:1.12	Fri May 24 12:04:54 2002
+++ loncom/interface/groupsort.pm	Mon Aug 12 14:21:42 2002
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.12 2002/05/24 16:04:54 www Exp $
+# $Id: groupsort.pm,v 1.13 2002/08/12 18:21:42 albertel Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -194,7 +194,7 @@
 
     }
 # ----------------------------- diropendb is now the filename of the db to open
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	my $acts = $ENV{'form.acts'};
 	my @Acts = split(/b/,$acts);
 	my %ahash;
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.52 loncom/interface/loncommon.pm:1.53
--- loncom/interface/loncommon.pm:1.52	Thu Aug  8 15:27:35 2002
+++ loncom/interface/loncommon.pm	Mon Aug 12 14:21:42 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.52 2002/08/08 19:27:35 matthew Exp $
+# $Id: loncommon.pm,v 1.53 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -844,7 +844,7 @@
     #   Set up the hash as a database
     my %thesaurus_db;
     if (! tie(%thesaurus_db,'GDBM_File',
-              $thesaurus_db_file,&GDBM_READER,0640)){
+              $thesaurus_db_file,&GDBM_READER(),0640)){
         &Apache::lonnet::logthis("Could not tie \%thesaurus_db to ".
                                  $thesaurus_db_file);
         return 0;
@@ -957,7 +957,7 @@
         return ();
     }
     if (! tie(%thesaurus_db,'GDBM_File',
-              $thesaurus_db_file,&GDBM_READER,0640)){
+              $thesaurus_db_file,&GDBM_READER(),0640)){
         return ();
     } 
     my @Words=();
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.48 loncom/interface/lonindexer.pm:1.49
--- loncom/interface/lonindexer.pm:1.48	Thu Aug  8 09:07:17 2002
+++ loncom/interface/lonindexer.pm	Mon Aug 12 14:21:42 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.48 2002/08/08 13:07:17 matthew Exp $
+# $Id: lonindexer.pm,v 1.49 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -130,7 +130,7 @@
     my $diropendb = 
 	"/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
 
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	if ($ENV{'form.launch'} eq '1') {
 	    &start_fresh_session();
         }
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.39 loncom/interface/lonnavmaps.pm:1.40
--- loncom/interface/lonnavmaps.pm:1.39	Thu Jul 25 12:55:53 2002
+++ loncom/interface/lonnavmaps.pm	Mon Aug 12 14:21:42 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.39 2002/07/25 16:55:53 www Exp $
+# $Id: lonnavmaps.pm,v 1.40 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -411,10 +411,10 @@
     if ($ENV{'request.course.fn'}) {
 	$fn=$ENV{'request.course.fn'};
 	if (-e "$fn.db") {
-	    if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) &&
+	    if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) &&
 		(tie(%parmhash,'GDBM_File',
 		     $ENV{'request.course.fn'}.'_parms.db',
-		     &GDBM_READER,0640))) {
+		     &GDBM_READER(),0640))) {
 		$hashtied=1;
 	    }
 	}
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.57 loncom/interface/lonparmset.pm:1.58
--- loncom/interface/lonparmset.pm:1.57	Thu Aug  8 13:03:20 2002
+++ loncom/interface/lonparmset.pm	Mon Aug 12 14:21:42 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.57 2002/08/08 17:03:20 albertel Exp $
+# $Id: lonparmset.pm,v 1.58 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -491,12 +491,12 @@
 
 # ------------------------------------------------------------------- Tie hashs
     if (!(tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-	      &GDBM_READER,0640))) {
+	      &GDBM_READER(),0640))) {
 	$r->print("Unable to access course data. (File $ENV{'request.course.fn'}.db not tieable)");
 	return ;
     }
     if (!(tie(%parmhash,'GDBM_File',
-	      $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) {
+	      $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640))) {
 	$r->print("Unable to access parameter data. (File $ENV{'request.course.fn'}_parms.db not tieable)");
 	return ;
     }
Index: loncom/interface/lonspreadsheet.pm
diff -u loncom/interface/lonspreadsheet.pm:1.98 loncom/interface/lonspreadsheet.pm:1.99
--- loncom/interface/lonspreadsheet.pm:1.98	Tue Jul 30 17:23:44 2002
+++ loncom/interface/lonspreadsheet.pm	Mon Aug 12 14:21:42 2002
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.98 2002/07/30 21:23:44 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.99 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1746,7 +1746,7 @@
     unless ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) {
 # -------------------------------------------------------------------- Tie hash
       if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                       &GDBM_READER,0640)) {
+                       &GDBM_READER(),0640)) {
 # --------------------------------------------------------- Get all assessments
 
 	my %allkeys=('timestamp' => 
@@ -2122,7 +2122,7 @@
    my %c=();
 
    if (tie(%parmhash,'GDBM_File',
-           &getcfn($safeeval).'_parms.db',&GDBM_READER,0640)) {
+           &getcfn($safeeval).'_parms.db',&GDBM_READER(),0640)) {
     my %f=&getformulas($safeeval);
     foreach (keys(%f))  {
 	if ($_=~/^A/) {
Index: loncom/interface/lontest.pm
diff -u loncom/interface/lontest.pm:1.5 loncom/interface/lontest.pm:1.6
--- loncom/interface/lontest.pm:1.5	Wed Jun 26 10:01:50 2002
+++ loncom/interface/lontest.pm	Mon Aug 12 14:21:42 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # A debugging harness.
 #
-# $Id: lontest.pm,v 1.5 2002/06/26 14:01:50 www Exp $
+# $Id: lontest.pm,v 1.6 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -96,10 +96,10 @@
 
      my $fn=$ENV{'request.course.fn'};
 
-     if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) &&
+     if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) &&
 		(tie(%parmhash,'GDBM_File',
 		     $ENV{'request.course.fn'}.'_parms.db',
-		     &GDBM_READER,0640))) {
+		     &GDBM_READER(),0640))) {
      $r->print('<h2>Big Hash</h2>');
          foreach (sort keys %hash) {
 	     $r->print("\n<br>".$_.': '.$hash{$_});
Index: rat/lonambiguous.pm
diff -u rat/lonambiguous.pm:1.4 rat/lonambiguous.pm:1.5
--- rat/lonambiguous.pm:1.4	Thu Nov 29 14:23:48 2001
+++ rat/lonambiguous.pm	Mon Aug 12 14:21:42 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to resolve ambiguous file locations
 #
-# $Id: lonambiguous.pm,v 1.4 2001/11/29 19:23:48 www Exp $
+# $Id: lonambiguous.pm,v 1.5 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,7 +69,7 @@
    if ($ENV{'form.selecturl'}) {
        my $envkey;
        if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                    &GDBM_READER,0640)) {
+                    &GDBM_READER(),0640)) {
           foreach $envkey (keys %ENV) {
              if ($envkey=~/^form\.(\d+)\.(\d+)$/) {
 # ---------------------------------------------------- Update symb and redirect
@@ -106,7 +106,7 @@
     my $syval='';
     
     if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
-                  &GDBM_READER,0640)) {
+                  &GDBM_READER(),0640)) {
        $syval=$hash{$thisfn};
        untie(%hash);
     }
@@ -132,7 +132,7 @@
 # ------------------------------------------------ Would be standalone resource
 
    if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                    &GDBM_READER,0640)) {
+                    &GDBM_READER(),0640)) {
 # ---------------------------------------------- Get ID(s) for current resource
       my $ids=$bighash{'ids_/res/'.$thisfn};
       if ($ids) {
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.27 rat/lonpageflip.pm:1.28
--- rat/lonpageflip.pm:1.27	Mon Jul  8 16:10:40 2002
+++ rat/lonpageflip.pm	Mon Aug 12 14:21:42 2002
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.27 2002/07/08 20:10:40 www Exp $
+# $Id: lonpageflip.pm,v 1.28 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,7 +66,7 @@
 sub fullmove {
     my ($rid,$mapurl,$direction)=@_;
     if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                        &GDBM_READER,0640)) {
+                        &GDBM_READER(),0640)) {
 	($rid,$mapurl)=&move($rid,$mapurl,$direction);
         untie(%hash);
     }
@@ -184,7 +184,7 @@
 # -------------------------------------------------------- Return to last known
          my $last;
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
-                    &GDBM_READER,0640)) {
+                    &GDBM_READER(),0640)) {
 	     $last=$hash{'last_known'};
              untie(%hash);
          }
@@ -206,7 +206,7 @@
               ($currenturl=~/^\/adm\/wrapper\//))  {
 	 my $last;
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
-                    &GDBM_READER,0640)) {
+                    &GDBM_READER(),0640)) {
 	     $last=$hash{'last_known'};
              untie(%hash);
          }
@@ -230,7 +230,7 @@
 
 # ============================================================ Tie the big hash
           if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                        &GDBM_READER,0640)) {
+                        &GDBM_READER(),0640)) {
               my $rid=$hash{'map_pc_/res/'.$startoutmap}.'.'.$mapnum;
 
 # ------------------------------------------------- Move forward, backward, etc
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.43 rat/lonpage.pm:1.44
--- rat/lonpage.pm:1.43	Mon Jul  1 11:02:19 2002
+++ rat/lonpage.pm	Mon Aug 12 14:21:42 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.43 2002/07/01 15:02:19 sakharuk Exp $
+# $Id: lonpage.pm,v 1.44 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -162,7 +162,7 @@
   if (($ENV{'request.course.fn'}) && (!$ENV{'form.forceselect'})) {
       my $fn=$ENV{'request.course.fn'};
       if (-e "$fn.db") {
-          if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) {
+          if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
 # ------------------------------------------------------------------- Hash tied
               my $firstres=$hash{'map_start_'.$requrl};
               my $lastres=$hash{'map_finish_'.$requrl};
Index: rat/lonsequence.pm
diff -u rat/lonsequence.pm:1.12 rat/lonsequence.pm:1.13
--- rat/lonsequence.pm:1.12	Fri May 24 10:44:32 2002
+++ rat/lonsequence.pm	Mon Aug 12 14:21:42 2002
@@ -2,7 +2,7 @@
 #
 # Sequence Handler
 #
-# $Id: lonsequence.pm,v 1.12 2002/05/24 14:44:32 www Exp $
+# $Id: lonsequence.pm,v 1.13 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -100,7 +100,7 @@
 ENDSELECT
     my $diropendb = 
     "/home/httpd/perl/tmp/$ENV{'user.domain'}\_$ENV{'user.name'}_groupsec.db";
-        if (tie(%selhash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+        if (tie(%selhash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	    if ($ENV{'form.launch'} eq '1') {
 	       &start_fresh_session();
 	    }
@@ -234,7 +234,7 @@
   if (($ENV{'request.course.fn'}) && (!$ENV{'form.forceselect'})) {
        my $last;
        if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
-                    &GDBM_READER,0640)) {
+                    &GDBM_READER(),0640)) {
 	   $last=$hash{'last_direction'};
            untie(%hash);
        }
@@ -245,7 +245,7 @@
        }
 # ------------------------------------------------------------- Tie big db file
        if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                    &GDBM_READER,0640)) {
+                    &GDBM_READER(),0640)) {
 	   my $disid='';
 
            if ($direction eq 'back') {
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.17 loncom/interface/statistics/lonproblemstatistics.pm:1.18
--- loncom/interface/statistics/lonproblemstatistics.pm:1.17	Fri Aug  9 15:49:30 2002
+++ loncom/interface/statistics/lonproblemstatistics.pm	Mon Aug 12 14:21:42 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonproblemstatistics.pm,v 1.17 2002/08/09 19:49:30 albertel Exp $
+# $Id: lonproblemstatistics.pm,v 1.18 2002/08/12 18:21:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,7 +48,7 @@
     my ($cacheDB, $students, $courseID, $c, $r)=@_;
     my %cache;
 
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
+    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
         return '<html><body>Unable to tie database.</body></html>';
     }
 
@@ -80,7 +80,7 @@
         my $courseData = 
             &Apache::loncoursedata::DownloadCourseInformation($_, $courseID);
         last if ($c->aborted());
-        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT,0640)) {
+        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) {
             &Apache::loncoursedata::ProcessStudentData(\%cache, 
                                                        $courseData, $_);
             untie(%cache);
@@ -90,7 +90,7 @@
     &Close_PrgWin($r);
     if($c->aborted()) { return; }
 
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
+    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
         return '<html><body>Unable to tie database.</body></html>';
     }
 
@@ -125,7 +125,7 @@
 
     foreach (keys %$TempCache) {
         last if ($c->aborted());
-        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT,0640)) {
+        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) {
 	    $cache{$_}=$TempCache->{$_};
 
             untie(%cache);
@@ -874,7 +874,7 @@
     my $count = 0;
     my $Max = 0;
 
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
+    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
         return '<html><body>Unable to tie database.</body></html>';
     }
    

--albertel1029176502--