Changeset 28798 for main/trunk

Timestamp:

2014-01-23T16:38:37+13:00 (10 years ago)

Author:

ak19

Message:

2 fixes to open GS2 collections in GLI: quotes surrounding attributes should not be escaped and following Dr Bainbridge's advise to escape special html chars with entities, so that open br tags are still xml compliant. (We will be later running html tidy over these to fix them up).

File:

• main/trunk/greenstone3/bin/script/convert_coll_from_gs2.pl (modified) (3 diffs)

main/trunk/greenstone3/bin/script/convert_coll_from_gs2.pl

@@ -11 +11 @@
 
 use colcfg;
+use docprint; # for sub escape_text
 use util;
 use parsargv;
@@ -755 +756 @@
     my ($writer, $old_format, $node_type) = @_;
 
-    if($convert_format_stmts) {
-
     # replace \' with '
     $old_format =~ s/\\\'/\'/g;
     # replace \" with "
     $old_format =~ s/\\\"/\"/g;
+
+    if($convert_format_stmts) {
+
     #convert [] to <gsf:...>
     # now handles nested {If} and {Or}
@@ -791 +793 @@
     # so that formatconverter can convert them and users can oversee the conversion in GLI,
     # but nest the GS2 statements here in an xml tag that won't be processed by GS3 
+
+    $old_format = &docprint::escape_text($old_format); # escape html entities inside the format statement since the <br> and <p> may not be correct for xml
     $old_format = "<gsf:format-gs2>" . $old_format . "</gsf:format-gs2>";
+    
     }