Changeset 33753

Timestamp:

2019-12-04T21:22:19+13:00 (4 years ago)

Author:

davidb

Message:

Made the change Dr Bainbridge wanted: in the two locations that metadata gets put into the csv_line_mmetadata under the associated metadata_name, the metadata_value first has any square brackets within it protected by being replaced with the html entity versions of it (not hex entities, but regular). This is to prevent conflict between unescaped square brackets that have special meaning and are specially handled when the GS3 runtime code processes meta, whereas literal square brackets in a meta value like dc.Title must be preserved as square brackets and not treated specially handled by the GS3 runtime code.

File:

• main/trunk/model-sites-dev/heritage-nz/collect/pdf-reports/perllib/plugins/MetadataCSVPlugin.pm (modified) (2 diffs)

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

@@ -211 +211 @@
             
             my @within_md_vals = split(/${md_val_sep}/,$md_val);
-            push (@{$csv_line_metadata{$md_name}}, @within_md_vals);
+            #push (@{$csv_line_metadata{$md_name}}, @within_md_vals);
+
+            # protect square brackets in metadata values by hex entity encoding them
+            # As unescaped square bracket chars in metadata
+            # have special meaning in GS' Java runtime code
+            my @escaped_within_md_vals = ();
+            for my $meta_value (@within_md_vals) {
+                $meta_value =~ s/\[/&\#091;/g;
+                $meta_value =~ s/\]/&\#093;/g;
+                push(@escaped_within_md_vals, $meta_value);
+            }
+            push (@{$csv_line_metadata{$md_name}}, @escaped_within_md_vals);
 
 #           foreach my $within_md_val (@within_md_vals) {
@@ -218 +229 @@
             }
             else {
-            push (@{$csv_line_metadata{$md_name}}, $md_val);
+            #push (@{$csv_line_metadata{$md_name}}, $md_val);
+            # protect square brackets in metadata values by hex entity encoding them
+            my $escaped_metadata_value = $md_val;
+            $escaped_metadata_value =~ s/\[/&\#091;/g;
+            $escpaed_metadata_value =~ s/\]/&\#093;/g;
+            push (@{$csv_line_metadata{$md_name}}, $escaped_metadata_value);
             }
         }