Changeset 28780

Timestamp:

2013-12-19T18:27:37+13:00 (10 years ago)

Author:

ak19

Message:

Now the default version of the convert_coll_from_gs2.pl does not try to convert the GS2 format statements into GS3 format statements. Instead, the script embeds GS2 format statements in the new tag <gsf:format-gs2/>, so that GS3 does not try to process them and they are preserved so that they can be fed into the c++ binary formatconverter one at a time, so that this can process one format statement at a time. GLI will allow the user to inspect the converted format statements and correct them.

File:

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

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

@@ -20 +20 @@
 use strict;
 
+my $convert_format_stmts = 0;
+
 &main();
 sub print_usage() {
@@ -25 +27 @@
     print STDOUT "options:\n";
     
-    print STDOUT "   -collectdir         Directory where collection lives.\n";
-    print STDOUT "   -verbosity          Controls the amount of output.\n";
-    print STDOUT "   -defaultlang        The language that is considered the default (for display text etc). defaults to 'en'\n\n";
+    print STDOUT "   -collectdir             Directory where collection lives.\n";
+    print STDOUT "   -verbosity              Controls the amount of output.\n";
+    print STDOUT "   -defaultlang            The language that is considered the default (for display text etc). defaults to 'en'\n";
+    print STDOUT "   -convert_format_stmts   (Deprecated.) Switch this on if you want the old behaviour of this script, which is \n";
+    print STDOUT "                               to process format statements using perl regular expressions.\n";
+    print STDOUT "                               This option is deprecated in favour of using 'formatconverter' which interprets \n";
+    print STDOUT "                               format statements directly using the same C++ parsing code as in GS2 runtime.\n\n";
 }
 
@@ -39 +45 @@
               'verbosity/\d+/', \$verbosity,
               'collectdir/.*/', \$collectdir,
-              'defaultlang/.*/', \$defaultlang)) {
+              'defaultlang/.*/', \$defaultlang,
+              'convert_format_stmts', \$convert_format_stmts)) {
     &print_usage();
     die "\n";
@@ -747 +754 @@
 sub write_format {
     my ($writer, $old_format, $node_type) = @_;
+
+    if($convert_format_stmts) {
+
     # replace \' with '
     $old_format =~ s/\\\'/\'/g;
@@ -777 +787 @@
     #put quotes around any atts
     $old_format =~ s/=([a-z]+)([> ])/=\'$1\'$2/g;
+    } 
+    else { # not converting format statements, leave them as GS2 format stmts, 
+    # 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 = "<gsf:format-gs2>" . $old_format . "</gsf:format-gs2>";
+    }
 
     if ($node_type eq "document") {