Changeset 14635

Timestamp:

2007-10-09T09:57:18+13:00 (16 years ago)

Author:

xiao

Message:

add two methods to write in and out the plugout element which is used by flax collection building

File:

• gli/trunk/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java (modified) (6 diffs)

gli/trunk/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -2536 +2536 @@
         toElement.appendChild (to_element);
     }
-    private void doPlugoutElement (Document to, Element from) {
-        Element toElement = to.getDocumentElement ();
-        
-        Node plugout_element = XMLTools.getChildByTagName (from, PLUGOUT_ELEMENT);
-        if (plugout_element == null) {
-            return; // such an element not found
-        }
-        
-        Element to_element = XMLTools.duplicateElement (to, (Element)plugout_element, true);
-        toElement.appendChild (to_element);
-    }
-    private void convertPlugoutElement (Document from, Document to) {
-        Element toElement = to.getDocumentElement ();
-        
-        Node plugout_element = XMLTools.getChildByTagName (from.getDocumentElement (), PLUGOUT_ELEMENT);
-        if (plugout_element == null) {
-            return; // such an element not found
-        }
-        
-        Element to_element = XMLTools.duplicateElement (to, (Element)plugout_element, true);
-        toElement.appendChild (to_element);
-    }    
     private void doDefaultIndexLanguage (Document to, Node searchNode) {
         Element toElement = to.getDocumentElement ();
@@ -2910 +2888 @@
         
         import_element.appendChild (plugin_list_element);
+        
+        //do the plugout element (used by building flax collections)
+        Node plugout = XMLTools.getChildByTagNameIndexed (from.getDocumentElement (), PLUGOUT_ELEMENT, 0);
+        if (plugout != null) {
+            Element to_element = XMLTools.duplicateElement (to, (Element)plugout, true);
+            import_element.appendChild (to_element);
+        }
+        
         to.getDocumentElement ().appendChild (import_element);
     }
+
     //Handle 'searchType' of collectionConfig.xml. In the internal structure, its also called 'searchType', eg. plain, form
     private void convertSearchType (Document from, Document to) {
@@ -3631 +3618 @@
         }
         if (importNode != null) {
-            Node pluginListNode = XMLTools.getChildByTagNameIndexed ((Element)importNode, StaticStrings.PLUGINLIST_STR, 0);
-            
+            //do plugin list nodes
+            Node pluginListNode = XMLTools.getChildByTagNameIndexed ((Element)importNode, StaticStrings.PLUGINLIST_STR, 0);           
             if (pluginListNode == null) {
-                System.out.println ("There is no plugin set.");
+                System.out.println ("There is no pluginlist set.");
             }
             if (pluginListNode != null) {
                 
                 doPlugin (dOc, pluginListNode);
+            }
+            
+            //do the plugout element (used by building flax collections)
+            Node plugout = XMLTools.getChildByTagNameIndexed ((Element)importNode, PLUGOUT_ELEMENT, 0);
+            if (plugout != null) {
+                Element to_element = XMLTools.duplicateElement (dOc, (Element)plugout, true);
+                toElement.appendChild (to_element);
             }
         }
@@ -3688 +3682 @@
         doReplaceListRef (dOc, fromElement);
         doOAIElement (dOc, fromElement);
-        doPlugoutElement (dOc, fromElement);
         
     }
@@ -3880 +3873 @@
         convertBuildType (dOc, skeleton);
         convertIndex (dOc, skeleton);
-        convertPlugin (dOc, skeleton);
+        convertPlugin (dOc, skeleton);//also do the plugout element
         convertClassifier (dOc, skeleton);
         convertSubcollectionIndexes (dOc, skeleton);
@@ -3890 +3883 @@
         convertReplaceListRef (dOc, skeleton);
         convertOAIElement(dOc, skeleton);
-        convertPlugoutElement(dOc, skeleton);
-        
+
         return skeleton;
     }