/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 3047

Added by perry about 18 years ago

Added docid override mechanism to DBQuery. Bypasses the queryspec.printSQL method and creates an optimized docid query in cases (like the spatial query) where you know the docids a priori

     	if ( !MetaCatUtil.getOption("runSpatialOption").equals("true") ) {
             	response.setContentType("text/html");
             	out.println("<html> Metacat Spatial Option is turned off <html>");
             	out.println("<html> Metacat Spatial Option is turned off </html>");
             	out.close();
     		return ;
+    	}
-...
             Float _ymax = Float.parseFloat( ((String[]) params.get("YMAX"))[0] );
             Float _xmin = Float.parseFloat( ((String[]) params.get("XMIN"))[0] );
             Float _ymin = Float.parseFloat( ((String[]) params.get("YMIN"))[0] );
             SpatialQuery sq = new SpatialQuery();
             Vector docids = sq.filterByBbox( _xmin, _ymin, _xmax, _ymax );
             logMetacat.info(" --- Spatial Query completed. Passing on the SQuery handler");
             /*
              * Create an squery based on vector of matching docids
              * Create an array matching docids
              */
             String [] docidArray = new String[docids.size()];
             docids.toArray(docidArray);
             String squery = DocumentIdQuery.createDocidQuery( docidArray );
             logMetacat.info("-----------\n" + squery + "\n------------------");
             /*
              * Pass to squery handler
              * Create squery string
              */
             String squery = DocumentIdQuery.createDocidQuery( docidArray );
             logMetacat.info("-----------\n" + squery + "\n------------------");
             String[] queryArray = new String[1];
             queryArray[0] = squery;
             params.put("query", queryArray);
             // qformat
             /*
              * Determine qformat
              */
             String[] qformatArray = new String[1];
             try {
                 String _skin = ((String[]) params.get("SKIN"))[0];
-...
             actionArray[0] = "squery";
             params.put("action", actionArray);
             handleSQuery(out, params, response, username, groupnames, sess_id);
             /*
              * Pass the docids to the DBQuery contructor
              */
             DBQuery queryobj = new DBQuery(docids);
             queryobj.findDocuments(response, out, params, username, groupnames, sess_id);
+      }
         /**
          * Create a metacat squery for spatial data coordinates.
          */
         private String createSpatialQuery(float _xmin, float _ymin, float _xmax, float _ymax) {
     	StringBuffer sb = new StringBuffer();
     	sb.append("<pathquery version=\"1.2\">");
     	sb.append("<querytitle>Untitled-Search-3</querytitle>");
     	sb.append("<returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN</returndoctype>");
     	sb.append("<returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN</returndoctype>");
     	sb.append("<returndoctype>-//NCEAS//eml-dataset-2.0//EN</returndoctype>");
     	sb.append("<returndoctype>-//NCEAS//resource//EN</returndoctype>");
     	sb.append("<returndoctype>eml://ecoinformatics.org/eml-2.0.0</returndoctype>");
     	sb.append("<returndoctype>eml://ecoinformatics.org/eml-2.0.1</returndoctype>");
     	sb.append("<returndoctype>metadata</returndoctype>");
     	sb.append("<returnfield>dataset/title</returnfield>");
     	sb.append("<returnfield>originator/individualName/surName</returnfield>");
     	sb.append("<returnfield>originator/individualName/givenName</returnfield>");
     	sb.append("<returnfield>originator/organizationName</returnfield>");
     	sb.append("<returnfield>creator/individualName/surName</returnfield>");
     	sb.append("<returnfield>creator/individualName/givenName</returnfield>");
     	sb.append("<returnfield>creator/organizationName</returnfield>");
     	sb.append("<returnfield>keyword</returnfield>");
     	sb.append("<returnfield>entityName</returnfield>");
     	sb.append("<returnfield>idinfo/citation/citeinfo/title</returnfield>");
     	sb.append("<returnfield>idinfo/citation/citeinfo/origin</returnfield>");
     	sb.append("<returnfield>idinfo/keywords/theme/themekey</returnfield>");
     	sb.append("<querygroup operator=\"INTERSECT\">");
     	sb.append("<queryterm searchmode=\"greater-than\" casesensitive=\"false\">");
     	sb.append("<value>" + _ymin + "</value>");
     	sb.append("<pathexpr>northBoundingCoordinate</pathexpr>");
     	sb.append("</queryterm>");
     	sb.append("<queryterm searchmode=\"less-than\" casesensitive=\"false\">");
     	sb.append("<value>" + _ymax + "</value>");
     	sb.append("<pathexpr>southBoundingCoordinate</pathexpr>");
     	sb.append("</queryterm>");
     	sb.append("<queryterm searchmode=\"greater-than\" casesensitive=\"false\">");
     	sb.append("<value>" + _xmin + "</value>");
     	sb.append("<pathexpr>eastBoundingCoordinate</pathexpr>");
     	sb.append("</queryterm>");
      	sb.append("<queryterm searchmode=\"less-than\" casesensitive=\"false\">");
     	sb.append("<value>" + _xmax + "</value>");
     	sb.append("<pathexpr>westBoundingCoordinate</pathexpr>");
     	sb.append("</queryterm>");
     	sb.append("</querygroup>");
     	sb.append("</pathquery>");
     	return sb.toString();
+        }
         // LOGIN & LOGOUT SECTION
         /**
          * Handle the login request. Create a new session object. Do user

         /** true if the metacat spatial option is installed **/
         private final boolean METACAT_SPATIAL = true;
         // MPTODO testing
         Vector docidOverride = new Vector();
         /**
          * the main routine used to test the DBQuery utility.
          * <p>
-...
             this.parserName = parserName;
+        }
         /**
+         *
          * Construct an instance of DBQuery Class
          * BUT accept a docid Vector that will supersede
          * the query.printSQL() method
+         *
          * If a docid Vector is passed in,
          * the docids will be used to create a simple IN query
          * without the multiple subselects of the printSQL() method
+         *
          * Using this constructor, we just check for
          * a docidOverride Vector in the findResultDoclist() method
+         *
          * @param docids List of docids to display in the resultset
          */
         public DBQuery(Vector docids)
