Changeset 29042 for main/trunk/greenstone2/runtime-src/src/recpt/formatconverter.cpp

Timestamp:

2014-05-08T15:38:11+12:00 (10 years ago)

Author:

ak19

Message:

First 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/greenstone2/runtime-src/src/recpt/formatconverter.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/formatconverter.cpp

@@ -46 +46 @@
 here" | ./formatconverter --silent
 ***********************************************************************/
+void print_usage() {
+  cout << endl << "Usage: formatconverter [options]" << endl;
+  cout << "\tOptions: --help, [--silent] [--documentNode|--classifierNode]" << endl << endl;
+}
 
 int main(int argc, char **argv) {
@@ -54 +58 @@
   text_t resultstring;
 
-  
+  text_t nodeType = "";
   bool silent = false;
+
   if(argc > 1) {
-    silent = (strcmp(argv[1], "--silent") == 0);
+
+    if((strcmp(argv[1], "--help") == 0)) {
+      print_usage();
+      return 0;
+    }
+
+    else {
+      for(int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "--silent") == 0) { silent = true; }
+    else if(strcmp(argv[i], "--documentNode") == 0) { nodeType = "document"; } 
+    else if(strcmp(argv[i], "--classifierNode") == 0) { nodeType = "classifier"; }
+    else { 
+      print_usage(); 
+      return 0;
+    }
+      }
+    }
   }
 
@@ -75 +96 @@
 
   parse_formatstring (argstr, formatlistptr, metadata, getParents);  
-  resultstring = get_GS3_formatstring (formatlistptr);
+  resultstring = get_GS3_formatstring (formatlistptr, nodeType);
 
   delete formatlistptr;