/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 3211

Added by berkley about 17 years ago

adding changes to make paged query results possible

                     // aware of session expiration on every request
                 } else {
                     HttpSession sess = request.getSession(true);
                     logMetacat.info("session.isnew: " + sess.isNew() + "    params.hassessid: " + params.containsKey("sessionid"));
                     if (sess.isNew() && !params.containsKey("sessionid")) {
                         // session expired or has not been stored b/w user requests
                         logMetacat.info(
                                 "The session is new or no sessionid is assigned. The user is public");
                         username = "public";
                         sess.setAttribute("username", username);
                         sess_id = (String)sess.getId();
                                   sess.setAttribute("sessionid", sess_id);
                         sessionHash.put(sess_id, sess);
                     } else {
                         logMetacat.info("The session is either old or "
                                 + "has sessionid parameter");
-...
                                     sess = (HttpSession) sessionHash.get(sess_id);
+                                }
                             } else {
                                 // we already store the session in login, so we
                                 // don't need here
                                 /*
                                  * logMetacat.info("in no sessionid
                                  * parameter ", 40); sess_id =
                                  * (String)sess.getId();
                                  * logMetacat.info("storing the session id "
                                  * + sess_id + " which has username " +
                                  * sess.getAttribute("username") + " into session
                                  * hash in handleGetOrPost method", 35);
                                  */
                               //this makes sure there is a session object for public sessions
                               sess_id = sess.getId();
                               sessionHash.put(sess_id, sess);
+                            }
                         } catch (IllegalStateException ise) {
                             logMetacat.error(
-...
                         groupnames = (String[]) sess.getAttribute("groupnames");
                         name = (String) sess.getAttribute("name");
+                    }
                     logMetacat.info("&*&*&*&*&*&*&*&*&*&*&*&*&*&*&&*&*SESSIONID1: " + sess_id);
                     //make user user username should be public
                     if (username == null || (username.trim().equals(""))) {

     import javax.servlet.ServletOutputStream;
     import javax.servlet.http.HttpServletResponse;
     import javax.servlet.http.HttpSession;
     import org.apache.log4j.Logger;
-...
                                              String user, String[] groups,
                                              String sessionid, boolean useXMLIndex)
+        {
           int pagesize = 0;
           int pagestart = 0;
           if(params.containsKey("pagesize") && params.containsKey("pagestart"))
+          {
             String pagesizeStr = ((String[])params.get("pagesize"))[0];
             String pagestartStr = ((String[])params.get("pagestart"))[0];
             if(pagesizeStr != null && pagestartStr != null)
+            {
               pagesize = (new Integer(pagesizeStr)).intValue();
               pagestart = (new Integer(pagestartStr)).intValue();
+            }
+          }
           // get query and qformat
           String xmlquery = ((String[])params.get("query"))[0];
           logMetacat.warn("SESSIONID: " + sessionid);
           logMetacat.warn("xmlquery: " + xmlquery);
           String qformat = ((String[])params.get("qformat"))[0];
           logMetacat.warn("qformat: " + qformat);
-...
+          {
             //xml format
             response.setContentType("text/xml");
             createResultDocument(xmlquery, qspec, out, user, groups, useXMLIndex);
             createResultDocument(xmlquery, qspec, out, user, groups, useXMLIndex,
               pagesize, pagestart, sessionid);
           }//if
           else
+          {
-...
             response.setContentType("text/html");
             PrintWriter nonout = null;
             StringBuffer xml = createResultDocument(xmlquery, qspec, nonout, user,
                                                     groups, useXMLIndex);
                                                     groups, useXMLIndex, pagesize,
                                                     pagestart, sessionid);
             //transfer the xml to html
             try
-...
              DBTransform trans = new DBTransform();
              response.setContentType("text/html");
     	 // if the user is a moderator, then pass a param to the
     	       // if the user is a moderator, then pass a param to the
              // xsl specifying the fact
              if(MetaCatUtil.isModerator(user, groups)){
             	 params.put("isModerator", new String[] {"true"});
-...
                                                 QuerySpecification qspec,
                                                 PrintWriter out,
                                                 String user, String[] groups,
                                                 boolean useXMLIndex)
                                                 boolean useXMLIndex, int pagesize,
                                                 int pagestart, String sessionid)
+      {
         DBConnection dbconn = null;
         int serialNumber = -1;
-...
             //print out the search result
             // search the doc list
             resultset = findResultDoclist(qspec, resultset, out, user, groups,
                                           dbconn, useXMLIndex);
                                           dbconn, useXMLIndex, pagesize, pagestart,
                                           sessionid);
-...
                                           StringBuffer resultsetBuffer,
                                           PrintWriter out,
                                           String user, String[]groups,
                                           DBConnection dbconn, boolean useXMLIndex )
                                           DBConnection dbconn, boolean useXMLIndex,
                                           int pagesize, int pagestart, String sessionid)
                                           throws Exception
+        {
           /*
           if pagesize != 0 then we need to process the query results in pages
 ) check to see what the sessionid is: look in MetacatServlet.getSessionHash()
 ) lookup the sessionid and the query in the paged_results table
 ) if there is already a page result for the session and query get that
              result and look at what our pagesize and pagestart is to get the next
              pagesize results
 ) if there is not a cached result, do the query, put the result in the
              cache under the correct sessionid and return 0..pagesize results
 ) when the session expires or is logged out, delete the cached queryresults
           paged_results
           -------------
           sessionid (PK) (String)
           query (String)
           resultset (String)
           */
           Hashtable sessionHash = MetaCatServlet.getSessionHash();
           HttpSession sess = (HttpSession)sessionHash.get(sessionid);
           //now we have the session object, so we can cache the query there.
           int offset = 1;
           // this is a hack for offset
           if (out == null)
-...
           double startTime = System.currentTimeMillis() / 1000;
           pstmt = dbconn.prepareStatement(query);
           // Execute the SQL query using the JDBC connection
           pstmt.execute();
           ResultSet rs = pstmt.getResultSet();
           double queryExecuteTime = System.currentTimeMillis() / 1000;
           logMetacat.warn("Pagesize: " + pstmt.getFetchSize());
           logMetacat.warn("Time for execute query: "
                         + (queryExecuteTime - startTime));
           boolean tableHasRows = rs.next();
-...
                 ignoredParams.add("site");
                 ignoredParams.add("operator");
                 ignoredParams.add("sessionid");
                 ignoredParams.add("pagesize");
                 ignoredParams.add("pagestart");
                 // Also ignore parameters listed in the properties file
                 // so that they can be passed through to stylesheets

src/edu/ucsb/nceas/metacat/QueryTerm.java
292	292	*/
293	293	public static String useNestedStatements(String pathexpr)
294	294	{
	295	System.out.println("pathexpr: " + pathexpr);
295	296	StringBuffer nestedStmts = new StringBuffer();
296	297	Vector nodes = new Vector();
297	298	String path = pathexpr;

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 3211

Added by berkley about 17 years ago