From da6f156e68729404a5b14723ad333245067fa0c7 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 28 Sep 2012 08:39:58 -0400 Subject: [PATCH] Bug 8015 - Add MARC Modifications Templates - Followup Content-Type: text/plain; charset="utf-8" --- {Koha => C4}/MarcModificationTemplates.pm | 24 ++++++++++++------------ tools/marc_modification_templates.pl | 2 +- tools/stage-marc-import.pl | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) rename {Koha => C4}/MarcModificationTemplates.pm (93%) diff --git a/Koha/MarcModificationTemplates.pm b/C4/MarcModificationTemplates.pm similarity index 93% rename from Koha/MarcModificationTemplates.pm rename to C4/MarcModificationTemplates.pm index 86a03e6..2c8bbaf 100644 --- a/Koha/MarcModificationTemplates.pm +++ b/C4/MarcModificationTemplates.pm @@ -1,4 +1,4 @@ -package Koha::MarcModificationTemplates; +package C4::MarcModificationTemplates; # Copyright 2010 Kyle M Hall # @@ -58,7 +58,7 @@ BEGIN { =head1 NAME -Koha::MarcModificationTemplates - Module to manage MARC Modification Templates +C4::MarcModificationTemplates - Module to manage MARC Modification Templates =head1 DESCRIPTION @@ -79,8 +79,8 @@ files telling Koha what fields to insert data into. sub GetModificationTemplates { my ( $template_id ) = @_; - C4::Koha::Log("Koha::MarcModificationTemplates::GetModificationTemplates( $template_id )") if DEBUG; - warn("Koha::MarcModificationTemplates::GetModificationTemplates( $template_id )") if DEBUG; + C4::Koha::Log("C4::MarcModificationTemplates::GetModificationTemplates( $template_id )") if DEBUG; + warn("C4::MarcModificationTemplates::GetModificationTemplates( $template_id )") if DEBUG; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("SELECT * FROM marc_modification_templates"); @@ -187,8 +187,8 @@ sub GetModificationTemplateAction { sub GetModificationTemplateActions { my ( $template_id ) = @_; - C4::Koha::Log( "Koha::MarcModificationTemplates::GetModificationTemplateActions( $template_id )" ) if DEBUG; - warn( "Koha::MarcModificationTemplates::GetModificationTemplateActions( $template_id )" ) if DEBUG; + C4::Koha::Log( "C4::MarcModificationTemplates::GetModificationTemplateActions( $template_id )" ) if DEBUG; + warn( "C4::MarcModificationTemplates::GetModificationTemplateActions( $template_id )" ) if DEBUG; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("SELECT * FROM marc_modification_template_actions WHERE template_id = ? ORDER BY ordering"); @@ -241,11 +241,11 @@ sub AddModificationTemplateAction { $description ) = @_; - C4::Koha::Log( "Koha::MarcModificationTemplates::AddModificationTemplateAction( $template_id, $action, + C4::Koha::Log( "C4::MarcModificationTemplates::AddModificationTemplateAction( $template_id, $action, $field_number, $from_field, $from_subfield, $field_value, $to_field, $to_subfield, $to_regex, $conditional, $conditional_field, $conditional_subfield, $conditional_comparison, $conditional_value, $conditional_regex, $description )" ) if DEBUG; - warn( "Koha::MarcModificationTemplates::AddModificationTemplateAction( $template_id, $action, + warn( "C4::MarcModificationTemplates::AddModificationTemplateAction( $template_id, $action, $field_number, $from_field, $from_subfield, $field_value, $to_field, $to_subfield, $to_regex, $conditional, $conditional_field, $conditional_subfield, $conditional_comparison, $conditional_value, $conditional_regex, $description )" ) if DEBUG; @@ -475,8 +475,8 @@ sub MoveModificationTemplateAction { sub ModifyRecordsWithTemplate { my ( $template_id, $batch ) = @_; - C4::Koha::Log( "Koha::MarcModificationTemplates::ModifyRecordsWithTemplate( $template_id, $batch )" ) if DEBUG; - warn( "Koha::MarcModificationTemplates::ModifyRecordsWithTemplate( $template_id, $batch )" ) if DEBUG; + C4::Koha::Log( "C4::MarcModificationTemplates::ModifyRecordsWithTemplate( $template_id, $batch )" ) if DEBUG; + warn( "C4::MarcModificationTemplates::ModifyRecordsWithTemplate( $template_id, $batch )" ) if DEBUG; while ( my $record = $batch->next() ) { ModifyRecordWithTemplate( $template_id, $record ); @@ -494,8 +494,8 @@ sub ModifyRecordsWithTemplate { sub ModifyRecordWithTemplate { my ( $template_id, $record ) = @_; - C4::Koha::Log( "Koha::MarcModificationTemplates::ModifyRecordWithTemplate( $template_id, $record )" ) if DEBUG; - warn( "Koha::MarcModificationTemplates::ModifyRecordWithTemplate( $template_id, $record )" ) if DEBUG; + C4::Koha::Log( "C4::MarcModificationTemplates::ModifyRecordWithTemplate( $template_id, $record )" ) if DEBUG; + warn( "C4::MarcModificationTemplates::ModifyRecordWithTemplate( $template_id, $record )" ) if DEBUG; C4::Koha::Log( "Unmodified Record:\n" . $record->as_formatted() ) if DEBUG >= 10; warn( "Unmodified Record:\n" . $record->as_formatted() ) if DEBUG >= 10; diff --git a/tools/marc_modification_templates.pl b/tools/marc_modification_templates.pl index 60a28cf..d3a4d8c 100755 --- a/tools/marc_modification_templates.pl +++ b/tools/marc_modification_templates.pl @@ -24,7 +24,7 @@ use CGI; use C4::Auth; use C4::Koha; use C4::Output; -use Koha::MarcModificationTemplates; +use C4::MarcModificationTemplates; my $cgi = new CGI; diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl index 86e5bbc..8d6ab1a 100755 --- a/tools/stage-marc-import.pl +++ b/tools/stage-marc-import.pl @@ -41,7 +41,7 @@ use C4::ImportBatch; use C4::Matcher; use C4::UploadedFile; use C4::BackgroundJob; -use Koha::MarcModificationTemplates; +use C4::MarcModificationTemplates; my $input = new CGI; my $dbh = C4::Context->dbh; -- 1.7.2.5