[LON-CAPA-cvs] cvs: rat / lonambiguous.pm loncom/interface loncoursedata.pm loncom/lonnet/perl lonnet.pm

[www]

www		Sat Sep 14 14:57:59 2002 EDT

  Modified files:              
    /loncom/interface	loncoursedata.pm 
    /loncom/lonnet/perl	lonnet.pm 
    /rat	lonambiguous.pm 
  Log:
  Should call 'clutter' (which adds /res/ if necessary) instead of adding
  it by hand.
  
  
Index: loncom/interface/loncoursedata.pm
diff -u loncom/interface/loncoursedata.pm:1.30 loncom/interface/loncoursedata.pm:1.31
--- loncom/interface/loncoursedata.pm:1.30	Tue Sep  3 08:27:05 2002
+++ loncom/interface/loncoursedata.pm	Sat Sep 14 14:57:59 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: loncoursedata.pm,v 1.30 2002/09/03 12:27:05 stredwic Exp $
+# $Id: loncoursedata.pm,v 1.31 2002/09/14 18:57:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -322,7 +322,8 @@
     my (@sequences, @currentResource, @finishResource);
     my ($currentSequence, $currentResourceID, $lastResourceID);
 
-    $currentResourceID=$hash{'ids_/res/'.$ENV{'request.course.uri'}};
+    $currentResourceID=$hash{'ids_'.
+      &Apache::lonnet::clutter($ENV{'request.course.uri'})};
     push(@currentResource, $currentResourceID);
     $lastResourceID=-1;
     $currentSequence=-1;
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.279 loncom/lonnet/perl/lonnet.pm:1.280
--- loncom/lonnet/perl/lonnet.pm:1.279	Sat Sep  7 13:53:05 2002
+++ loncom/lonnet/perl/lonnet.pm	Sat Sep 14 14:57:59 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.279 2002/09/07 17:53:05 www Exp $
+# $Id: lonnet.pm,v 1.280 2002/09/14 18:57:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2970,7 +2970,7 @@
     my $okay=0;
     if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                             &GDBM_READER(),0640)) {
-        my $ids=$bighash{'ids_/res/'.$thisfn};
+        my $ids=$bighash{'ids_'.&clutter($thisfn)};
         unless ($ids) { 
            $ids=$bighash{'ids_/'.$thisfn};
         }
@@ -3041,7 +3041,7 @@
            if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                             &GDBM_READER(),0640)) {
 # ---------------------------------------------- Get ID(s) for current resource
-              my $ids=$bighash{'ids_/res/'.$thisfn};
+              my $ids=$bighash{'ids_'.&clutter($thisfn)};
               unless ($ids) { 
                  $ids=$bighash{'ids_/'.$thisfn};
               }
Index: rat/lonambiguous.pm
diff -u rat/lonambiguous.pm:1.5 rat/lonambiguous.pm:1.6
--- rat/lonambiguous.pm:1.5	Mon Aug 12 14:21:42 2002
+++ rat/lonambiguous.pm	Sat Sep 14 14:57:59 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to resolve ambiguous file locations
 #
-# $Id: lonambiguous.pm,v 1.5 2002/08/12 18:21:42 albertel Exp $
+# $Id: lonambiguous.pm,v 1.6 2002/09/14 18:57:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -134,7 +134,7 @@
    if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                     &GDBM_READER(),0640)) {
 # ---------------------------------------------- Get ID(s) for current resource
-      my $ids=$bighash{'ids_/res/'.$thisfn};
+      my $ids=$bighash{'ids_'.&clutter($thisfn)};
       if ($ids) {
 # ------------------------------------------------------------------- Has ID(s)
          my @possibilities=split(/\,/,$ids);