Changeset 24203 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection

Timestamp:

2011-06-27T11:08:35+12:00 (13 years ago)

Author:

sjb48

Message:

Working on document-level format editting

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection

Files:

• Collection.java (modified) (8 diffs)
• ServiceCluster.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -359 +359 @@
     response.setAttribute(GSXML.TYPE_ATT, type);
 
+    logger.error("Collection received a message, attempting to process");
+
     if (type.equals(GSXML.REQUEST_TYPE_FORMAT_STRING)) {
         logger.error("Received format string request");
@@ -501 +503 @@
                         if(GSXML.getChildByTagName(current_node, "format") == null)
                         {
-                            logger.error("ERROR: classifier does not have a format child");
+                            logger.error("ERROR: valid classifier but does not have a format child");
                             // well then create a format tag
                             Element format_tag = config.createElement("format");
@@ -511 +513 @@
                             current_node = GSXML.getChildByTagName(current_node, "format");
                         }
+
                     }
                     else{
                         logger.error("Classifier is null");
+                        // To support all classifiers, set classifier to null?  There is the chance here that the format tag does not exist
+                        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 if(service.equals("AllClassifierBrowse"))
+                {
+                    logger.error("Looking for browse");
+                    current_node = GSXML.getChildByTagName(current_node, "browse");
+                    if(GSXML.getChildByTagName(current_node, "format") == null)
+                    {
+                        logger.error("ERROR AllClassifierBrowse: all classifiers do 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
@@ -536 +564 @@
                 elem = (Element) current_node;
     
-                logger.error("Current_node = " + elem.getNodeName());
+                logger.error("*Current_node = " + elem.getNodeName());
 
                 // seems we want to remove current child/ren and replace with format_statement's child/ren?
@@ -542 +570 @@
                 // remove existing
                 current_node_list = elem.getChildNodes();
+                logger.error("About to remove old children");
                 for(k=0; k<current_node_list.getLength(); k++)
                 {
                     current_node = elem.removeChild(current_node_list.item(k));
                 }
+
+                logger.error("old nodes removed");
 
                 // append new but we have a string!
@@ -560 +591 @@
                         elem.appendChild(config.importNode(current_node_list.item(k),true));
                 }
+                logger.error("new nodes added");
 
                 //String text = GSXML.getNodeText(elem);
@@ -568 +600 @@
 
                 // Now convert config document to string for writing to file
+                logger.error("Convert config to string");
                 String new_config = this.converter.getString(config);
 
@@ -578 +611 @@
                 writer.write(new_config);
                 writer.close();
+                logger.error("All is happy with collection");
 
              } catch( Exception ex ) {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -388 +388 @@
     public Node process(Node message_node) {
 
+    logger.error("ServiceCluster is processing a message");
+
     Element message = this.converter.nodeToElement(message_node);
 
@@ -417 +419 @@
         } else { // the request is for one of my services
         String service = GSPath.getFirstLink(to);
+        logger.error(service+" specified!");
         
         if (!this.service_map.containsKey(service)) {
@@ -467 +470 @@
     protected Element processMessage(Element request) {
 
+    logger.error("ServiceCluster is processing an element request");
     Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.FROM_ATT, this.cluster_name);