Changeset 8184 for mauRepo/newmoonProject

Timestamp:

22/03/12 22:57:51 (9 years ago)

Author:

mnagni

Message:

Can execute parametrised XQuery

File:

• mauRepo/newmoonProject/trunk/project/xmi2rdbms/src/main/java/ndg/services/newmoon/gml/ValidateXMIModel.java (modified) (6 diffs)

mauRepo/newmoonProject/trunk/project/xmi2rdbms/src/main/java/ndg/services/newmoon/gml/ValidateXMIModel.java

@@ -30 +30 @@
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -39 +40 @@
 import javax.xml.namespace.QName;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xquery.XQConnection;
@@ -45 +49 @@
 import javax.xml.xquery.XQException;
 import javax.xml.xquery.XQExpression;
-import javax.xml.xquery.XQItemType;
-import javax.xml.xquery.XQPreparedExpression;
 import javax.xml.xquery.XQResultSequence;
 import javax.xml.xquery.XQSequence;
@@ -122 +124 @@
                 List items = new ArrayList();           
                 Iterator<String> iter = urls.iterator();
-                Document doc = null;
-                InputStream is = null;
                 while (iter.hasNext()) {
                         try {                           
-                                is = HTTPHelper.getResponseFromURL(iter.next());
-                                items.add(getXQConnection().createItemFromDocument(is, null, null));
+                                items.add(getXMLStreamReader(iter.next()));
                                 //is.close();
                         } catch (NdgExecutionException e) {
@@ -135 +134 @@
                 return getXQConnection().createSequence(items.iterator());              
         } 
+
+        private XMLStreamReader getXMLStreamReader(String url) throws NdgExecutionException {
+                XMLInputFactory factory = XMLInputFactory.newInstance();
+                InputStream is = HTTPHelper.getResponseFromURL("http://jenkins.badc.rl.ac.uk/xqueries/ISO19136-V3.2-AnxE_XMI-V1.1/mapping/Register_ExternalPackages.xml");
+                try {
+                        return factory.createXMLStreamReader(is);
+                } catch (XMLStreamException e) {
+                        throw new NdgExecutionException(e);
+                }
+        }
         
         private final void doTest(final InputStream inputXML) throws XPathExpressionException, XQException,
                         ParserConfigurationException, SAXException, IOException, ResourceNotAvailable {
-                Document doc = dh.parseDocument(inputXML);
-                
+                Document doc = dh.parseDocument(inputXML);              
                 try {
                         List<String> urls = new ArrayList<String>();
                         urls.add("http://jenkins.badc.rl.ac.uk/xqueries/ISO19136-V3.2-AnxE_XMI-V1.1/mapping/Register_ExternalPackages.xml");
-                        XQSequence sequence = getDocsSequence(urls);
-
-                        
-                        InputStream xquery = HTTPHelper.getResponseFromURL("http://jenkins.badc.rl.ac.uk/xqueries/ISO19136-V3.2-AnxE_XMI-V1.1/test-010.xq");
+                        //InputStream xquery = HTTPHelper.getResponseFromURL("http://jenkins.badc.rl.ac.uk/xqueries/ISO19136-V3.2-AnxE_XMI-V1.1/test-012.xq");                  
+                        //InputStream xquery = HTTPHelper.getResponseFromURL("http://jenkins.badc.rl.ac.uk/xqueries/ISO19136-V3.2-AnxE_XMI-V1.1/test-018.xq");
+                        InputStream xquery = HTTPHelper.getResponseFromURL("http://jenkins.badc.rl.ac.uk/xqueries/ISO19136-V3.2-AnxE_XMI-V1.1/test-027.xq");                    
                         XQExpression xqpe = getXQConnection().createExpression();
-                        xqpe.bindSequence(new QName("reg_external_packages") , sequence);
+                        xqpe.bindNode(XQConstants.CONTEXT_ITEM, doc, null);
+                        //xqpe.bindSequence(new QName("reg_external_packages") , getDocsSequence(urls));
                         XQSequence res = xqpe.executeQuery(xquery);
                         while(res.next()) {
@@ -159 +167 @@
                 }
                 
-                XQExpression xqe = getXQConnection().createExpression();
-                xqe.bindNode(XQConstants.CONTEXT_ITEM, doc, null);
-                executeQuery(xqe);
+                //XQExpression xqe = getXQConnection().createExpression();
+                //xqe.bindNode(XQConstants.CONTEXT_ITEM, doc, null);
+                //executeQuery(xqe);
         }