/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 373

Added by berkley over 24 years ago

Changed the flow of query and SQuery. SQuery now only handles a preformatted pathquery document as input (in the "query" parameter).
HandleQuery now handles all structured queries derived by CGI parameters.

+          }
           if (name.endsWith(".x")) {
             name = "xpos";
+          }
+          }
           //out.println(name + " => " + value[0]);
           params.put(name,value);
+        }
           params.put(name,value);
+        }
         //if the user clicked on the input images, decode which image
         //was clicked then set the action.
-...
             // session expired or has not been stored b/w user requests
             // redirect to default page for query only access
           //  response.sendRedirect(htmlpath + "/sexpire.html");
+          }
-...
         if(action.equals("query"))
+        {
           handleQuery(out, params, response);
+        }
+        }
         else if(action.equals("squery"))
+        {
           handleSQuery(out, params, response);
+        }
           if(params.containsKey("query"))
+          {
             handleSQuery(((String[])params.get("query"))[0]);
+          }
           else
+          {
             out.println("Illegal action squery without \"query\" parameter");
+          }
+        }
         else if (action.equals("getdocument")) {
           try {
             handleGetDocumentAction(out, params, response);
-...
+        }
+      }
       /**
       /**
         *Create the squery xml, execute it and display it
         * @param out is the output stream to the client
         * @param params is the Hashtable of parameters that should be included
-...
         * @param response is the response object linked to the client
         * @param conn the database connection
         */
       private void handleSQuery(PrintWriter out, Hashtable params,
                                 HttpServletResponse response)
+      {
         //create the squery and return it to be processed
         String doctype = null;
         String xmlquery = null;
         String[] doctypeArr = null;
         Connection conn = null;
         doctypeArr = (String[])params.get("doctype");
         doctype = null;
         if (doctypeArr != null)
+        {
           doctype = ((String[])params.get("doctype"))[0];
+        }
         else
+        {
           doctype="ANY";
+        }
         if(params.containsKey("query"))
         { //handles the case where the client creates the pathquery
           //document itself (i.e. for DMan)
           String query = ((String[])params.get("query"))[0];
           if(!query.equals(""))
+          {
             xmlquery = DBQuery.createQuery(query, doctype);
+          }
+        }
         else
+        {
           //Creates a squery from the CGI parameters
           xmlquery = DBQuery .createSQuery(params, doctype);
+        }
       private String handleSQuery(String xmlquery)
+      {
         Hashtable doclist = runQuery(xmlquery);
         String qformat = ((String[])params.get("qformat"))[0];
         String resultdoc = createResultDocument(doclist, qformat, xmlquery,
                                                 out, response);
         if(qformat.equals("html"))
+        {
           transformResultset(resultdoc, response, out);
+        }
         else if(qformat.equals("xml"))
+        {
           response.setContentType("text/xml");
           out.println(resultdoc);
+        }
         else
+        {
           out.println("invalid qformat: " + qformat);
+        }
         //conn.close();
         String resultdoc = createResultDocument(doclist, xmlquery);
         return resultdoc;
+      }
        /**
-...
       private void handleQuery(PrintWriter out, Hashtable params,
                                HttpServletResponse response)
+      {
         String doctype=null;
         String[] doctypeArr=null;
         String query=null;
         Connection conn = null;
         if(params.containsKey("query"))
         { //get the query parameter
           query = ((String[])params.get("query"))[0];
+        }
         else
+        {
           query = "";
+        }
         if(params.containsKey("doctype"))
         { //check for the doctype
           doctypeArr = (String[])params.get("doctype");
           doctype = null;
+        }
         else
+        {
           doctype = "ANY";
+        }
         if (doctypeArr != null)
+        {
           doctype = ((String[])params.get("doctype"))[0];
+        }
         else
+        {
           doctype="ANY";
+        }
         //create the query and run it
         String xmlquery = DBQuery.createQuery(query, doctype);
         String xmlquery = DBQuery.createSQuery(params);
         Hashtable doclist = runQuery(xmlquery);
         String qformat = ((String[])params.get("qformat"))[0];
         String resultdoc = createResultDocument(doclist, qformat, xmlquery,
                                                 out, response);
         String resultdoc = createResultDocument(doclist, xmlquery);
         //format and transform the results
         if(qformat.equals("html"))
+        {
-...
+        {
           out.println("invalid qformat: " + qformat);
+        }
         //conn.close();
+      }
       /**
-...
             util.returnConnection(conn);
+          }
+        }
         //conn.close();
+      }
       /**
        * Transforms a hashtable of documents to an xml or html result.
        * @param doclist- the hashtable to transform
        * @param qformat- the format to transform the results into
        * @param xmlquery- the query that returned the dolist result
        * @param out- the printwriter object used to write to the client
        * @param response- the response stream to write back to the client.
        */
       private String createResultDocument(Hashtable doclist, String qformat,
                                      String xmlquery, PrintWriter out,
                                      HttpServletResponse response)
       private String createResultDocument(Hashtable doclist, String xmlquery)
+      {
         // Create a buffer to hold the xml result
         StringBuffer resultset = new StringBuffer();
-...
         String document = null;
         resultset.append("<?xml version=\"1.0\"?>\n");
         resultset.append("<resultset>\n");
         //the following should work but it doesn't because the parser doesn't
         //like the <?xml?> tag inside the <query> tag.  This is supposed to be
         //the way that the query itself is sent back to the client.
         //resultset.append("  <query>" + xmlquery + "</query>");
         Enumeration doclistkeys = doclist.keys();
         while (doclistkeys.hasMoreElements())
-...
           docid = (String)doclistkeys.nextElement();
           document = (String)doclist.get(docid);
           resultset.append("  <document>" + document + "</document>");
+        }
+        }
         resultset.append("</resultset>");
         return resultset.toString();
         /*
         if(qformat.equals("xml"))
+        {
           // set content type and other response header fields first
           response.setContentType("text/xml");
           out.println(resultset.toString());
+        }
         else if(qformat.equals("html"))
+        {
           // set content type and other response header fields first
           response.setContentType("text/html");
           XMLDocumentFragment htmldoc = null;
           try
+          {
             XSLStylesheet style = new XSLStylesheet(
                                   new URL(resultStyleURL), null);
             htmldoc = (new XSLProcessor()).processXSL(style,
                       (Reader)(new StringReader(resultset.toString())),null);
             htmldoc.print(out);
+          }
           catch (Exception e)
+          {
             out.println("Error transforming document:\n" + e.getMessage());
+          }
+        }
         */
+      }
       /**
-...
     /**
      * '$Log$
      * 'Revision 1.73  2000/08/16 20:08:20  berkley
      * 'fixed bug with handleSQuery() that kept DMan from access the squery functionality
      * '
      * 'Revision 1.72  2000/08/16 18:48:57  berkley
      * '- created transformResultset() which transforms an xml resultset document and displays it to the client useing DBTransform
      * '- renamed transformDocument() to createResultDocument() and modified its functionality to only return a restultset xml document

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 373

Added by berkley over 24 years ago