FormatConverter. Converting GS2 format statements to GS3

[ak19]

Changesets:

+ Perl - gs3/bin/script

http://trac.greenstone.org/changeset/28780

http://trac.greenstone.org/changeset/28798

http://trac.greenstone.org/changeset/29008

+ C++ - gs2/runtime-src/src/recpt/formatconverter.cpp, formattools.cpp and .h

http://trac.greenstone.org/changeset/28760

http://trac.greenstone.org/changeset/28761

http://trac.greenstone.org/changeset/28960

+ Java GLI - especially gatherer/gui/FormatConversionDialog.java and especially gatherer/gui/NumberedJTextArea.java

http://trac.greenstone.org/changeset/28995

http://trac.greenstone.org/changeset/29001

http://trac.greenstone.org/changeset/29006

http://trac.greenstone.org/changeset/29007 (gs3/bin/tidyconfig.cfg used by HTMLTidy when used by GLI FormatConversionDialog)

http://trac.greenstone.org/changeset/29009

http://trac.greenstone.org/changeset/29011

http://trac.greenstone.org/changeset/29012

http://trac.greenstone.org/changeset/29016

http://trac.greenstone.org/changeset/29017

http://trac.greenstone.org/changeset/29030

http://trac.greenstone.org/changeset/29031

http://trac.greenstone.org/changeset/29034

(http://trac.greenstone.org/changeset/29036

http://trac.greenstone.org/changeset/29037)

+ GS3/web/interfaces/default/transform/config_format.xsl

http://trac.greenstone.org/changeset/29035

[ak19]

A further 2-part commit for improving FormatConversion from GS2 to GS3. formatconverter.exe now takes an additional optional parameter which can be documentNode or classifierNode. This then determines what the formatconverter.exe does when it sees an If test on the existence of the numleafdocs variable, since a positive test applies only to classifierNodes, while a negative test applies only to documentNodes. Further, [link][icon][link] should output something slightly different for classifierNodes than for documentNodes.

+ GS2 runtime C++ code:

http://trac.greenstone.org/changeset/29042

+ GS3 and Java GLI code:

http://trac.greenstone.org/changeset/29043

[ak19]

+ (Just tidying comments and commented up lines

http://trac.greenstone.org/changeset/29044)

+ http://trac.greenstone.org/changeset/29045

Kathy suggested that the GS3 buildConfig.xml generated from GS2 build.cfg should ideally have the same content as if buildConfig.xml generated from a rebuild of the collection. This is so that a collection converted from GS2 to GS3 can be immediately previewed without rebuilding. Although immediate previewing already worked, the intention is to nevertheless make the automatically-generated buildConfig.xml file as identical as possible to the one generated upon a rebuild.

main/trunk/greenstone3/bin/script/convert_coll_from_gs2.pl (9 diffs)

[ak19]

Changes were to

GLI, particularly the new gui/FormatConversionDialog and NumberedJTextArea. Also changes to OpenCollectionDialog and helper methods here and there.

GS2's runtime-src/src/recpt/formattools and formatconverter .cpp and .h files

GS3's bin/formatconverter.exe, bin/tidyconfig.cfg, bin/script/convert_coll_from_gs2.pl

web/interfaces/default/transform/config_format.xsl

[ak19]

+ http://trac.greenstone.org/changeset/29046

GS2 runtime-src/src/recpt/Makefile.in, "make install" should put the formatconverter binary into GS2/bin/OS.

This was used to produce the 32 bit statically linked binary (using the nightly gs2-caveat). This can then be committed to GS3.

+ http://trac.greenstone.org/changeset/29047

Windows win32.mak file to generate formatconverter.exe and install it into GS2/bin/windows

[ak19]

A few more commits:

1. Mac requires its own formatconverter binary, as the linux formatconverter binary does not work on either Mac Maverick or Mac Mountain Lion. The Mac 32 bit formatconverter binary generated on Leopard seems to work on Mountain Lion.

2. Moving the formatconverter binaries into their own OS dir subfolders of the GS3/bin folder.

3. Note that tidyconfig.cfg remains in the GS3/bin super folder, and is shared by all the format converter binaries in the subfolder

http://trac.greenstone.org/changeset/29297

http://trac.greenstone.org/changeset/29298

http://trac.greenstone.org/changeset/29299

http://trac.greenstone.org/changeset/29300