Changeset 24132

Timestamp:

2011-06-09T14:39:46+12:00 (12 years ago)

Author:

sjb48

Message:

Saving of the format statement to the collectionConfig is now possible. The bug with select boxes where the selected item was not saved has now been fixed.

Location:

main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3

Files:

• action/FormatAction.java (modified) (1 diff)
• collection/Collection.java (modified) (7 diffs)

main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3/action/FormatAction.java

@@ -114 +114 @@
             //String style = stylesheetFile(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList base_interfaces, String filename);
             //Document style_doc = this.converter.getDOM(new File(style), "UTF-8"); //"/home/sam/greenstone3/web/interfaces/oran/transform/formatString.xsl"), "UTF-8");  /*************************/
-            Document style_doc = this.converter.getDOM(new File("/home/sam/greenstone3/web/interfaces/oran/transform/formatString.xsl"), "UTF-8");  /*************************/
+            Document style_doc = this.converter.getDOM(new File("/research/sjb48/greenstone3/web/interfaces/oran/transform/formatString.xsl"), "UTF-8");  /*************************/
 
             if(style_doc == null)

main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -33 +33 @@
 import java.io.File;
 import java.util.HashMap;
+import java.util.*;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -471 +472 @@
                 int index;
                 Element elem;
+                // Try importing entire tree to this.doc so we can add and remove children at ease
+                //Node current_node = this.doc.importNode(GSXML.getChildByTagName(config, "CollectionConfig"),true);
                 Node current_node = GSXML.getChildByTagName(config, "CollectionConfig");
                 NodeList current_node_list;
-    
+   
+                logger.error("Service is "+service);
+
                 if(service.equals("ClassifierBrowse"))
                 {
@@ -480 +485 @@
                     // default is <browse><format>
 
+                    logger.error("Looking for browse");
                     current_node = GSXML.getChildByTagName(current_node, "browse");
 
@@ -485 +491 @@
                     if(classifier != null)
                     {
+                        logger.error("Classifier is not null");
+                        logger.error("Classifier is "+classifier);
                         current_node_list = GSXML.getChildrenByTagName(current_node, "classifier");
                         index = Integer.parseInt(classifier.substring(2)) - 1;
+                        logger.error("classifier index is "+index);
                         // index should be given by X-1
                         current_node = current_node_list.item(index);
-                        current_node = GSXML.getChildByTagName(current_node, "format");
+                        // what if classifier does not have a format tag?
+                        if(GSXML.getChildByTagName(current_node, "format") == null)
+                        {
+                            logger.error("ERROR: classifier does not have a format child");
+                            // well then create a format tag
+                            Element format_tag = config.createElement("format");
+                            current_node = (Node) current_node.appendChild(format_tag);
+                            //current_node = (Node) format_tag;
+                        }
+                        
+                        else{
+                            current_node = GSXML.getChildByTagName(current_node, "format");
+                        }
                     }
                     else{
+                        logger.error("Classifier is null");
                         current_node = GSXML.getChildByTagName(current_node, "format");
                     }
@@ -498 +520 @@
                 {
                     // look in <format> with no attributes
+                    logger.error("I presume this is search");
             
                     current_node_list = GSXML.getChildrenByTagName(current_node, "search");
@@ -532 +555 @@
                 {
                     //if(transformed.getNodeType() == Node.DOCUMENT_NODE)
-                //transformed = ((Document)transformed).getDocumentElement();
-                    logger.error("Node type: "+current_node_list.item(k).getNodeType());
+                    //transformed = ((Document)transformed).getDocumentElement();
+                    //logger.error("Node type: "+current_node_list.item(k).getNodeType());
                     if(current_node_list.item(k).getNodeType() != Node.PROCESSING_INSTRUCTION_NODE)
-                        current_node = elem.appendChild(this.doc.importNode(current_node_list.item(k),true));
+                        elem.appendChild(config.importNode(current_node_list.item(k),true));
                 }
 
@@ -546 +569 @@
                 // Now convert config document to string for writing to file
                 String new_config = this.converter.getString(config);
+
+                new_config = StringUtils.replace(new_config, "&lt;", "<");
+                new_config = StringUtils.replace(new_config, "&gt;", ">");
+                new_config = StringUtils.replace(new_config, "&quot;", "\"");
     
                 // Write to file (not original! for now)