[open-ils-commits] r14440 - branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-10-15 09:55:20 -0400 (Thu, 15 Oct 2009)
New Revision: 14440

Modified:
   branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
Log:
use inline penalty processing during fine generation to prevent duplicate penalties

Modified: branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
===================================================================
--- branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2009-10-15 13:52:57 UTC (rev 14439)
+++ branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2009-10-15 13:55:20 UTC (rev 14440)
@@ -768,13 +768,19 @@
 
 			$self->method_lookup('open-ils.storage.transaction.commit')->run;
 
-            if(0) { # caluclate penalties inline.  Needs to be tested.
-                OpenILS::Utils::Penalty->calculate_penalties(
-                    undef, $c->usr->to_fieldmapper->id.'', $c->circ_lib->to_fieldmapper->id.'');
+			if(1) { 
 
-            } else {
+                # Caluclate penalties inline
+				OpenILS::Utils::Penalty->calculate_penalties(
+					undef, $c->usr->to_fieldmapper->id.'', $c->circ_lib->to_fieldmapper->id.'');
 
-			    $penalty->request(
+			} else {
+
+                # Calculate penalties with an aysnc call to the penalty server.  This approach
+                # may lead to duplicate penalties since multiple penalty processes for a
+                # given user may be running at the same time. Leave this here for reference 
+                # in case we later find that asyc calls are needed in some environments.
+				$penalty->request(
 				    'open-ils.penalty.patron_penalty.calculate',
 				    { patronid	=> ''.$c->usr,
 				    context_org	=> ''.$c->circ_lib,