Changeset 32812

Timestamp:

2019-02-25T22:06:06+13:00 (5 years ago)

Author:

davidb

Message:

Refactored to use inheritance

Location:

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

Files:

• CSVFieldSeparator.pm (added)
• CSVPlugin.pm (modified) (5 diffs)
• MetadataCSVPlugin.pm (modified) (5 diffs)

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

@@ -29 +29 @@
 use SplitTextFile;
 use MetadataRead;
+use CSVFieldSeparator;
+
 use strict;
 no strict 'refs'; # allow filehandles to be variables and viceversa
@@ -36 +38 @@
 # CSVPlugin is a sub-class of SplitTextFile.
 sub BEGIN {
-    @CSVPlugin::ISA = ('MetadataRead', 'SplitTextFile');
+    @CSVPlugin::ISA = ('MetadataRead', 'SplitTextFile', 'CSVFieldSeparator');
 }
 
@@ -42 +44 @@
 my $arguments = 
     [ 
-      { 'name' => "separate_char",
-    'desc' => "{CSVPlugin.separate_char}",
-    'type' => "string",
-    'deft' => "auto",
-    'reqd' => "no" },
       { 'name' => "process_exp",
     'desc' => "{BaseImporter.process_exp}",
@@ -90 +87 @@
     push(@{$hashArgOptLists->{"OptList"}}, $options);
 
+    new CSVFieldSeparator($pluginlist, $inputargs, $hashArgOptLists);
     my $self = new SplitTextFile($pluginlist, $inputargs, $hashArgOptLists);
 
@@ -120 +118 @@
     my $separate_char = $self->{'separate_char'};
     if ($separate_char =~ m/^auto$/i) {
-    $separate_char = CSVSeparateChar::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'},$self->{'outhandle'},$self->{'verbosity'});
     # 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

@@ -30 +30 @@
 use BaseImporter;
 use MetadataRead;
+use CSVFieldSeparator;
 
 use strict;
@@ -38 +39 @@
 use util;
 
-use CSVSeparateChar; 
-
 use Encode;
+use Text::CSV;
 
 # methods with identical signatures take precedence in the order given in the ISA list.
 sub BEGIN {
-    @MetadataCSVPlugin::ISA = ('MetadataRead', 'BaseImporter');
+    @MetadataCSVPlugin::ISA = ('MetadataRead', 'BaseImporter', 'CSVFieldSeparator');
 }
 
@@ -50 +50 @@
 
 my $arguments = [
-      { 'name' => "separate_char",
-    'desc' => "{CSVPlugin.separate_char}",
-    'type' => "string",
-    'deft' => "auto",
-    'reqd' => "no" },
       { 'name' => "process_exp",
     'desc' => "{BaseImporter.process_exp}",
@@ -80 +75 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
+    new CSVFieldSeparator($pluginlist, $inputargs, $hashArgOptLists);
     my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
 
@@ -154 +150 @@
 
     if ($separate_char =~ m/^auto$/i) {
-    $separate_char = CSVSeparateChar::resolve_auto($csv_file_field_line,$self->{'plugin_type'},$outhandle,$self->{'verbosity'});
+    $separate_char = $self->resolve_auto($csv_file_field_line,$self->{'plugin_type'},$outhandle,$self->{'verbosity'});
     }