From 9c49641b749047d7c886e3ed0e289d997cb15721 Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 4 Sep 2009 20:50:35 +0000 Subject: [PATCH] there's no valid reason to call ingest from within the bib create/overlay code before the changes have been committed. removed embedded ingest logic and the no-ingest flags passed by everyone that uses them git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@13981 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../src/perlmods/OpenILS/Application/Acq/Financials.pm | 2 +- Open-ILS/src/perlmods/OpenILS/Application/Acq/Order.pm | 4 +--- Open-ILS/src/perlmods/OpenILS/Application/Cat.pm | 5 ++--- .../src/perlmods/OpenILS/Application/Cat/BibCommon.pm | 16 ++-------------- Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm | 4 ++-- 5 files changed, 8 insertions(+), 23 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm index 54e7a7216e..8f353662dd 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm @@ -597,7 +597,7 @@ sub create_lineitem_assets_impl { unless($li->eg_bib_id) { my $record = OpenILS::Application::Cat::BibCommon->biblio_record_xml_import( - $e, $li->marc, undef, undef, undef, 1); #$rec->bib_source + $e, $li->marc); #$rec->bib_source if($U->event_code($record)) { $e->rollback; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Order.pm b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Order.pm index 9c60eb8753..f027a37a17 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Order.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Order.pm @@ -776,11 +776,9 @@ sub create_bib { my $record = OpenILS::Application::Cat::BibCommon->biblio_record_xml_import( $mgr->editor, $li->marc, - undef, + undef, # bib source undef, 1, # override tcn collisions - 1, # no-ingest - undef # $rec->bib_source ); if($U->event_code($record)) { diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm index b4c2c57ccd..f18e63139d 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm @@ -160,12 +160,11 @@ sub biblio_record_replace_marc { return $e->die_event unless $e->checkauth; return $e->die_event unless $e->allowed('CREATE_MARC', $e->requestor->ws_ou); - my $no_ingest = 1; my $fix_tcn = $self->api_name =~ /replace/o; my $override = $self->api_name =~ /override/o; my $res = OpenILS::Application::Cat::BibCommon->biblio_record_replace_marc( - $e, $recid, $newxml, $source, $fix_tcn, $override, $no_ingest); + $e, $recid, $newxml, $source, $fix_tcn, $override); $e->commit unless $U->event_code($res); @@ -257,7 +256,7 @@ sub biblio_record_xml_import { my $override = $self->api_name =~ /override/; my $record = OpenILS::Application::Cat::BibCommon->biblio_record_xml_import( - $e, $xml, $source, $auto_tcn, $override, 1); + $e, $xml, $source, $auto_tcn, $override); return $record if $U->event_code($record); diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat/BibCommon.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat/BibCommon.pm index a60fce4f70..3ad0343b45 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Cat/BibCommon.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat/BibCommon.pm @@ -36,7 +36,7 @@ sub fetch_bib_sources { sub biblio_record_replace_marc { - my($class, $e, $recid, $newxml, $source, $fixtcn, $override, $noingest) = @_; + my($class, $e, $recid, $newxml, $source, $fixtcn, $override) = @_; my $rec = $e->retrieve_biblio_record_entry($recid) or return $e->die_event; @@ -70,17 +70,11 @@ sub biblio_record_replace_marc { $rec->marc( $U->entityize( $marcdoc->documentElement->toString ) ); $e->update_biblio_record_entry($rec) or return $e->die_event; - unless ($noingest) { - # we don't care about the result, just fire off the request - my $ses = OpenSRF::AppSession->create('open-ils.ingest'); - $ses->request('open-ils.ingest.full.biblio.record', $recid); - } - return $rec; } sub biblio_record_xml_import { - my($class, $e, $xml, $source, $auto_tcn, $override, $noingest) = @_; + my($class, $e, $xml, $source, $auto_tcn, $override) = @_; my( $evt, $tcn, $tcn_source, $marcdoc ); @@ -109,12 +103,6 @@ sub biblio_record_xml_import { $record = $e->create_biblio_record_entry($record) or return $e->die_event; $logger->info("marc create/import created new record ".$record->id); - unless ($noingest) { - # we don't care about the result, just fire off the request - my $ses = OpenSRF::AppSession->create('open-ils.ingest'); - $ses->request('open-ils.ingest.full.biblio.record', $record->id); - } - return $record; } diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm index 563851b9f1..8c0f974f7c 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm @@ -569,11 +569,11 @@ sub import_record_list_impl { if(defined $overlay_target) { $logger->info("vl: overlaying record $overlay_target"); $record = OpenILS::Application::Cat::BibCommon->biblio_record_replace_marc( - $e, $overlay_target, $rec->marc, undef, undef, undef, 1); #$rec->bib_source + $e, $overlay_target, $rec->marc); #$rec->bib_source } else { $logger->info("vl: importing new record"); $record = OpenILS::Application::Cat::BibCommon->biblio_record_xml_import( - $e, $rec->marc, undef, undef, undef, 1); #$rec->bib_source + $e, $rec->marc); #$rec->bib_source } if($U->event_code($record)) { -- 2.11.0