Changeset 24583 for main/trunk/greenstone3

Timestamp:

2011-09-12T17:46:13+12:00 (13 years ago)

Author:

sjm84

Message:

Fixing an error with excerptid and also changed GSXML.xmlNodeToString to have a parameter that controls whether or not to print XML text

Location:

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

Files:

• action/PageAction.java (modified) (1 diff)
• action/QueryAction.java (modified) (1 diff)
• collection/Collection.java (modified) (1 diff)
• core/TransformingReceptionist.java (modified) (3 diffs)
• service/DocXMLUtil.java (modified) (1 diff)
• util/GSXML.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -79 +79 @@
         // elements but for now, we'll just get it all
         Element collection_list = (Element)GSXML.getChildByTagName(info_response, GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER);
-        logger.debug(GSXML.xmlNodeToString(collection_list));
+        logger.debug(GSXML.xmlNodeToString(collection_list, false));
         if (collection_list != null) {
             NodeList colls = GSXML.getChildrenByTagName(collection_list, GSXML.COLLECTION_ELEM);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java

@@ -113 +113 @@
     mr_query_message.appendChild(format_request);
 
-    logger.debug(GSXML.xmlNodeToString(mr_query_message));
+    logger.debug(GSXML.xmlNodeToString(mr_query_message, false));
 
     // do the query

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

@@ -507 +507 @@
                 Element display_format = (Element) format_element.getFirstChild();
 
-                String format_string = GSXML.xmlNodeToString(display_format);
+                String format_string = GSXML.xmlNodeToString(display_format, false);
                 String collection_config = directory + "collectionConfig.xml";
                 Document config = this.converter.getDOM(new File(collection_config), "UTF-8");

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -294 +294 @@
                 //return result;
                 //logger.error("Modify node value = "+result.getNodeValue()); //NamedItem("href"););
-                logger.error("BEFORE Modify node attribute = " + result.getAttributes().getNamedItem("href").getNodeValue());
-                String url = result.getAttributes().getNamedItem("href").getNodeValue();
+                //logger.error("BEFORE Modify node attribute = " + result.getAttributes().getNamedItem("href").getNodeValue());
+                //String url = result.getAttributes().getNamedItem("href").getNodeValue();
                 //url = url + "&excerptid=results";
-                result.getAttributes().getNamedItem("href").setNodeValue(url);
-                logger.error("AFTER Modify node attribute = " + result.getAttributes().getNamedItem("href").getNodeValue());
-
+                //result.getAttributes().getNamedItem("href").setNodeValue(url);
+                //logger.error("AFTER Modify node attribute = " + result.getAttributes().getNamedItem("href").getNodeValue());
             }
         }
@@ -319 +318 @@
     protected Node transformPage(Element page)
     {
-
         boolean allowsClientXSLT = (Boolean) config_params.get(GSConstants.ALLOW_CLIENT_SIDE_XSLT);
         //System.out.println("Client side transforms allowed? " + allowsClientXSLT);
@@ -835 +833 @@
         if (stylesheets.size() == 0)
         {
-            logger.info(" Can't find stylesheet for " + name);
+            logger.error(" Can't find stylesheet for " + name);
+            return null;
         }
         logger.debug("Stylesheet: " + name);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocXMLUtil.java

@@ -48 +48 @@
 public class DocXMLUtil extends ServiceRack
 {
-    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.ArchiveIO.class.getName());
+    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.DocXMLUtil.class.getName());
     GSDocumentModel _GSDM = null;
 

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

@@ -946 +946 @@
     }
 
-    public static String xmlNodeToString(Node e){
+    public static String xmlNodeToString(Node e, boolean printText){
         StringBuffer sb = new StringBuffer("");
-        xmlNodeToString(sb,e,0);
+        xmlNodeToString(sb,e,0,printText);
         return sb.toString();
     }
 
-    private static void xmlNodeToString(StringBuffer sb, Node e, int depth){
+    private static void xmlNodeToString(StringBuffer sb, Node e, int depth, boolean printText){
         
         for (int i=0 ; i<depth ; i++)
@@ -958 +958 @@
         
         if (e.getNodeType() == Node.TEXT_NODE){
-            sb.append("text") ;
+            if(printText)
+            {
+                sb.append(e.getNodeValue());
+            }
+            else
+            {
+                sb.append("text");
+            }
             return ;
         }
@@ -987 +994 @@
             int len = children.getLength();
             for (int i = 0; i < len; i++) {
-                xmlNodeToString(sb,children.item(i), depth + 1);
+                xmlNodeToString(sb,children.item(i), depth + 1, printText);
             }