Changeset 28783 for main/trunk

Timestamp:

2014-01-15T14:12:32+13:00 (10 years ago)

Author:

ak19

Message:

Treatment of 'and' in the MARC*Plugin.pm an issue for Greenstone 3. This commit is a partial fix. See 'Important' comment in MARCPlugin.pm for more details

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• MARCPlugin.pm (modified) (1 diff)
• MARCXMLPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/MARCPlugin.pm

@@ -366 +366 @@
         if (defined $meta_value) {
         # Square brackets in metadata values need to be escaped so they don't confuse Greenstone/GLI
+
+        # Important!  Check that this really works!! In MARCXMLPlugin
+        # it maps these characters to \\\\[ \\\\]
+
         $meta_value =~ s/\[/&\#091;/g;
         $meta_value =~ s/\]/&\#093;/g;

main/trunk/greenstone2/perllib/plugins/MARCXMLPlugin.pm

@@ -415 +415 @@
         }
         
-        ## escape [ and ]
-        $meta_value =~ s/\[/\\\[/g;
-        $meta_value =~ s/\]/\\\]/g;
-        ##print STDERR  "$meta_name=$meta_value\n";
+        my $gs_mode = ($ENV{'GSDL3SRCHOME'}) ? "gs3" : "gs2";
+
+        if ($gs_mode eq "gs2") {
+            ## escape [ and ]
+            $meta_value =~ s/\[/\\\[/g;
+            $meta_value =~ s/\]/\\\]/g;
+
+            # The following is how MARCPlug does this
+            # If this is really OK for Greenstone2, then consider
+            # to switching to this, as this would mean we
+            # wouldn't need a special gs2/gs3 test here!
+
+#           $meta_value =~ s/\[/&\#091;/g;
+#           $meta_value =~ s/\]/&\#093;/g;
+
+            ##print STDERR  "$meta_name=$meta_value\n";
+        }
+
         $doc_obj->add_utf8_metadata($doc_obj->get_top_section(),$meta_name, $meta_value);