Fix bad merge, regret being up this late

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Serial.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Serial.pm
index 6031659..7325875 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Serial.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Serial.pm
@@ -96,7 +96,7 @@ sub bib_to_mfhd_hash {
        }
 
        my $u = OpenILS::Utils::MFHDParser->new();
-       $mfhd_hash = $u->generate_svr( $mfhd[0][0]->{marc} );
+       $mfhd_hash = $u->generate_svr( $mfhd[0][0]->{id}, $mfhd[0][0]->{marc}, $mfhd[0][0]->{owning_lib} );
 
        return $mfhd_hash;
 }
@@ -121,32 +121,6 @@ sub bib_to_mfhd {
 
        my $u = OpenILS::Utils::MFHDParser->new();
        foreach (@$serials) {
-               push(@$mfhd, $u->generate_svr($_->marc));
-       }
-
-       return $mfhd;
-}
-
-__PACKAGE__->register_method(
-       method  => "bib_to_mfhd",
-       api_name        => "open-ils.search.serial.record.bib.retrieve",
-       argc            => 1, 
-       note            => "Given a bibliographic record ID, return MFHD holdings"
-);
-
-sub bib_to_mfhd {
-       my ($self, $client, $bib) = @_;
-       
-       my $mfhd;
-
-       my $e = OpenILS::Utils::CStoreEditor->new();
-       my $serials = $e->search_serial_record_entry({ record => $bib });
-       if (!ref $serials) {
-               return undef;
-       }
-
-       my $u = OpenILS::Utils::MFHDParser->new();
-       foreach (@$serials) {
                push(@$mfhd, $u->generate_svr($_->id, $_->marc, $_->owning_lib));
        }