Kepler

Index: src/org/ecoinformatics/ecogrid/EcogridQueryParser.java

===================================================================

RCS file: /cvs/seek/projects/ecogrid/src/org/ecoinformatics/ecogrid/EcogridQueryParser.java,v

retrieving revision 1.3

diff -u -r1.3 EcogridQueryParser.java

--- src/org/ecoinformatics/ecogrid/EcogridQueryParser.java	6 Oct 2004 18:21:41 -0000	1.3

+++ src/org/ecoinformatics/ecogrid/EcogridQueryParser.java	9 Dec 2004 21:02:26 -0000

@@ -54,44 +54,62 @@

 public class EcogridQueryParser

 {

    //fields

-   private QueryType ecogridQuery;

-   private Document doc;

+   private QueryType _ecogridQuery;

+   private Node _queryNode;

+   

    //Constant

-   private static final String QUERYIDATTRIBUTE = "/query/@queryId";

-   private static final String SYSTEMATTRIBUTE = "/query/@system";

-   private static final String NAMESPACE = "/query/namespace";

-   private static final String PREFIX  = "prefix";

-   private static final String RETURNFIELD = "/query/returnfield";

-   private static final String TITLE      = "/query/title";

-   private static final String FIRSTAND  = "/query/AND";

-   private static final String FIRSTOR   = "/query/OR";

-   private static final String FIRSTCONDITION = "/query/condition";

-   private static final String AND = "AND";

-   private static final String OR  = "OR";

-   private static final String CON = "condition";

-   private static final String OPERATOR = "operator";

-   private static final String CONCEPT = "concept";

+   private static final String QUERYIDATTRIBUTE = "@queryId";

+   private static final String SYSTEMATTRIBUTE  = "@system";

+   private static final String NAMESPACE        = "namespace";

+   private static final String PREFIX           = "prefix";

+   private static final String RETURNFIELD      = "returnField";

+   private static final String TITLE            = "title";

+   private static final String FIRSTAND         = "AND";

+   private static final String FIRSTOR          = "OR";

+   private static final String FIRSTCONDITION   = "condition";

+   private static final String AND              = "AND";

+   private static final String OR               = "OR";

+   private static final String CON              = "condition";

+   private static final String OPERATOR         = "operator";

+   private static final String CONCEPT          = "concept";

+   

    /**

-    * default constructor

+    * Constructor with reader for parsing XML

     * @param  xmlInput  xml source

     */

    public EcogridQueryParser (Reader xmlInput)  throws Exception

    {

       //create new ecogrid query java object

-      ecogridQuery = new QueryType();

+      _ecogridQuery = new QueryType();

       //build dom tree

       InputSource in = new InputSource(xmlInput);

       DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();

       dfactory.setNamespaceAware(false);

-      doc = dfactory.newDocumentBuilder().parse(in);

-    }//EcogridQueryParser

+      Document doc = dfactory.newDocumentBuilder().parse(in);

+      

+      // Find the query node, all searches are relative to it.

+      NodeList queryIdList = XPathAPI.selectNodeList(doc, "/query");

+      _queryNode = queryIdList.item(0);

+

+    }  //EcogridQueryParser

+

+   /**

+    * Constructor wityh DOM node point to Query node

+    * @param  aQueryDOMNode  DOM Node

+    */

+   public EcogridQueryParser (Node aQueryDOMNode)

+   {

+      //create new ecogrid query java object

+      _ecogridQuery = new QueryType();

+      _queryNode    = aQueryDOMNode;

+    }  //EcogridQueryParser

     /**

      * Method to get ecogridquery

      */

    public QueryType getEcogridQuery()

    {

-     return ecogridQuery;

+     return _ecogridQuery;

    }

    /**

@@ -99,7 +117,7 @@

     */

    public void setEcogridQuery(QueryType query)

    {

-      ecogridQuery = query;

+      _ecogridQuery = query;

    }

    /**

@@ -114,30 +132,55 @@

      setupFirstRelation();

    }//parseXML

-

+   private Node getAttrNode(String aDocXPath, String aNodeXPath)

+   {

+       Node node = _queryNode;

+       try 

+       {

+           if (_queryNode.getNodeType() == Node.DOCUMENT_NODE)

+           {

+             NodeList queryIdList = XPathAPI.selectNodeList(_queryNode, aDocXPath);

+             node = queryIdList.item(0);

+           }

+           else

+           {

+               NodeList queryIdList = XPathAPI.selectNodeList(_queryNode, aNodeXPath);

+               node = queryIdList.item(0);

+           }

+       } catch (Exception e)

+       {

+           System.err.println(e);

+       }

+       return node;

+   }

    /* setup queryid and system */

    private void setupQueryIdAndSystem() throws Exception

    {

+     // The _queryNode may be a document node qparsed in from an XML document or may be

+     // a generic DOM node (a subtree) of an existing tree

      // get query id

-     NodeList queryIdList = XPathAPI.selectNodeList(doc, QUERYIDATTRIBUTE);

-     String queryId = (queryIdList.item(0)).getNodeValue();

+     NodeList queryIdList = XPathAPI.selectNodeList(_queryNode, QUERYIDATTRIBUTE);

+     String queryId = ((Node)queryIdList.item(0)).getNodeValue();

+     

      //System.out.println("queryId is: "+ queryId);

      // set query id

-     ecogridQuery.setQueryId(queryId);

+     _ecogridQuery.setQueryId(queryId);

      // get system

-     NodeList systemList = XPathAPI.selectNodeList(doc, SYSTEMATTRIBUTE);

+     NodeList systemList = XPathAPI.selectNodeList(_queryNode, SYSTEMATTRIBUTE);

      String system = (systemList.item(0)).getNodeValue();

      //System.out.println("system is: "+ system);

      URI systemUri = new URI(system);

      //set system

-     ecogridQuery.setSystem(systemUri);

-    }//setupQueryIdAndSystem

