/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 2366

Added by sgarg almost 20 years ago

Modified code so that when a % search is done, a xml_nodes search is not done. This search is not required and hence saves time in doing a % search

+        {
             StringBuffer self = new StringBuffer();
             StringBuffer queryString = new StringBuffer();
             self.append("SELECT docid,docname,doctype,");
             self.append("date_created, date_updated, rev ");
             self.append("FROM xml_documents WHERE docid IN (");
             queryString.append("SELECT docid,docname,doctype,");
             queryString.append("date_created, date_updated, rev ");
             queryString.append("FROM xml_documents WHERE");
             // This determines the documents that meet the query conditions
             self.append(query.printSQL(useXMLIndex));
             // Get the query from the QueryGroup and check
             // if no query has been returned
             String queryFromQueryGroup = query.printSQL(useXMLIndex);
             if(!queryFromQueryGroup.trim().equals("()")){
                 self.append(" docid IN (");
                 self.append(query.printSQL(useXMLIndex));
                 self.append(") ");
+            }
             self.append(") ");
             // Add SQL to filter for doctypes requested in the query
             // This is an implicit OR for the list of doctypes. Only doctypes in
             // this
             // list will be searched if the tag is present
             if (!filterDocList.isEmpty()) {
                 boolean firstdoctype = true;
                 self.append(" AND (");
                 boolean emptyString = true;
                 if(!self.toString().equals("")){
                     self.append(" AND (");
                     emptyString = false;
+                }
                 Enumeration en = filterDocList.elements();
                 while (en.hasMoreElements()) {
                     String currentDoctype = (String) en.nextElement();
-...
                         self.append(" OR doctype = '" + currentDoctype + "'");
+                    }
+                }
                 self.append(") ");
                 if(!emptyString){
                     self.append(") ");
+                }
+            }
             // Add SQL to filter for owners requested in the query
             // This is an implicit OR for the list of owners
             if (!ownerList.isEmpty()) {
                 boolean first = true;
                 self.append(" AND (");
                 boolean emptyString = true;
                 if(!self.toString().equals("")){
                     self.append(" AND (");
                     emptyString = false;
+                }
                 Enumeration en = ownerList.elements();
                 while (en.hasMoreElements()) {
                     String current = (String) en.nextElement();
-...
                         self.append(" OR lower(user_owner) = '" + current + "'");
+                    }
+                }
                 self.append(") ");
                 if(!emptyString){
                     self.append(") ");
+                }
+            }
             // Add SQL to filter for sites requested in the query
             // This is an implicit OR for the list of sites
             if (!siteList.isEmpty()) {
                 boolean first = true;
                 self.append(" AND (");
                 boolean emptyString = true;
                 if(!self.toString().equals("")){
                     self.append(" AND (");
                     emptyString = false;
+                }
                 Enumeration en = siteList.elements();
                 while (en.hasMoreElements()) {
                     String current = (String) en.nextElement();
-...
                                 + accNumberSeparator + "')-1) = '" + current + "'");
+                    }
+                }
                 self.append(") ");
                 if(!emptyString){
                     self.append(") ");
+                }
+            }
             // if there is only one percentage search item, this query is a
-...
                 percentageSearch = true;
+            }
             return self.toString();
             queryString.append(self.toString());
             return queryString.toString();
+        }
         /**

             qspec.setGroup(groups);
             // Get access query
             String accessQuery = qspec.getAccessQuery();
             query = query + accessQuery;
             if(!query.endsWith("WHERE")){
                 query = query + accessQuery;
             } else {
                 query = query + accessQuery.substring(4, accessQuery.length());
+            }
             MetaCatUtil.debugMessage(" final query: " + query, 30);
+          }

     /**
      *  '$RCSfile$'
      *    Purpose: A Class that represents a structured query, and can be
      *             constructed from an XML serialization conforming to
      *             pathquery.dtd. The printSQL() method can be used to print
      *    Purpose: A Class that represents a structured query, and can be
      *             constructed from an XML serialization conforming to
      *             pathquery.dtd. The printSQL() method can be used to print
      *             a SQL serialization of the query.
      *  Copyright: 2000 Regents of the University of California and the
      *             National Center for Ecological Analysis and Synthesis
-...
         private String operator = null;  // indicates how query terms are combined
         private Vector children = null;  // the list of query terms and groups
         private int countPercentageSearchItem = 0;
         /**
          * construct a new QueryGroup
         /**
          * construct a new QueryGroup
+         *
          * @param operator 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 operator) {
-...
           children = new Vector();
+        }
         /**
         /**
          * Add a child QueryGroup to this QueryGroup
+         *
          * @param qgroup the query group to be added to the list of terms
          */
         public void addChild(QueryGroup qgroup) {
           children.add((Object)qgroup);
           children.add((Object)qgroup);
+        }
         /**
-...
          * @param qterm the query term to be added to the list of terms
          */
         public void addChild(QueryTerm qterm) {
           children.add((Object)qterm);
           children.add((Object)qterm);
+        }
         /**
-...
         public Enumeration getChildren() {
           return children.elements();
+        }
         public int getPercentageSymbolCount()
+        {
           return countPercentageSearchItem;
+        }
         /**
          * create a SQL serialization of the query that this instance represents
          */
-...
               countPercentageSearchItem = countPercentageSearchItem + count;
             } else if (qobject instanceof QueryTerm) {
                QueryTerm qt = (QueryTerm)qobject;
                self.append(qt.printSQL(useXMLIndex));
                String queryString = qt.printSQL(useXMLIndex);
                if(!(qt.getSearchMode().equals("contains") && qt.getValue().equals("%"))){
                    self.append(queryString);
+               }
                // count percerntage number
                int count = qt.getPercentageSymbolCount();
                countPercentageSearchItem = countPercentageSearchItem + count;

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 2366

Added by sgarg almost 20 years ago