[open-ils-commits] r9655 - in branches/acq-experiment: . Open-ILS/src/perlmods/OpenILS/Application

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-05-21 12:46:49 -0400 (Wed, 21 May 2008)
New Revision: 9655

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
Log:
Merged revisions 9654 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r9654 | miker | 2008-05-21 12:37:30 -0400 (Wed, 21 May 2008) | 1 line
  
  allow differentiation of orgtree cache keys; use this to cache per-locale trees
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-9652
   + /trunk:1-9654

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2008-05-21 16:37:30 UTC (rev 9654)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2008-05-21 16:46:49 UTC (rev 9655)
@@ -1035,8 +1035,9 @@
 );
 
 sub get_org_tree {
-	my( $self, $client) = @_;
-    return $U->get_org_tree();
+	my $self = shift;
+	my $client = shift;
+    return $U->get_org_tree($client->session->session_locale);
 }
 
 

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm	2008-05-21 16:37:30 UTC (rev 9654)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm	2008-05-21 16:46:49 UTC (rev 9655)
@@ -1368,8 +1368,9 @@
 }
 
 sub get_org_tree {
+	my $cache_diff = shift || '';
 	my $cache = OpenSRF::Utils::Cache->new("global", 0);
-	my $tree = $cache->get_cache('orgtree');
+	my $tree = $cache->get_cache("orgtree.$cache_diff");
 	return $tree if $tree;
 
 	$tree = OpenILS::Utils::CStoreEditor->new->search_actor_org_unit( 
@@ -1383,7 +1384,7 @@
 		]
 	)->[0];
 
-	$cache->put_cache('orgtree', $tree);
+	$cache->put_cache("orgtree.$cache_diff", $tree);
 	return $tree;
 }