/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 178

Added by Matt Jones over 24 years ago

fixed QuerySpecification to produce SQL that does UNION or INTERSECT set operations for query group combinations

         elementStack.push(currentNode);
         if (currentNode.getTagName().equals("querygroup")) {
           QueryGroup currentGroup = new QueryGroup(
                                     currentNode.getAttribute("booleantype"));
                                     currentNode.getAttribute("operator"));
           if (query == null) {
             query = currentGroup;
           } else {
-...
         // This determines the returned results
         self.append("SELECT docid,docname,doctype,doctitle ");
         self.append("FROM xml_documents WHERE docid IN (");
         self.append("SELECT DISTINCT docid FROM xml_nodes WHERE \n");
         // This determines the WHERE conditions
         // This determines the documents that meet the query conditions
         self.append(query.printSQL());
         self.append(") ");
-...
       /** a utility class that represents a group of terms in a query */
       private class QueryGroup {
         private String booleantype = null; // indicates how query terms are combined
         private Vector children = null;    // the list of query terms and groups
         private String operator = null;  // indicates how query terms are combined
         private Vector children = null;  // the list of query terms and groups
         /**
          * construct a new QueryGroup
+         *
          * @param booleantype the boolean conector used to connect query terms
          * @param operator the boolean conector used to connect query terms
          *                    in this query group
          */
         public QueryGroup(String booleantype) {
           this.booleantype = booleantype;
         public QueryGroup(String operator) {
           this.operator = operator;
           children = new Vector();
+        }
-...
             if (first) {
               first = false;
             } else {
               self.append(" " + booleantype + " ");
               self.append(" " + operator + " ");
+            }
             if (qobject instanceof QueryGroup) {
               QueryGroup qg = (QueryGroup)qobject;
-...
         public String toString() {
           StringBuffer self = new StringBuffer();
           self.append("  (Query group booleantype=" + booleantype + "\n");
           self.append("  (Query group operator=" + operator + "\n");
           Enumeration en= getChildren();
           while (en.hasMoreElements()) {
             Object qobject = en.nextElement();
-...
             searchvalue = casevalue;
+          }
           self.append("(");
           self.append("SELECT DISTINCT docid FROM xml_nodes WHERE \n");
           if (pathexpr != null) {
             self.append(nodedataterm + " LIKE " + "'" + searchvalue + "' ");
-...
             self.append(nodedataterm + " LIKE " + "'" + searchvalue + "' ");
+          }
           self.append(") \n");
           return self.toString();
+        }

       /**
        * routine to search the elements and attributes looking to match query
+       *
        * @param queryspec the xml serialization of the query (@see pathquery.dtd)
        * @param xmlquery the xml serialization of the query (@see pathquery.dtd)
        */
       public Hashtable findDocuments(Reader queryspec) {
       public Hashtable findDocuments(Reader xmlquery) {
           Hashtable	 docListResult = new Hashtable();
           PreparedStatement pstmt;
           String docid = null;
-...
           try {
             // Get the XML query and covert it into a SQL statment
             QuerySpecification qspec = new QuerySpecification(queryspec,
             QuerySpecification qspec = new QuerySpecification(xmlquery,
                                        parserName);
             System.out.println(qspec.printSQL());
             pstmt = conn.prepareStatement( qspec.printSQL() );
             // Execute the SQL query using the JDBC connection

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 178

Added by Matt Jones over 24 years ago