/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 3221

Added by berkley over 17 years ago

paging now works well. sped up the caching by using SAX instead of DOM parsing. it seems fast. need some other people to test for me though. the two params needed are 'pagesize' and 'pagestart'. I haven't updated any of the web interfaces to use this, so if you want to try it, you'll have to type in the url the old fashioned way

       private StringBuffer getPagedResult(MetacatResultSet mrs, int pagestart,
         int pagesize)
+      {
         logMetacat.warn(mrs.toString());
         //logMetacat.warn(mrs.toString());
         if(pagesize == 0)
         { //if pagesize is 0 then we return the whole resultset
           return new StringBuffer(mrs.toString());
-...
            cachedQuerySpec.printSQL(false).equals(qspec.printSQL(false)))
         { //use the cached resultset if the query was the same as the last
           MetacatResultSet mrs = (MetacatResultSet)sess.getAttribute("results");
           logMetacat.info("Using cached query results");
           logMetacat.info("Using cached query results.");
           //if the query is the same and the session contains the query
           //results, return those instead of rerunning the query
           if(mrs != null)
-...
             resultset = findResultDoclist(qspec, resultset, out, user, groups,
                                           dbconn, useXMLIndex, pagesize, pagestart,
                                           sessionid);
           } //try
           catch (IOException ioe)
+          {
-...
           out.println(closeRestultset);
+        }
         //create a DOM to cache
         try
+        {
           //cache the query result and the query
           logMetacat.info("Caching query and resultset");
           sess.setAttribute("query", qspec);
           MetacatResultSet mrs = processAndCacheResults(resultset.toString(), sess);
           MetacatResultSet mrs = new MetacatResultSet(resultset.toString());
           sess.setAttribute("results", mrs);
           StringBuffer pagedResultBuffer = getPagedResult(mrs, pagestart, pagesize);
           String returnString = "<?xml version=\"1.0\"?>\n";
-...
+        }
         catch(Exception e)
+        {
           logMetacat.error("################Could not parse resultset: " + e.getMessage());
           logMetacat.error("Could not parse resultset: " + e.getMessage());
           //e.printStackTrace();
+        }
         //default to returning the whole resultset
         return resultset;
       }//createResultDocuments
       /**
        * parse the dom of the resultset into a MetacatResultSet object so it can
        * be cached in a reasonable way
        */
       private MetacatResultSet processAndCacheResults(String resultset, HttpSession sess)
         throws Exception
+      {
         StringReader sreader = new StringReader(resultset.toString());
         InputSource inputsource = new InputSource(sreader);
         logMetacat.warn("processing DOM");
         Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputsource);
         //got the dom, now process it into an MRS
         MetacatResultSet mrs = new MetacatResultSet(doc);
         return mrs;
+      }
         /*
          * Find the doc list which match the query
          */

     /**
      *  '$RCSfile$'
      *    Purpose: A Class that searches a relational DB for elements and
      *             attributes that have free text matches a query string,
      *             or structured query matches to a path specified node in the
      *             XML hierarchy.  It returns a result set consisting of the
      *             document ID for each document that satisfies the query
      *  Copyright: 2000 Regents of the University of California and the
      *  Copyright: 2007 Regents of the University of California and the
      *             National Center for Ecological Analysis and Synthesis
      *    Authors: Matt Jones
      *    Authors: Chad Berkley
+     *
      *   '$Author$'
      *     '$Date$'
-...
     import org.apache.log4j.Logger;
     import org.apache.log4j.Logger;
     import org.xml.sax.Attributes;
     import org.xml.sax.SAXException;
     import org.xml.sax.SAXParseException;
     import org.xml.sax.ext.DeclHandler;
     import org.xml.sax.ext.LexicalHandler;
     import org.xml.sax.helpers.DefaultHandler;
     import org.xml.sax.XMLReader;
     import org.xml.sax.helpers.XMLReaderFactory;
     import org.xml.sax.ContentHandler;
     import org.xml.sax.ErrorHandler;
     import org.xml.sax.InputSource;
     /**
      * this class implements a metacat resultset and can be serialized to xml
      * for printing to the servlet output stream.
      */
     public class MetacatResultSet
     public class MetacatResultSet extends DefaultHandler
+    {
       public static final String VALIDATIONFEATURE = "http://xml.org/sax/features/validation";
       public static final String SCHEMAVALIDATIONFEATURE = "http://apache.org/xml/features/validation/schema";
       public static final String NAMESPACEFEATURE = "http://xml.org/sax/features/namespaces";
       public static final String NAMESPACEPREFIXESFEATURE = "http://xml.org/sax/features/namespace-prefixes";
       public static final String RESOLVEDTDFEATURE = "http://apache.org/sax/features/load-dtd-grammar";
       public static final String LOADDTDFEATURE = "http://apache.org/sax/features/load-external-dtd";
       public static final String DOCTYPEDECLFEATURE = "http://apache.org/sax/features/disallow-doctype-decl";
       public static final String DECLARATIONHANDLERPROPERTY = "http://xml.org/sax/properties/declaration-handler";
       public static final String LEXICALPROPERTY = "http://xml.org/sax/properties/lexical-handler";
       private Logger log = Logger.getLogger(MetacatResultSet.class);
       private Vector results = new Vector();
       private Result currentResult = null;
       private String currentElementName = "";
       Attributes atts = null;
       /**
        * default constructor
-...
+      }
       /**
        * constructor that can process a dom.  this is very slow.
        * constructor that can process a dom.  WARNING: this is very slow.
        */
       public MetacatResultSet(Document d)
         throws Exception
-...
+      }
       /**
        * process a resultset using SAX
        */
       public MetacatResultSet(String xmlDoc)
         throws SAXException, IOException
