From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 1 Dec 2008 18:58:25 +0000 (+0000)
Subject: don't bother loading the static circ scripts if legacy circ support is disabled
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=067086702dea94d7b420acb657e0b4e88b1a8b88;p=Evergreen.git

don't bother loading the static circ scripts if legacy circ support is disabled

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11368 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 44675b22b6..a61b67a30b 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
@@ -17,19 +17,24 @@ sub initialize {
     my $self = shift;
     my $conf = OpenSRF::Utils::SettingsClient->new;
     my @pfx2 = ( "apps", "open-ils.circ","app_settings" );
-    my @pfx = ( @pfx2, "scripts" );
-
-    my $p       = $conf->config_value(  @pfx, 'circ_permit_patron' );
-    my $c       = $conf->config_value(  @pfx, 'circ_permit_copy' );
-    my $d       = $conf->config_value(  @pfx, 'circ_duration' );
-    my $f       = $conf->config_value(  @pfx, 'circ_recurring_fines' );
-    my $m       = $conf->config_value(  @pfx, 'circ_max_fines' );
-    my $pr  = $conf->config_value(  @pfx, 'circ_permit_renew' );
-    my $lb  = $conf->config_value(  @pfx2, 'script_path' );
 
     $legacy_script_support = $conf->config_value(@pfx2, 'legacy_script_support');
     $legacy_script_support = ($legacy_script_support and $legacy_script_support =~ /true/i);
 
+    my $lb  = $conf->config_value(  @pfx2, 'script_path' );
+    $lb = [ $lb ] unless ref($lb);
+    $script_libs = $lb;
+
+    return unless $legacy_script_support;
+
+    my @pfx = ( @pfx2, "scripts" );
+    my $p   = $conf->config_value(  @pfx, 'circ_permit_patron' );
+    my $c   = $conf->config_value(  @pfx, 'circ_permit_copy' );
+    my $d   = $conf->config_value(  @pfx, 'circ_duration' );
+    my $f   = $conf->config_value(  @pfx, 'circ_recurring_fines' );
+    my $m   = $conf->config_value(  @pfx, 'circ_max_fines' );
+    my $pr  = $conf->config_value(  @pfx, 'circ_permit_renew' );
+
     $logger->error( "Missing circ script(s)" ) 
         unless( $p and $c and $d and $f and $m and $pr );
 
@@ -40,9 +45,6 @@ sub initialize {
     $scripts{circ_max_fines}        = $m;
     $scripts{circ_permit_renew} = $pr;
 
-    $lb = [ $lb ] unless ref($lb);
-    $script_libs = $lb;
-
     $logger->debug(
         "circulator: Loaded rules scripts for circ: " .
         "circ permit patron = $p, ".