arg! cdbi is getting complex... need to restructure

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
index 4e707fe..7f192be 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
@@ -298,11 +298,13 @@ sub modify_from_fieldmapper {
        actor::stat_cat_entry->has_a( stat_cat => 'actor::stat_cat' );
        actor::stat_cat->has_many( entries => 'actor::stat_cat_entry' );
        actor::stat_cat_entry_user_map->has_a( stat_cat => 'actor::stat_cat' );
+       actor::stat_cat_entry_user_map->has_a( stat_cat_entry => 'actor::stat_cat_entry' );
        actor::stat_cat_entry_user_map->has_a( target_usr => 'actor::user' );
 
        asset::stat_cat_entry->has_a( stat_cat => 'asset::stat_cat' );
        asset::stat_cat->has_many( entries => 'asset::stat_cat_entry' );
        asset::stat_cat_entry_copy_map->has_a( stat_cat => 'asset::stat_cat' );
+       asset::stat_cat_entry_copy_map->has_a( stat_cat_entry => 'asset::stat_cat_entry' );
        asset::stat_cat_entry_copy_map->has_a( owning_copy => 'asset::copy' );
 
        action::survey_response->has_a( usr => 'actor::user' );
@@ -317,6 +319,8 @@ sub modify_from_fieldmapper {
        asset::copy_note->has_a( owning_copy => 'asset::copy' );
 
        actor::user->has_many( stat_cat_entries => [ 'actor::stat_cat_entry_user_map' => 'stat_cat_entry' ] );
+       actor::user->has_many( stat_cat_entry_user_maps => 'actor::stat_cat_entry_user_map' );
+
        asset::copy->has_many( stat_cat_entries => [ 'asset::stat_cat_entry_copy_map' => 'stat_cat_entry' ] );
        asset::copy->has_many( stat_cat_entry_copy_maps => 'asset::stat_cat_entry_copy_map' );
 

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
index aa7fb49..81fc60e 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
@@ -40,11 +40,7 @@ sub fleshed_copy {
                $cp_fm->circ_lib( $cp->circ_lib->to_fieldmapper );
                $cp_fm->location( $cp->location->to_fieldmapper );
                $cp_fm->status( $cp->status->to_fieldmapper );
-               my @scs;
-               for my $map ( $cp->stat_cat_entry_copy_maps ) {
-                       push @scs, $map->to_fieldmapper;
-               }
-               $cp_fm->stat_cat_entries( \@scs );
+               $cp_fm->stat_cat_entries( [ map { $_->to_fieldmapper } $cp->stat_cat_entries ] );
 
                $client->respond( $cp_fm );
        }