updated to use new scriptbuilder

git-svn-id: svn://svn.open-ils.org/ILS/trunk@4812 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/support-scripts/test-scripts/circ_rules.pl b/Open-ILS/src/support-scripts/test-scripts/circ_rules.pl
index 3069cd9..237b393 100644 (file)
--- a/Open-ILS/src/support-scripts/test-scripts/circ_rules.pl
+++ b/Open-ILS/src/support-scripts/test-scripts/circ_rules.pl
@@ -2,14 +2,21 @@
 use strict; use warnings;
 use lib q|../../../perlmods/|;
 use OpenILS::Utils::ScriptRunner;
+use OpenILS::Utils::CStoreEditor qw/:funcs/;
+use OpenILS::Application::Circ::ScriptBuilder;
+use Time::HiRes qw/time/;
 require '../oils_header.pl';
 use vars qw/ $user $authtoken $apputils /;
 
+my $events                     = 'result.events';
+my $fatal_events       = 'result.fatalEvents';
+my $info_events        = 'result.infoEvents';
+
 
 # ---------------------------------------------------------------------
 # SCRIPT VARS
 # ----------------------------------------------------------------------
-my $patronid                                   = 4;
+my $patronid                                   = 3;
 my $copyid                                             = 8000107;
 my $patron_items_out                   = 11;
 my $patron_overdue_count       = 11;
@@ -24,23 +31,44 @@ my $non_cat_type                            = 1;
 
 
 
-
 my $bsconfig = shift;
 my $script = shift;
+
+die "$0: <bootstrap> <script>\n" unless $script;
+
 my $path;
 
 ($path, $script) = ($script =~ m#(/.*/)(.*)#);
 
 osrf_connect($bsconfig);
 
-my $evt                                = 'environment';
-my $fatal_events       = 'result.fatalEvents';
-my $info_events        = 'result.infoEvents';
-my $events                     = 'result.events';
+my $s = time;
+my $runner = OpenILS::Application::Circ::ScriptBuilder->build(
+       {
+               copy_id                                         => $copyid,
+               patron_id                                       => $patronid,
+               fetch_patron_circ_info  => 1,
+               _direct                                         => {
+                       isNonCat                => $is_non_cat,
+                       isRenewal       => $is_renewal,
+                       nonCatType      => $non_cat_type,
+               }
+       }
+);
 
-my $runner = load_runner();
-$runner->add_path($path);
 
+# ---------------------------------------------------------------------
+# Override the default log functions for convenience
+# ---------------------------------------------------------------------
+$runner->insert(log_activity   => sub { print "@_\n"; return 1;} );
+$runner->insert(log_error              => sub { print "@_\n"; return 1;} );
+$runner->insert(log_warn               => sub { print "@_\n"; return 1;} );
+$runner->insert(log_info               => sub { print "@_\n"; return 1;} );
+$runner->insert(log_debug              => sub { print "@_\n"; return 1;} );
+$runner->insert(log_internal   => sub { print "@_\n"; return 1;} );
+
+
+$runner->add_path($path);
 
 
 # ---------------------------------------------------------------------
@@ -51,7 +79,7 @@ print "\n" . '-'x70 . "\n";
 
 $runner->load($script);
 $runner->run or die "Script died: $@";
-
+my $end = time - $s;
 
 
 # ---------------------------------------------------------------------
@@ -63,6 +91,8 @@ show_events( 'events', $runner->retrieve($events));
 show_events( 'fatal_events', $runner->retrieve($fatal_events));
 show_events( 'info_events', $runner->retrieve($info_events));
 
+print "\ntime = $end\n";
+
 
 sub show_events {
        my $t = shift;
@@ -81,84 +111,9 @@ print "\n";
 
 
 
-# ---------------------------------------------------------------------
-# Fetch data and build the script runner
-# ---------------------------------------------------------------------
-
-sub load_runner {
-
-       my( $patron, $copy, $org, $e );
-
-
-       ($patron, $e) = $apputils->fetch_user($patronid);
-       oils_event_die($e);
-
-       ($org, $e) = $apputils->fetch_org_unit($patron->home_ou);       
-       oils_event_die($e);
-
-       $patron->home_ou($org);
-
-       ($copy, $e) = $apputils->fetch_copy($copyid);
-       oils_event_die($e);
-
-       my $groups = $apputils->fetch_permission_group_tree();
-       $patron->profile( _get_patron_profile($patron, $groups));
-
-       my $cp_stats = $apputils->fetch_copy_statuses();
-       $copy->status( _get_copy_status($copy, $cp_stats) );
-
-       my $runner = OpenILS::Utils::ScriptRunner->new;
-       
-       $runner->insert( "$evt.patronOverdueCount", $patron_overdue_count );
-       $runner->insert( "$evt.patronItemsOut", $patron_items_out );
-       $runner->insert( "$evt.patronFines", $patron_fines );
-       $runner->insert( "$evt.isRenewal", $is_renewal );
-       $runner->insert( "$evt.isNonCat", $is_non_cat );
-       $runner->insert( "$evt.isHold", $is_hold );
-       $runner->insert( "$evt.nonCatType", $non_cat_type );
-       $runner->insert( "$evt.patron", $patron );
-       $runner->insert( "$evt.copy", $copy );
-       $runner->insert( $fatal_events, [] );
-       $runner->insert( $info_events, [] );
-       $runner->insert( $events, [] );
-
-       # ---------------------------------------------------------------------
-       # Override the default log functions for convenience
-       # ---------------------------------------------------------------------
-       $runner->insert(log_activity    => sub { print "@_\n"; return 1;} );
-       $runner->insert(log_error               => sub { print "@_\n"; return 1;} );
-       $runner->insert(log_warn                => sub { print "@_\n"; return 1;} );
-       $runner->insert(log_info                => sub { print "@_\n"; return 1;} );
-       $runner->insert(log_debug               => sub { print "@_\n"; return 1;} );
-       $runner->insert(log_internal    => sub { print "@_\n"; return 1;} );
-       
-       return $runner;
-}
-
-
-# ---------------------------------------------------------------------
-# Utility code for fleshing objects
-# ---------------------------------------------------------------------
-sub _get_patron_profile { 
-       my( $patron, $group_tree ) = @_;
-       return $group_tree if ($group_tree->id eq $patron->profile);
-       return undef unless ($group_tree->children);
-       for my $child (@{$group_tree->children}) {
-               my $ret = _get_patron_profile( $patron, $child );
-               return $ret if $ret;
-       }
-       return undef;
-}
-
-
-sub _get_copy_status {
-       my( $copy, $cstatus ) = @_;
-       my $s = undef;
-       for my $status (@$cstatus) {
-               $s = $status if( $status->id eq $copy->status )
-       }
-       return $s;
-}
-
+# don't forget these..
+#$runner->insert( "$evt.isRenewal", $is_renewal );
+#$runner->insert( "$evt.isNonCat", $is_non_cat );
+#$runner->insert( "$evt.isHold", $is_hold );
+#$runner->insert( "$evt.nonCatType", $non_cat_type );
 
-