Changeset 32573 for main/trunk/greenstone2/perllib/docprint.pm

Timestamp:

2018-11-05T19:24:47+13:00 (5 years ago)

Author:

ak19

Message:

1. Caching the prepared SQL insert statements inside the gssql class rather than in the GS SQL Plugout. 2. docprint.pm provides an escape_textref function besides the existing escape_text function, to deal with large text (e.g. fulltxt). The old escape_text function has been rewritten to internally use the escape_textref function.

File:

• main/trunk/greenstone2/perllib/docprint.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/docprint.pm

@@ -108 +108 @@
 }
 
+# pass by ref version: gets a ref to a string and returns ref to the modified string
+# so use this for large strings (fulltext)
+sub escape_textref {
+    my ($textref) = @_;
+    # special characters in the xml encoding
+    $$textref =~ s/&&/& &/g;
+    $$textref =~ s/&/&/g; # this has to be first...
+    $$textref =~ s/</&lt;/g;
+    $$textref =~ s/>/&gt;/g;
+    $$textref =~ s/\"/&quot;/g;
+
+    return $textref;
+}
+
+# pass by value - the behaviour of the escape_text method used so far is to pass copies of strings
 sub escape_text {
     my ($text) = @_;
-    # special characters in the xml encoding
-    $text =~ s/&&/& &/g;
-    $text =~ s/&/&amp;/g; # this has to be first...
-    $text =~ s/</&lt;/g;
-    $text =~ s/>/&gt;/g;
-    $text =~ s/\"/&quot;/g;
-
-    return $text;
+    my $textref = &escape_textref(\$text);
+    return $$textref;
 }