[LON-CAPA-cvs] cvs: rat / lonuserstate.pm

[www]

www		Thu Dec 12 13:00:24 2002 EDT

  Modified files:              
    /rat	lonuserstate.pm 
  Log:
  Do not jump to a sequence as first resource. This avoids two bugs:
  a) part of Bug #963 - courses with /uploaded-sequence as first 
     resource now work
  b) jumping to a sequence which has a sequence as first resource
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.47 rat/lonuserstate.pm:1.48
--- rat/lonuserstate.pm:1.47	Mon Nov 18 10:17:56 2002
+++ rat/lonuserstate.pm	Thu Dec 12 13:00:24 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.47 2002/11/18 15:17:56 www Exp $
+# $Id: lonuserstate.pm,v 1.48 2002/12/12 18:00:24 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -278,7 +278,8 @@
     $sofar=simplify($sofar);
     unless ($beenhere=~/\&$rid\&/) {
        $beenhere.=$rid.'&';  
-       if (($retfurl eq '') && ($hash{'src_'.$rid})) {
+       if (($retfurl eq '') && ($hash{'src_'.$rid})
+        && ($hash{'src_'.$rid}!~/\.sequence$/)) {
            my ($mapid,$resid)=split(/\./,$rid);
            $retfurl=$hash{'src_'.$rid}.
            (($hash{'src_'.$rid}=~/\?/)?'&':'?').'symb='.
@@ -492,9 +493,9 @@
         &pickrandom();
     }
 # ------------------------------------------------------------ Version tracking
-    if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-	&Apache::lonnet::logthis('Will be version tracking');
-    }
+#    if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+#	&Apache::lonnet::logthis('Will be version tracking');
+#    }
     unless ((untie(%hash)) && (untie(%parmhash))) {
       &Apache::lonnet::logthis("<font color=blue>WARNING: ".
                        "Could not untie coursemap $fn for $uri.</font>"); 
@@ -522,8 +523,6 @@
 	    $retfurl='/adm/email?critical=display';
         }
     }
-
-
    return ($retfurl,$errtext);
 }