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

[www]

www		Thu Dec  3 19:01:33 2009 EDT

  Modified files:              
    /rat	lonuserstate.pm 
  Log:
  Bug #3504: Warn adv-users if there are version discrepancies,
  make it clear which version is used.
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.133 rat/lonuserstate.pm:1.134
--- rat/lonuserstate.pm:1.133	Sun Nov 15 21:31:23 2009
+++ rat/lonuserstate.pm	Thu Dec  3 19:01:33 2009
@@ -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.133 2009/11/15 21:31:23 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.134 2009/12/03 19:01:33 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,6 +62,12 @@
 
 # ----------------------------------- Remove version from URL and store in hash
 
+sub versionerror {
+    my ($uri,$usedversion,$unusedversion)=@_;
+    return '<br />'.&mt('Version discrepancy: resource [_1] included in both version [_2] and version [_3]. Using version [_2].',
+                    $uri,$usedversion,$unusedversion).'<br />';
+}
+
 sub versiontrack {
     my $uri=shift;
     if ($uri=~/\.(\d+)\.\w+$/) {
@@ -69,7 +75,9 @@
 	$uri=~s/\.\d+\.(\w+)$/\.$1/;
         unless ($hash{'version_'.$uri}) {
 	    $hash{'version_'.$uri}=$version;
-	}
+	} elsif ($version!=$hash{'version_'.$uri}) {
+            $errtext.=&versionerror($uri,$hash{'version_'.$uri},$version);
+        }
     }
     return $uri;
 }