Changeset 37185

Timestamp:

2023-01-25T23:31:32+13:00 (15 months ago)

Author:

davidb

Message:

Fixed issue with how metadata_exp was coded

File:

• gs3-installations/whakatohea-dl/trunk/sites/wmtb/collect/tipple-waiata/perllib/plugins/TippleExportJSONPlugin.pm (modified) (2 diffs)

gs3-installations/whakatohea-dl/trunk/sites/wmtb/collect/tipple-waiata/perllib/plugins/TippleExportJSONPlugin.pm

@@ -61 +61 @@
       'type' => "string",
       'deft' => "WAIATA",
-      'deft' => "",
+#      'deft' => "",
       'reqd' => "no" },    
 ];
@@ -101 +101 @@
     my $self = new SplitJSONFile($pluginlist, $inputargs, $hashArgOptLists);
 
-    my $blessed_self = bless $self, $class;
-
     my $metadata_exp = $self->{'metadata_exp'};
     my @metadata_exps = split(/\s*,\s*/,$metadata_exp);
 
     $self->{'metadata_exp_lookup'} = {};
+    
     foreach my $md_exp_and_opt_mapping (@metadata_exps) {
-    my ($md_exp,$opt_mapping) = ($md_exp_and_opt_mapping =~ m/^(.+?)(?:->(.+))$/);
-    $blessed_self->{'metadata_exp_lookup'}->{$md_exp} = { 'exists' => 1, 'gs_metadata_name' => $opt_mapping }; # note: $opt_mapping might be undef
-    }
-    
-    return $blessed_self;
+    print STDERR "**** md_ext_and_opt_mapping = $md_exp_and_opt_mapping\n";
+    
+    my ($md_exp,$opt_mapping) = ($md_exp_and_opt_mapping =~ m/^(.+?)(?:->(.+))?$/);
+    $self->{'metadata_exp_lookup'}->{$md_exp} = { 'exists' => 1, 'gs_metadata_name' => $opt_mapping }; # note: $opt_mapping might be undef
+    }
+
+    return bless $self, $class;
 }