Changeset 24221 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

Timestamp:

2011-07-04T10:49:50+12:00 (13 years ago)

Author:

sjm84

Message:

Added more functionality to ArchiveRetrieve, added an additonal parameter to printXMLNode in GSXML that controls whether text nodes are to be printed or not and also made the infodb type of collections more easily accessible

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -85 +85 @@
   public static final String DOC_TYPE_ELEM = "docType";
   public static final String SEARCH_ELEM = "search";
+  public static final String INFODB_ELEM = "infodb";
   public static final String INDEX_ELEM = "index";
   public static final String INDEX_STEM_ELEM = "indexStem";
@@ -125 +126 @@
   public static final String LANG_ATT = "lang";
   public static final String TYPE_ATT = "type";
+  public static final String DB_TYPE_ATT = "dbType";
   public static final String VALUE_ATT = "value";
   public static final String DEFAULT_ATT = "default";
@@ -920 +922 @@
   }
   
-  public static void printXMLNode(Node e) {
-    printXMLNode(e, 0) ;
+  public static void printXMLNode(Node e, boolean printText) {
+    printXMLNode(e, 0, printText) ;
   }
   
@@ -977 +979 @@
   }
   
-  public static void printXMLNode(Node e, int depth) { //recursive method call using DOM API...
-    
+  public static void printXMLNode(Node e, int depth, boolean printText) { //recursive method call using DOM API...
+    
+    if(e == null){return;}
+    
     for (int i=0 ; i<depth ; i++)
       System.out.print(' ') ;
     
     if (e.getNodeType() == Node.TEXT_NODE){
-      // shouldn't we actually print the text here????
-      System.out.println("text") ;
+      if(printText){
+        System.out.println(e.getNodeValue());
+      }
+      else {
+        System.out.println("text");
+      }
       return ;
     }
@@ -1014 +1022 @@
       int len = children.getLength();
       for (int i = 0; i < len; i++) {
-        printXMLNode(children.item(i), depth + 1);
+        printXMLNode(children.item(i), depth + 1, printText);
       }