CStoreEditor batch_retrieve repairs

1. If the caller provides additional cstore params, like flesh,
flesh_fields, etc. make sure we only use the first component of the
search (the list of identifier values) for the cstore search.

2. Determine the identifier field from the class being retrieved instead
of hard-coding it to be "id"

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
index 48c6e39..18e1775 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
@@ -696,9 +696,20 @@ sub runmethod {
 
        } elsif( $action eq 'batch_retrieve' ) {
                $action = 'search';
-               @arg = ( { id => $arg } );
                $method =~ s/batch_retrieve/search/o;
                $method .= '.atomic';
+               my $tt = $type;
+               $tt =~ s/\./::/og;
+               my $fmobj = "Fieldmapper::$tt";
+               my $ident_field = $fmobj->Identity;
+
+               if (ref $arg[0] eq 'ARRAY') {
+                       # $arg looks like: ([1, 2, 3], {search_args})
+                       @arg = ( { $ident_field => $arg[0] }, @arg[1 .. $#arg] );
+               } else {
+                       # $arg looks like: [1, 2, 3]
+                       @arg = ( { $ident_field => $arg } );
+               }
 
        } elsif( $action eq 'retrieve_all' ) {
                $action = 'search';