Changeset 33020 for main/trunk

Timestamp:

2019-04-19T20:37:28+12:00 (5 years ago)

Author:

davidb

Message:

Refactored

Location:

main/trunk/model-sites-dev/heritage-nz/collect/reports-2019/perllib/plugins

Files:

• CSVFieldSeparator.pm (modified) (1 diff)
• CSVPlugin.pm (modified) (1 diff)
• MetadataCSVPlugin.pm (modified) (1 diff)

main/trunk/model-sites-dev/heritage-nz/collect/reports-2019/perllib/plugins/CSVFieldSeparator.pm

@@ -75 +75 @@
 {
     my ($self) = shift @_;
-    my ($line,$plugin_name,$outhandle,$verbosity) = @_;
+    my ($line,$plugin_name) = @_;
  
+    my $outhandle = $self->{'outhandle'};
+    my $verbosity = $self->{'verbosity'};
 
     # count number of char matches for common separates such as ',' ';' '\t' and '|'

main/trunk/model-sites-dev/heritage-nz/collect/reports-2019/perllib/plugins/CSVPlugin.pm

@@ -118 +118 @@
     my $separate_char = $self->{'csv_field_separator'};
     if ($separate_char =~ m/^auto$/i) {
-    $separate_char = $self->resolve_auto($csv_file_field_line,$self->{'plugin_type'},$self->{'outhandle'},$self->{'verbosity'});
+    $separate_char = $self->resolve_auto($csv_file_field_line,$self->{'plugin_type'});
     # Replace the 'auto' setting the resolved value (for use later on)
     $self->{'separate_char'} = $separate_char;

main/trunk/model-sites-dev/heritage-nz/collect/reports-2019/perllib/plugins/MetadataCSVPlugin.pm

@@ -153 +153 @@
 
     if ($separate_char =~ m/^auto$/i) {
-    $separate_char = $self->resolve_auto($csv_file_field_line,$self->{'plugin_type'},$outhandle,$self->{'verbosity'});
+    $separate_char = $self->resolve_auto($csv_file_field_line,$self->{'plugin_type'});
     }