Changeset 13109

Timestamp:

2006-10-13T11:28:47+13:00 (18 years ago)

Author:

mdewsnip

Message:

Now escapes square brackets in metadata so Greenstone doesn't try to treat the text as metadata elements.

Location:

trunk/cic-hcap/perllib/plugins

Files:

• CICPlug.pm (modified) (1 diff)
• CICWordPlug.pm (modified) (1 diff)

trunk/cic-hcap/perllib/plugins/CICPlug.pm

@@ -1045 +1045 @@
     $metadata_value = &unicode::ascii2utf8(\$metadata_value);
 
+    # Escape any '[' and ']' characters so Greenstone doesn't try to treat the text as metadata...
+    $metadata_value =~ s/\[/&\#91;/g;
+    $metadata_value =~ s/\]/&\#93;/g;
+
+    # ...but don't mess up real metadata references!
+    $metadata_value =~ s/&\#91;assocfilepath&\#93;/\[assocfilepath\]/g;
+    $metadata_value =~ s/&\#91;parent\(Top\)\:assocfilepath&\#93;/\[parent(Top):assocfilepath\]/g;
+
     # Escape any '&' characters so the metadata is HTML 4 compliant when displayed
     $metadata_value =~ s/&([^\#])/&$1/g;

trunk/cic-hcap/perllib/plugins/CICWordPlug.pm

@@ -166 +166 @@
     }
 
+    # Escape any '[' and ']' characters so Greenstone doesn't try to treat the text as metadata...
+    $metadata_value =~ s/\[/&\#91;/g;
+    $metadata_value =~ s/\]/&\#93;/g;
+
     # Remove any superscript tags
     $metadata_value =~ s/\<sup\>//g;