+     _ecogridQuery.setSystem(systemUri);

+     

+    } // setupQueryIdAndSystem

+   

    /* setup namepsace */

    private void setupNamespace() throws Exception

    {

      // get namespace

-     NodeList namespaceList = XPathAPI.selectNodeList(doc, NAMESPACE);

+     NodeList namespaceList = XPathAPI.selectNodeList(_queryNode, NAMESPACE);

      int length = namespaceList.getLength();

      QueryType_namespace [] namespaceArray;

      if ( length != 0 )

@@ -159,7 +202,7 @@

          namespaceArray[i]=queryNamespace;

        }

        // set up the QueryType_namespace object to ecogrid query object

-       ecogridQuery.setNamespace(namespaceArray);

+       _ecogridQuery.setNamespace(namespaceArray);

      }

    }//setupNamespace

@@ -167,7 +210,7 @@

    private void setupReturnField() throws Exception

    {

      // get retrunfield

-     NodeList returnFieldList = XPathAPI.selectNodeList(doc, RETURNFIELD);

+     NodeList returnFieldList = XPathAPI.selectNodeList(_queryNode, RETURNFIELD);

      String [] returnFieldArray ;

      int length = returnFieldList.getLength();

      if (length != 0)

@@ -181,7 +224,7 @@

          returnFieldArray[i] = returnfieldString;

        }

        // set up the QueryType_namespace object to ecogrid query object

-       ecogridQuery.setReturnfield(returnFieldArray);

+       _ecogridQuery.setReturnfield(returnFieldArray);

      }

    }//setupReturnField

@@ -189,7 +232,7 @@

    private void setupTitle() throws Exception

    {

      // get retrunfield

-     NodeList titleList = XPathAPI.selectNodeList(doc, TITLE);

+     NodeList titleList = XPathAPI.selectNodeList(_queryNode, TITLE);

      String [] titleArray ;

      int length = titleList.getLength();

      if (length != 0)

@@ -204,16 +247,16 @@

          titleArray[i] = titleString;

        }

        // set up the QueryType_namespace object to ecogrid query object

-       ecogridQuery.setTitle(titleArray);

+       _ecogridQuery.setTitle(titleArray);

      }

    }//setupReturnField

    /* setup first relation type */

    private void setupFirstRelation() throws Exception

    {

-     NodeList firstAND = XPathAPI.selectNodeList(doc, FIRSTAND);

-     NodeList firstOR  = XPathAPI.selectNodeList(doc, FIRSTOR);

-     NodeList firstCondition = XPathAPI.selectNodeList(doc, FIRSTCONDITION);

+     NodeList firstAND = XPathAPI.selectNodeList(_queryNode, FIRSTAND);

+     NodeList firstOR  = XPathAPI.selectNodeList(_queryNode, FIRSTOR);

+     NodeList firstCondition = XPathAPI.selectNodeList(_queryNode, FIRSTCONDITION);

      int andLength = firstAND.getLength();

      int orLength  = firstOR.getLength();

      int conLength = firstCondition.getLength();

@@ -222,7 +265,7 @@

        //first is and

        ANDType and = new ANDType();

        handleANDType(and, firstAND.item(0));

-       ecogridQuery.setAND(and);

+       _ecogridQuery.setAND(and);

      }

      else if (orLength != 0 && andLength ==0 && conLength == 0)

@@ -230,13 +273,13 @@

        // first is or

        ORType or = new ORType();

        handleORType(or, firstOR.item(0));

-       ecogridQuery.setOR(or);

+       _ecogridQuery.setOR(or);

      }

      else if (conLength != 0 &&orLength == 0 && andLength == 0  )

      {

        // first is condition

        ConditionType condition = handleConditionType(firstCondition.item(0));

-       ecogridQuery.setCondition(condition);

+       _ecogridQuery.setCondition(condition);

      }

      else

      {

Index: src/org/ecoinformatics/ecogrid/EcogridQueryTransformer.java

===================================================================

RCS file: /cvs/seek/projects/ecogrid/src/org/ecoinformatics/ecogrid/EcogridQueryTransformer.java,v

retrieving revision 1.3

diff -u -r1.3 EcogridQueryTransformer.java

--- src/org/ecoinformatics/ecogrid/EcogridQueryTransformer.java	11 Oct 2004 19:34:59 -0000	1.3

+++ src/org/ecoinformatics/ecogrid/EcogridQueryTransformer.java	9 Dec 2004 21:02:26 -0000

@@ -202,7 +202,7 @@

         {

             for (int i = 0; i < returnfields.length; i++)

             {

-                strBuf.append("  <returnfield>" + returnfields[i] + "</returnfield>\n");

+                strBuf.append("  <returnField>" + returnfields[i] + "</returnField>\n");

             }

         }