From: erickson Date: Fri, 7 Jul 2006 17:03:56 +0000 (+0000) Subject: now only useing one script to get circ duration, max fines, and recurring fines info X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0402897e3cc27ff4008e34fb0378a682af19c2ed;p=Evergreen.git now only useing one script to get circ duration, max fines, and recurring fines info git-svn-id: svn://svn.open-ils.org/ILS/trunk@4931 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm index a86609901a..dc33c58094 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm @@ -868,28 +868,30 @@ sub _run_checkout_scripts { my $runner = $ctx->{runner}; - $runner->insert('result.durationLevel'); - $runner->insert('result.durationRule'); - $runner->insert('result.recurringFinesRule'); - $runner->insert('result.recurringFinesLevel'); - $runner->insert('result.maxFine'); +# $runner->insert('result.durationLevel'); +# $runner->insert('result.durationRule'); +# $runner->insert('result.recurringFinesRule'); +# $runner->insert('result.recurringFinesLevel'); +# $runner->insert('result.maxFine'); $runner->load($scripts{circ_duration}); - my $result = $runner->run or throw OpenSRF::EX::ERROR ("Circ Duration Script Died: $@"); - my $duration = $result->{durationRule}; - my $dur_level = $result->{durationLevel}; - $logger->debug("Circ duration script yielded a duration rule of: $duration"); - - $runner->load($scripts{circ_recurring_fines}); - $result = $runner->run or throw OpenSRF::EX::ERROR ("Circ Recurring Fines Script Died: $@"); - my $recurring = $result->{recurringFinesRule}; + my $result = $runner->run or throw OpenSRF::EX::ERROR ("Circ Duration Script Died: $@"); + my $duration = $result->{durationRule}; + my $dur_level = $result->{durationLevel}; + my $recurring = $result->{recurringFinesRule}; my $rec_fines_level = $result->{recurringFinesLevel}; - $logger->debug("Circ recurring fines script yielded a rule of: $recurring"); - - $runner->load($scripts{circ_max_fines}); - $result = $runner->run or throw OpenSRF::EX::ERROR ("Circ Max Fine Script Died: $@"); - my $max_fine = $result->{maxFine}; - $logger->debug("Circ max_fine fines script yielded a rule of: $max_fine"); + my $max_fine = $result->{maxFine}; + +# $runner->load($scripts{circ_recurring_fines}); +# $result = $runner->run or throw OpenSRF::EX::ERROR ("Circ Recurring Fines Script Died: $@"); +# my $recurring = $result->{recurringFinesRule}; +# my $rec_fines_level = $result->{recurringFinesLevel}; +# $logger->debug("Circ recurring fines script yielded a rule of: $recurring"); + +# $runner->load($scripts{circ_max_fines}); +# $result = $runner->run or throw OpenSRF::EX::ERROR ("Circ Max Fine Script Died: $@"); +# my $max_fine = $result->{maxFine}; +# $logger->debug("Circ max_fine fines script yielded a rule of: $max_fine"); ($duration, $evt) = $U->fetch_circ_duration_by_name($duration); return $evt if $evt;