+      {
         XMLReader parser = null;
         String parserName = MetaCatUtil.getOption("saxparser");
         parser = XMLReaderFactory.createXMLReader(parserName);
         parser.setContentHandler(this);
         parser.setErrorHandler(this);
         parser.parse(new InputSource(new StringReader(xmlDoc)));
+      }
       /**
        * process the beginning of an element
        */
       public void startElement(String uri, String localName, String qName,
         Attributes atts) throws SAXException
+      {
         //get the attributes
         this.atts = atts;
         if(localName.equals("document"))
+        {
           currentResult = new Result();
+        }
         else if(localName.equals("docid") ||
                 localName.equals("docname") ||
                 localName.equals("doctype") ||
                 localName.equals("createdate") ||
                 localName.equals("updatedate") ||
                 localName.equals("param"))
         { //set the current element name
           currentElementName = localName;
+        }
+      }
       /**
        * process the end of an element
        */
       public void endElement(String uri, String localName, String qName)
         throws SAXException
+      {
         if(localName.equals("document"))
         { //if we're closing a document, save the result
           addResult(new Result(currentResult));
           currentResult = new Result();
           currentElementName = "";
+        }
+      }
       /**
        * process character data
        */
       public void characters(char[] cbuf, int start, int len)
         throws SAXException
       { //get the character data for each node we care about
         String s = new String(cbuf, start, len);
         if(currentElementName.equals("docid"))
+        {
           currentResult.docid = s;
+        }
         else if(currentElementName.equals("docname"))
+        {
           currentResult.docname = s;
+        }
         else if(currentElementName.equals("doctype"))
+        {
           currentResult.doctype = s;
+        }
         else if(currentElementName.equals("createdate"))
+        {
           currentResult.createDate = s;
+        }
         else if(currentElementName.equals("updatedate"))
+        {
           currentResult.updateDate = s;
+        }
         else if(currentElementName.equals("param"))
         { //add the returnfields to the hashtable
           for (int i = 0; i < atts.getLength(); i++)
+          {
             String attributeName = atts.getQName(i);
             String attributeValue = null;
             if(attributeName.equals("name"))
+            {
               attributeValue = atts.getValue(i);
+            }
             currentResult.returnfields.put(attributeValue, s);
+          }
+        }
+      }
       /**
        * SAX Handler that receives notification of fatal parsing errors
        */
       public void fatalError(SAXParseException exception) throws SAXException
+      {
           log.fatal("FATALERROR: " + exception.getMessage());
           throw (new SAXException("Fatal error processing/caching resultset.", exception));
+      }
       /**
        * SAX Handler that receives notification of recoverable parsing errors
        */
       public void error(SAXParseException exception) throws SAXException
+      {
           log.error("ERROR: " + exception.getMessage());
           throw (new SAXException("Error in processing/caching resultset.", exception));
+      }
       /**
        * SAX Handler that receives notification of warnings
        */
       public void warning(SAXParseException exception) throws SAXException
+      {
           log.warn("WARNING while parsing/caching resultset: " + exception.getMessage());
           throw (new SAXException("Warning.", exception));
+      }
       /**
        * add a new result to the resultSet
        */
       public void addResult(Result r)
-...
        */
       public class Result
+      {
         private String docid;
         private String docname;
         private String doctype;
         private String createDate;
         private String updateDate;
         private Hashtable returnfields;
         protected String docid;
         protected String docname;
         protected String doctype;
         protected String createDate;
         protected String updateDate;
         protected Hashtable returnfields;
         /**
          * copy constructor
          */
         public Result(Result r)
+        {
           if(r != null)
+          {
             docid = r.docid;
             docname = r.docname;
             doctype = r.doctype;
             createDate = r.createDate;
             updateDate = r.updateDate;
             returnfields = r.returnfields;
+          }
+        }
         /**
          * constructor
          */
         public Result(String docid, String docname, String doctype,
-...
+        }
         /**
          * default constructor
          */
         public Result()
+        {
           returnfields = new Hashtable();
+        }
         /**
          * returns serialized version of this result
          */
         public String toString()

                     if (!isRevisionDoc)
+                    {
                       //System.out.println("here!!!!!!!!!!!3");
                       currentDocument = new DocumentImpl(connection, rootNode
                             .getNodeID(), docname, doctype, docid, revision,
                             action, user, this.pub, catalogid, this.serverCode,
                             createDate, updateDate);
                       //System.out.println("here!!!!!!!!!!!4");
+                    }
+                    }
                 } catch (Exception ane) {
                     ane.printStackTrace();
                     throw (new SAXException("Error in DBSaxHandler.startElement "

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 3221

Added by berkley over 17 years ago