[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm /lonnet/perl lonnet.pm

[www]

www		Tue Mar 20 13:36:23 2012 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  * Don't loose track of resource usage within courses
  * No, it does make sense to turn /uploaded or /adm into crumbs
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.302 loncom/interface/lonhtmlcommon.pm:1.303
--- loncom/interface/lonhtmlcommon.pm:1.302	Wed Feb 29 09:58:21 2012
+++ loncom/interface/lonhtmlcommon.pm	Tue Mar 20 13:36:19 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.302 2012/02/29 09:58:21 foxr Exp $
+# $Id: lonhtmlcommon.pm,v 1.303 2012/03/20 13:36:19 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1072,6 +1072,8 @@
 
 sub crumbs {
     my ($uri,$target,$prefix,$form,$skiplast)=@_;
+# You cannot crumbnify uploaded or adm resources
+    if ($uri=~/^\/*(uploaded|adm)\//) { return &mt('(Internal Course/Group Content)'); }
     if ($target) {
         $target = ' target="'.
                   &Apache::loncommon::escape_single($target).'"';
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1160 loncom/lonnet/perl/lonnet.pm:1.1161
--- loncom/lonnet/perl/lonnet.pm:1.1160	Fri Mar 16 21:16:46 2012
+++ loncom/lonnet/perl/lonnet.pm	Tue Mar 20 13:36:22 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1160 2012/03/16 21:16:46 www Exp $
+# $Id: lonnet.pm,v 1.1161 2012/03/20 13:36:22 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9424,6 +9424,7 @@
 	if ($title) {
 # Remember both $symb and $title for dynamic metadata
             $accesshash{$symb.'___crstitle'}=$title;
+            $accesshash{&declutter($map).'___'.&declutter($url).'___usage'}=time;
 # Cache this title and then return it
 	    return &do_cache_new('title',$key,$title,600);
 	}