diff --git a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Dao/import/CcsSubscriber.pm b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Dao/import/CcsSubscriber.pm index 7146138..7f0f833 100644 --- a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Dao/import/CcsSubscriber.pm +++ b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Dao/import/CcsSubscriber.pm @@ -65,11 +65,11 @@ my $get_db = \&get_import_db; our @fieldnames = ( "service_number", "switch_number", - "icm", - "routing_type", + #"icm", + #"routing_type", "customer", - "target_number", - "comment", + #"target_number", + #"comment", 'rownum', ); diff --git a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Import.pm b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Import.pm index 31ea648..a76e0d1 100644 --- a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Import.pm +++ b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Import.pm @@ -5,8 +5,6 @@ use strict; use threads::shared qw(); -use Encode qw(); - use NGCP::BulkProcessor::Projects::Migration::UPCAT::Settings qw( $provision_mta_subscriber_rownum_start $import_multithreading @@ -46,6 +44,9 @@ use NGCP::BulkProcessor::LogError qw( use NGCP::BulkProcessor::FileProcessors::CSVFileSimple qw(); use NGCP::BulkProcessor::FileProcessors::XslxFileSimple qw(); +use NGCP::BulkProcessor::Projects::Migration::UPCAT::Dao::import::MtaSubscriber qw(); +use NGCP::BulkProcessor::Projects::Migration::UPCAT::Dao::import::CcsSubscriber qw(); + use NGCP::BulkProcessor::Projects::Migration::UPCAT::ProjectConnectorPool qw( get_import_db destroy_all_dbs @@ -235,6 +236,10 @@ sub _insert_mta_subscriber_rows { } + + + + sub import_ccs_subscriber { my ($file) = @_; @@ -245,7 +250,7 @@ sub import_ccs_subscriber { # ..none.. # prepare parse: - my $importer = NGCP::BulkProcessor::FileProcessors::XslxFileSimple->new(); #$user_password_import_numofthreads); + my $importer = NGCP::BulkProcessor::FileProcessors::CSVFileSimple->new(); #$user_password_import_numofthreads); my $upsert = _import_ccs_subscriber_reset_delta(); @@ -264,7 +269,6 @@ sub import_ccs_subscriber { next if (scalar @$row) == 0 or (scalar @$row) == 1; $row = [ map { local $_ = $_; trim($_); $_; } @$row ]; #Encode::encode('utf8',Encode::decode('cp1252',$_)); my $record = NGCP::BulkProcessor::Projects::Migration::UPCAT::Dao::import::CcsSubscriber->new($row); - next unless _import_ccs_subscriber_check_cancelled($context,$record); $record->{rownum} = $rownum; my %r = %$record; my @row_ext = @r{@NGCP::BulkProcessor::Projects::Migration::UPCAT::Dao::import::CcsSubscriber::fieldnames}; if ($context->{upsert}) { @@ -322,16 +326,6 @@ sub import_ccs_subscriber { } -sub _import_ccs_subscriber_check_cancelled { - my ($context,$subscriber) = @_; - my $comment = Encode::decode('utf8',$subscriber->{comment}) if defined $subscriber->{comment}; #mark as utf-8 - if (defined $comment and $subscriber->{comment} =~ /k(\x{00dc}|\x{00fc})ndig/i) { - _warn($context,"$subscriber->{customer} $subscriber->{service_number} $subscriber->{comment}, skipping"); - return 0; - } - return 1; -} - sub _import_ccs_subscriber_reset_delta { my $upsert = 0; if (NGCP::BulkProcessor::Projects::Migration::UPCAT::Dao::import::CcsSubscriber::countby_service_number() > 0) { @@ -369,8 +363,6 @@ sub _insert_ccs_subscriber_rows { - - sub _error { my ($context,$message) = @_; diff --git a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Settings.pm b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Settings.pm index f5aed7e..a24184f 100644 --- a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Settings.pm +++ b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/Settings.pm @@ -84,6 +84,7 @@ our @EXPORT_OK = qw( $ignore_ccs_subscriber_unique $provision_ccs_subscriber_rownum_start $ccs_subscriber_import_single_row_txn + $provision_ccs_subscriber_multithreading $provision_ccs_subscriber_numofthreads $ccs_reseller_name @@ -144,6 +145,7 @@ our $ccs_subscriber_filename = undef; our $ignore_ccs_subscriber_unique = 0; our $provision_ccs_subscriber_rownum_start = 0; our $ccs_subscriber_import_single_row_txn = 1; + our $provision_ccs_subscriber_multithreading = $enablemultithreading; our $provision_ccs_subscriber_numofthreads = $cpucount; diff --git a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/settings.cfg b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/settings.cfg index 3bba221..011fc02 100644 --- a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/settings.cfg +++ b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/settings.cfg @@ -29,7 +29,8 @@ report_filename = provision.txt #report_filename = provision_%s.json #default_channels = 1 -ccs_subscriber_filename = /home/rkrenn/temp/upcat/CCS_ICM_Nummern.xlsx +ccs_subscriber_filename = /home/rkrenn/temp/upcat/CCS_ICM_Nummern_reduced.csv +#/home/rkrenn/temp/upcat/CCS_ICM_Nummern.xlsx ignore_ccs_subscriber_unique = 0 provision_ccs_subscriber_rownum_start = 2 ccs_subscriber_import_single_row_txn = 1 diff --git a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/settings.debug.cfg b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/settings.debug.cfg index b6d50bb..a4f4a05 100644 --- a/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/settings.debug.cfg +++ b/lib/NGCP/BulkProcessor/Projects/Migration/UPCAT/settings.debug.cfg @@ -29,7 +29,8 @@ report_filename = provision.txt #report_filename = provision_%s.json #default_channels = 1 -ccs_subscriber_filename = /home/rkrenn/temp/upcat/CCS_ICM_Nummern.xlsx +ccs_subscriber_filename = /home/rkrenn/temp/upcat/CCS_ICM_Nummern_reduced.csv +#/home/rkrenn/temp/upcat/CCS_ICM_Nummern.xlsx ignore_ccs_subscriber_unique = 0 provision_ccs_subscriber_rownum_start = 2 ccs_subscriber_import_single_row_txn = 1