+        {
             this.docidOverride = docids;
             String parserName = MetaCatUtil.getOption("saxparser");
             this.parserName = parserName;
+        }
       /**
        * Method put the search result set into out printerwriter
-...
             	 params.put("isModerator", new String[] {"true"});
+             }
              //MPTODO testing
              //logMetacat.info("\n\n MPTODO \n\n " + xml.toString() + "\n\n");
              trans.transformXMLDocument(xml.toString(), "-//NCEAS//resultset//EN",
                                      "-//W3C//HTML//EN", qformat, out, params,
                                      sessionid);
-...
           String updateDate = null;
           StringBuffer document = null;
           int rev = 0;
           String query = qspec.printSQL(useXMLIndex);
           String query = null;
           /*
            * Check the docidOverride Vector
            * if defined, we bypass the qspec.printSQL() method
            * and contruct a simpler query based on a
            * list of docids rather than a bunch of subselects
            */
           if ( this.docidOverride.size() == 0 ) {
               query = qspec.printSQL(useXMLIndex);
           } else {
               logMetacat.info("\n\n\n******************* docid override **************\n\n\n");
               StringBuffer queryBuffer = new StringBuffer( "SELECT docid,docname,doctype,date_created, date_updated, rev " );
               queryBuffer.append( " FROM xml_documents WHERE docid IN (" );
               for (int i = 0; i < docidOverride.size(); i++) {
                   queryBuffer.append("'");
                   queryBuffer.append( (String)docidOverride.elementAt(i) );
                   queryBuffer.append("',");
+              }
               //MPTODO remove trailing "," instead of this empty string hack
               queryBuffer.append( "'') " );
               query = queryBuffer.toString();
+          }
           String ownerQuery = getOwnerQuery(user);
           logMetacat.info("query: " + query);
           //logMetacat.info("query: "+ownerQuery);
           logMetacat.info("\n\n\n query: " + query);
           logMetacat.info("\n\n\n owner query: "+ownerQuery);
           // if query is not the owner query, we need to check the permission
           // otherwise we don't need (owner has all permission by default)
           if (!query.equals(ownerQuery))
-...
             } else {
                 query = query + accessQuery.substring(4, accessQuery.length());
+            }
             logMetacat.warn(" final query: " + query);
             logMetacat.warn("\n\n\n final query: " + query);
+          }
           double startTime = System.currentTimeMillis() / 1000;
-...
          logMetacat.warn("prepare docid list time: "
                         + (docListTime - queryExecuteTime));
          //write the persistent spatial dataset
          /*
     	 if(metacatSpatialData != null){
     		metacatSpatialData.writeTextQueryData();
+    	 }
           */
          return resultsetBuffer;
         }//findReturnDoclist

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 3047

Added by perry about 18 years ago