diff --git a/lib/NGCP/BulkProcessor/Logging.pm b/lib/NGCP/BulkProcessor/Logging.pm index 49a787a..a0f2c49 100644 --- a/lib/NGCP/BulkProcessor/Logging.pm +++ b/lib/NGCP/BulkProcessor/Logging.pm @@ -38,7 +38,9 @@ our @EXPORT_OK = qw( attachmentdownloaderinfo fieldnamesaquired + fieldnamesacquired primarykeycolsaquired + primarykeycolsacquired tableinfoscleared tabletransferstarted tableprocessingstarted @@ -337,7 +339,10 @@ sub xls2csvinfo { } -sub fieldnamesaquired { +# Backwards compatibility alias. +*fieldnamesaquired = \&fieldnamesacquired; + +sub fieldnamesacquired { my ($db,$tablename,$logger) = @_; if (defined $logger) { @@ -346,7 +351,10 @@ sub fieldnamesaquired { } -sub primarykeycolsaquired { +# Backwards compatibility alias. +*primarykeycolsaquired = \&primarykeycolsacquired; + +sub primarykeycolsacquired { my ($db,$tablename,$keycols,$logger) = @_; if (defined $logger) { diff --git a/lib/NGCP/BulkProcessor/SqlProcessor.pm b/lib/NGCP/BulkProcessor/SqlProcessor.pm index 06422ff..5c52f03 100644 --- a/lib/NGCP/BulkProcessor/SqlProcessor.pm +++ b/lib/NGCP/BulkProcessor/SqlProcessor.pm @@ -19,8 +19,8 @@ use NGCP::BulkProcessor::Globals qw( use NGCP::BulkProcessor::Logging qw( getlogger - fieldnamesaquired - primarykeycolsaquired + fieldnamesacquired + primarykeycolsacquired tableinfoscleared tablefixed @@ -334,7 +334,7 @@ sub checktableinfo { or setcontains($table_expected_fieldnames->{$tid}->{$connectidentifier}->{$class},$fieldnames,1)) { #fieldnames are case insensitive in general $table_fieldnames_cached->{$tid}->{$connectidentifier}->{$class} = { fieldnames => $fieldnames, ok => 1, }; - fieldnamesaquired($db,$tablename,getlogger(__PACKAGE__)); + fieldnamesacquired($db,$tablename,getlogger(__PACKAGE__)); } else { # otherwise we log a failure (exit? - see Logging Module) #$table_fieldnames_cached->{$connectidentifier}->{$tablename} = {}; #$fieldnames; @@ -361,7 +361,7 @@ sub checktableinfo { # query the database for primary keys of the table if we don't have them cached yet: #$table_primarykeys->{$tid}->{$connectidentifier}->{$class} = shared_clone($db->getprimarykeycols($class)); $table_primarykeys->{$tid}->{$connectidentifier}->{$class} = $db->getprimarykeycols($tablename); - primarykeycolsaquired($db,$tablename,$table_primarykeys->{$tid}->{$connectidentifier}->{$class},getlogger(__PACKAGE__)); + primarykeycolsacquired($db,$tablename,$table_primarykeys->{$tid}->{$connectidentifier}->{$class},getlogger(__PACKAGE__)); } if (not exists $table_target_indexes->{$tid}) {