From ac21f2eb4f45103acafa89513fb92e49a6efc5b4 Mon Sep 17 00:00:00 2001
From: Scott Prater <sprater@gmail.com>
Date: Tue, 27 Dec 2011 15:56:25 -0600
Subject: [PATCH] Patron Stat Cat Enhancements: Add Publisher actor methods for
stat_cat_entry_default objects.
Add methods actor_stat_cat_entry_default and actor_stat_cat_entry_default_ancestor
to retrieve and populate stat_cat_entry_default objects. Modify ranged_actor_stat_cat_entry
and fleshed_actor_stat_cat to also include default entry objects, if present.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
---
.../OpenILS/Application/Storage/Publisher/actor.pm | 71 +++++++++++++++++++++-
1 file changed, 70 insertions(+), 1 deletion(-)
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm
index c638e1cbc4..d41dfcc735 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm
@@ -946,6 +946,7 @@ sub fleshed_actor_stat_cat {
my $sc_fm = $cat->to_fieldmapper;
$sc_fm->entries( [ map { $_->to_fieldmapper } $cat->entries ] );
+ $sc_fm->default_entries( [ map { $_->to_fieldmapper } $cat->default_entries ] );
$client->respond( $sc_fm );
@@ -995,6 +996,9 @@ sub ranged_actor_stat_cat_all {
$sc_fm->entries(
[ $self->method_lookup( 'open-ils.storage.ranged.actor.stat_cat_entry.search.stat_cat' )->run($ou,$sc->id) ]
) if ($fleshed);
+ $sc_fm->default_entries(
+ [ $self->method_lookup( 'open-ils.storage.actor.stat_cat_entry_default.ancestor.retrieve' )->run($ou,$sc->id) ]
+ ) if ($fleshed);
$client->respond( $sc_fm );
}
@@ -1038,7 +1042,8 @@ sub ranged_actor_stat_cat_entry {
$sth->execute($ou,$sc);
for my $sce ( map { actor::stat_cat_entry->construct($_) } $sth->fetchall_hash ) {
- $client->respond( $sce->to_fieldmapper );
+ my $sce_fm = $sce->to_fieldmapper;
+ $client->respond( $sce_fm );
}
return undef;
@@ -1050,5 +1055,69 @@ __PACKAGE__->register_method(
method => 'ranged_actor_stat_cat_entry',
);
+sub actor_stat_cat_entry_default {
+ my $self = shift;
+ my $client = shift;
+ my $ou = ''.shift();
+ my $sc = ''.shift();
+
+ return undef unless ($ou);
+ my $s_table = actor::stat_cat_entry_default->table;
+
+ my $select = <<" SQL";
+ SELECT s.*
+ FROM $s_table s
+ WHERE owner = ? AND stat_cat = ?
+ SQL
+
+ my $sth = actor::stat_cat->db_Main->prepare_cached($select);
+ $sth->execute($ou,$sc);
+
+ for my $sced ( map { actor::stat_cat_entry_default->construct($_) } $sth->fetchall_hash ) {
+ $client->respond( $sced->to_fieldmapper );
+ }
+
+ return undef;
+}
+__PACKAGE__->register_method(
+ api_name => 'open-ils.storage.actor.stat_cat_entry_default.retrieve',
+ api_level => 1,
+ stream => 1,
+ method => 'actor_stat_cat_entry_default',
+);
+
+sub actor_stat_cat_entry_default_ancestor {
+ my $self = shift;
+ my $client = shift;
+ my $ou = ''.shift();
+ my $sc = ''.shift();
+
+ return undef unless ($ou);
+ my $s_table = actor::stat_cat_entry_default->table;
+
+ my $select = <<" SQL";
+ SELECT s.*
+ FROM $s_table s
+ JOIN actor.org_unit_ancestors(?) p ON (p.id = s.owner)
+ WHERE stat_cat = ?
+ SQL
+
+ my $sth = actor::stat_cat->db_Main->prepare_cached($select);
+ $sth->execute($ou,$sc);
+
+ my @sced = map { actor::stat_cat_entry_default->construct($_) } $sth->fetchall_hash;
+
+ my $ancestor_sced = pop @sced;
+
+ $client->respond( $ancestor_sced->to_fieldmapper ) if $ancestor_sced;
+
+ return undef;
+}
+__PACKAGE__->register_method(
+ api_name => 'open-ils.storage.actor.stat_cat_entry_default.ancestor.retrieve',
+ api_level => 1,
+ stream => 1,
+ method => 'actor_stat_cat_entry_default_ancestor',
+);
1;
--
2.11.0