Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 94 insertions, 4 deletions

diff --git a/src/main/java/com/c2kernel/persistency/outcome/Outcome.java b/src/main/java/com/c2kernel/persistency/outcome/Outcome.java
index b2f706b..70a2a24 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/Outcome.java
+++ b/src/main/java/com/c2kernel/persistency/outcome/Outcome.java
@@ -5,8 +5,14 @@ import java.util.StringTokenizer;
 import javax.xml.parsers.DocumentBuilder;

 import javax.xml.parsers.DocumentBuilderFactory;

 import javax.xml.parsers.ParserConfigurationException;

+import javax.xml.xpath.XPath;

+import javax.xml.xpath.XPathConstants;

+import javax.xml.xpath.XPathExpression;

+import javax.xml.xpath.XPathExpressionException;

+import javax.xml.xpath.XPathFactory;

 

 import org.w3c.dom.Document;

+import org.w3c.dom.Node;

 import org.w3c.dom.NodeList;

 import org.w3c.dom.Text;

 import org.w3c.dom.bootstrap.DOMImplementationRegistry;

@@ -14,6 +20,7 @@ import org.w3c.dom.ls.DOMImplementationLS;
 import org.w3c.dom.ls.LSSerializer;

 import org.xml.sax.InputSource;

 

+import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.common.PersistencyException;

 import com.c2kernel.entity.C2KLocalObject;

@@ -29,6 +36,7 @@ public class Outcome implements C2KLocalObject {
     Document dom;

     static DocumentBuilder parser;

     static DOMImplementationLS impl;

+    static XPath xpath;

 

     static {

     	// Set up parser

@@ -50,7 +58,9 @@ public class Outcome implements C2KLocalObject {
             Logger.error(e);

             Logger.die("Cannot function without XML serialiser");

 		}

-

+        

+        XPathFactory xPathFactory = XPathFactory.newInstance();

+        xpath = xPathFactory.newXPath();

     }

 

     //id is the eventID

@@ -64,7 +74,7 @@ public class Outcome implements C2KLocalObject {
     public Outcome(String path, String data) throws PersistencyException {

     // derive all the meta data from the path

         StringTokenizer tok = new StringTokenizer(path,"/");

-        if (tok.countTokens() != 3 && !(tok.nextToken().equals("Outcome")))

+        if (tok.countTokens() != 3 && !(tok.nextToken().equals(ClusterStorage.OUTCOME)))

             throw new PersistencyException("Outcome() - Outcome path must have three components: "+path, null);

         mSchemaType = tok.nextToken();

         String verstring = tok.nextToken();

@@ -110,11 +120,74 @@ public class Outcome implements C2KLocalObject {
     }

 

     public void setData(Document data) {

-        mData = serialize(data, false);

         dom = data;

+        mData = null;

+    }

+    

+    public String getFieldByXPath(String xpath) throws XPathExpressionException, InvalidDataException {

+    	Node field = getNodeByXPath(xpath);

+    	if (field == null)

+    		throw new InvalidDataException(xpath, "");

+    	

+    	else if (field.getNodeType()==Node.TEXT_NODE || field.getNodeType()==Node.CDATA_SECTION_NODE)

+    		return field.getNodeValue();

+    	

+    	else if (field.getNodeType()==Node.ELEMENT_NODE) {

+    		NodeList fieldChildren = field.getChildNodes();

+    		if (fieldChildren.getLength() == 0) 

+    			throw new InvalidDataException("No child node for element", "");

+    		

+    		else if (fieldChildren.getLength() == 1) {

+    			Node child = fieldChildren.item(0);

+    			if (child.getNodeType()==Node.TEXT_NODE || child.getNodeType()==Node.CDATA_SECTION_NODE)

+    				return child.getNodeValue();

+    			else

+    				throw new InvalidDataException("Can't get data from child node of type "+child.getNodeName(), "");

+    		}

+    		else 

+    			throw new InvalidDataException("Element "+xpath+" has too many children", "");

+    	}

+    	else if (field.getNodeType()==Node.ATTRIBUTE_NODE)		

+    		return field.getNodeValue();

+    	else

+    		throw new InvalidDataException("Don't know what to do with node "+field.getNodeName(), "");

+    }

+    

+    public void setFieldByXPath(String xpath, String data) throws XPathExpressionException, InvalidDataException {

+    	Node field = getNodeByXPath(xpath);

+    	if (field == null)

+    		throw new InvalidDataException(xpath, "");

+

+    	else if (field.getNodeType()==Node.ELEMENT_NODE) {

+    		NodeList fieldChildren = field.getChildNodes();

+    		if (fieldChildren.getLength() == 0) {

+    			field.appendChild(dom.createTextNode(data));

+    		}

+    		else if (fieldChildren.getLength() == 1) {

+    			Node child = fieldChildren.item(0);

+    			switch (child.getNodeType()) {

+    			case Node.TEXT_NODE:

+    			case Node.CDATA_SECTION_NODE:

+    				child.setNodeValue(data);

+    				break;

+    			default:

+    				throw new InvalidDataException("Can't set child node of type "+child.getNodeName(), "");

+    			}

+    		}

+    		else 

+    			throw new InvalidDataException("Element "+xpath+" has too many children", "");

+    	}

+    	else if (field.getNodeType()==Node.ATTRIBUTE_NODE)		

+    		field.setNodeValue(data);

+    	else

+    		throw new InvalidDataException("Don't know what to do with node "+field.getNodeName(), "");

     }

 

+

     public String getData() {

+    	if (mData == null && dom != null) {

+    		mData = serialize(dom, false);

+    	}

         return mData;

     }

 

@@ -153,7 +226,10 @@ public class Outcome implements C2KLocalObject {
     	if (dom == null)

         try {

             synchronized (parser) {

-                dom = parser.parse(new InputSource(new StringReader(mData)));

+            	if (mData!=null)

+            		dom = parser.parse(new InputSource(new StringReader(mData)));

+            	else

+            		dom = parser.newDocument();

             }

         } catch (Exception e) {

             Logger.error(e);

@@ -169,6 +245,20 @@ public class Outcome implements C2KLocalObject {
     	 else

     		 return null;

     }

+    

+    public NodeList getNodesByXPath(String xpathExpr) throws XPathExpressionException {

+    	

+    	XPathExpression expr = xpath.compile(xpathExpr);

+    	return (NodeList)expr.evaluate(getDOM(), XPathConstants.NODESET);

+    	

+    }

+    

+    public Node getNodeByXPath(String xpathExpr) throws XPathExpressionException {

+    	

+    	XPathExpression expr = xpath.compile(xpathExpr);

+    	return (Node)expr.evaluate(getDOM(), XPathConstants.NODE);

+    	

+    }

 

     static public String serialize(Document doc, boolean prettyPrint)

     {