From 36830cb899b288fb90a47fad0efa195bc38da0ef Mon Sep 17 00:00:00 2001 From: erickson Date: Tue, 24 Jan 2006 23:34:09 +0000 Subject: [PATCH] made app name functions as well so the import of so many vars isn't necessary git-svn-id: svn://svn.open-ils.org/ILS/trunk@2821 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/support-scripts/oils_header.pl | 9 +++++++++ Open-ILS/src/support-scripts/test-scripts/simple.pl | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/support-scripts/oils_header.pl b/Open-ILS/src/support-scripts/oils_header.pl index 818925aca1..1d80e857d9 100755 --- a/Open-ILS/src/support-scripts/oils_header.pl +++ b/Open-ILS/src/support-scripts/oils_header.pl @@ -35,6 +35,15 @@ our $MATH = 'opensrf.math'; our $SETTINGS = 'opensrf.settings'; our $ACTOR = 'open-ils.actor'; +sub AUTH { return $AUTH; } +sub STORAGE { return $STORAGE; } +sub SEARCH { return $SEARCH; } +sub CIRC { return $CIRC; } +sub CAT { return $CAT; } +sub MATH { return $MATH; } +sub SETTINGS { return $SETTINGS; } +sub ACTOR { return $ACTOR; } + #---------------------------------------------------------------- # Exit a script diff --git a/Open-ILS/src/support-scripts/test-scripts/simple.pl b/Open-ILS/src/support-scripts/test-scripts/simple.pl index 6ee22cac7d..108445de86 100755 --- a/Open-ILS/src/support-scripts/test-scripts/simple.pl +++ b/Open-ILS/src/support-scripts/test-scripts/simple.pl @@ -5,15 +5,14 @@ #---------------------------------------------------------------- require '../oils_header.pl'; -use vars qw/ $apputils $memcache $user $authtoken $authtime - $AUTH $STORAGE $SEARCH $CIRC $CAT $MATH $SETTINGS $ACTOR /; +use vars qw/ $apputils $memcache $user $authtoken $authtime /; use strict; use warnings; my $config = $ARGV[0]; err( "usage: $0 " ) unless $config; osrf_connect($config); -my( $user, $evt ) = simplereq($STORAGE, 'open-ils.storage.direct.actor.user.retrieve', 1 ); +my( $user, $evt ) = simplereq( STORAGE(), 'open-ils.storage.direct.actor.user.retrieve', 1 ); oils_event_die($evt); # this user was not found / not all methods return events.. print debug($user); -- 2.43.2