Changeset 29043 for main/trunk/gli

Timestamp:

2014-05-08T15:39:42+12:00 (10 years ago)

Author:

ak19

Message:

Second of 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.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java

@@ -68 +68 @@
     private static final int XMLTIDY = 0;
     private static final int FORMATCONVERTER = 1;
+    private static final int FORMATCONVERTER_DOCUMENTNODE = 2;
+    private static final int FORMATCONVERTER_CLASSIFIERNODE = 3;
+
     // Online HTML tidy for learning usage: http://infohound.net/tidy/
     private static final String[] xmltidy_cmd_args = {"tidy", "-config", Configuration.getGS3BinPath() + "tidyconfig.cfg", "-utf8", "-wrap", "0", "-raw", "-q"}; // {"tidy", "-xml", "-utf8"};
-    private static final String[] formatconverter_cmd_args = {Configuration.getGS3BinPath() + "formatconverter", "--silent"};
+    private static final String[] formatconverter_cmd_base_args = {Configuration.getGS3BinPath() + "formatconverter", "--silent"};
 
     private static final Dimension SIZE = new Dimension(640,480);
@@ -289 +292 @@
     process_exitValue = -1;
 
-    if(program == XMLTIDY) {
+    switch(program) {
+    case XMLTIDY:
         command_args = xmltidy_cmd_args;
-    } else if(program == FORMATCONVERTER) {
-        command_args = formatconverter_cmd_args;
-    } else { // unknown command
+        break;
+    case FORMATCONVERTER:
+        command_args = formatconverter_cmd_base_args;
+        break;
+    case FORMATCONVERTER_DOCUMENTNODE: 
+    case FORMATCONVERTER_CLASSIFIERNODE:
+        command_args = new String[formatconverter_cmd_base_args.length+1]; 
+        System.arraycopy(formatconverter_cmd_base_args, 0, command_args, 0, formatconverter_cmd_base_args.length);
+        if(program == FORMATCONVERTER_DOCUMENTNODE) {
+        command_args[command_args.length-1] = "--documentNode";     
+        } else if(program == FORMATCONVERTER_CLASSIFIERNODE) {
+        command_args[command_args.length-1] = "--classifierNode";       
+        } 
+        break;
+    default:
+        System.err.println("*** Unrecognised program code: " + program);
         return outputstr;
     }
@@ -381 +398 @@
     //System.err.println("*** Found: " + gs2formatstr);
 
-    String gs3formatstr = runInteractiveProgram(FORMATCONVERTER, gs2formatstr);
-    gs3formatstr = gs3formatstr.replace("> <", "><");
+    // Running formatconverter. Decide on whether to pass in option --documentNode|--classifierNode
+    int formatConverterProgramMode = formatConverterMode(i);
+    String gs3formatstr = runInteractiveProgram(formatConverterProgramMode, gs2formatstr);
+    gs3formatstr = gs3formatstr.replaceAll(">\\s+<", "><");
 
     //System.err.println("*** Format is now: " + gs3formatstr);
@@ -560 +579 @@
     }
 
+    private int formatConverterMode(int i) {
+    String docOrClassNodeType = "";
+
+    // Given XML of the form:
+    // <browse|search>
+    //   <format>
+    //     <gsf:template match="documentNode|classifierNode" [mode=horizontal]>
+    //       <gsf-format:gs2 />
+    //       <gs3format/>
+    //   </format>
+    // </browse|search>
+
+    // Want to return the label: "documentNode|classifierNode"
+
+    Element parent = (Element)getParentNode(i); // gets parent of GS2format: <gsf:template>
+    String nodeType = parent.getAttribute("match"); //e.g. documentNode, classifierNode, or "" if no match attr
+
+    
+    if(nodeType.equals("documentNode")) {
+        return FORMATCONVERTER_DOCUMENTNODE;        
+    } else if(nodeType.equals("classifierNode")) {
+        return FORMATCONVERTER_CLASSIFIERNODE;
+    }
+    return FORMATCONVERTER;
+    }
 
     private String getLabel(int i) {