/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 2072

Added by Matt Jones over 20 years ago

Moved decision about whether to use xml_index for
query to the metacat.properties as "usexmlindex". Default
is now false. Still have some refactoring to do to remove a
few more uses of the xml_index table.

src/edu/ucsb/nceas/metacat/QuerySpecification.java
979	979	}
980	980	}
981	981	self.append(") AND xml_nodes.docid in (");
982		//self.append(query.printSQL());
983	982	self.append(doclist);
984	983	self.append(")");
985	984	self.append(" AND xml_nodes.nodetype = 'ATTRIBUTE'");

       //private Connection  conn = null;
       private String  parserName = null;
       private MetaCatUtil util = new MetaCatUtil();
       /**
        * the main routine used to test the DBQuery utility.
        * <p>
-...
        */
       public Hashtable findDocuments(Reader xmlquery, String user, String[] groups)
+      {
         return findDocuments(xmlquery, user, groups, true);
         boolean useXMLIndex = (new Boolean(
                 MetaCatUtil.getOption("usexmlindex"))).booleanValue();
         return findDocuments(xmlquery, user, groups, useXMLIndex);
+      }
       /**
-...
         self.append(") ");
         return self.toString();
+      }
       /**
        * returns a string array of the contents of a particular node.
        * If the node appears more than once, the contents are returned
        * in the order in which they appearred in the document.
        * @param nodename the name or path of the particular node.
        * @param docid the docid of the document you want the node from.
        */
       public static Object[] getNodeContent(String nodename, String docid)
+      {
         DBConnection dbconn = null;
         int serialNumber = -1;
         StringBuffer query = new StringBuffer();
         Vector result = new Vector();
         PreparedStatement pstmt = null;
         query.append("select nodedata from xml_nodes where parentnodeid in ");
         query.append("(select nodeid from xml_index where path like '");
         query.append(nodename);
         query.append("' and docid like '").append(docid).append("')");
         try
+        {
           dbconn=DBConnectionPool.getDBConnection("DBQuery.getNodeContent");
           serialNumber=dbconn.getCheckOutSerialNumber();
           pstmt = dbconn.prepareStatement(query.toString());
           // Execute the SQL query using the JDBC connection
           pstmt.execute();
           ResultSet rs = pstmt.getResultSet();
           boolean tableHasRows = rs.next();
           while (tableHasRows)
+          {
             result.add(rs.getString(1));
             //System.out.println(rs.getString(1));
             tableHasRows = rs.next();
+          }
+        }
         catch (SQLException e)
+        {
           System.err.println("Error in DBQuery.getNodeContent: " + e.getMessage());
         } finally {
           try
+          {
             pstmt.close();
+          }
           catch(SQLException sqle)
           {}
           finally
+          {
             DBConnectionPool.returnDBConnection(dbconn, serialNumber);
+          }
+        }
         return result.toArray();
+      }
       /**
        * format a structured query as an XML document that conforms
        * to the pathquery.dtd and is appropriate for submission to the DBQuery

      * dtdtext -- XML DTD text for a new DTD to load into Metacat XML Catalog<br>
      * query -- actual query text (to go with 'action=query' or 'action=squery')<br>
      * valtext -- XML text to be validated<br>
      * abstractpath -- XPath in metadata document to read from<br>
      * action=getaccesscontrol -- retrieve acl info for Metacat document<br>
      * action=getdoctypes -- retrieve all doctypes (publicID)<br>
      * action=getdtdschema -- retrieve a DTD or Schema file<br>
-...
               withInlineData = false;
+            }
+          }
           if (params.containsKey("abstractpath")) {
             abstrpath = ((String[])params.get("abstractpath"))[0];
             if ( !abstrpath.equals("") && (abstrpath != null) ) {
               viewAbstract(response, abstrpath, docs[0]);
               return;
+            }
+          }
           if ( (docs.length > 1) || qformat.equals("zip") ) {
             zip = true;
             out = response.getOutputStream();
-...
+        }
+      }
       // view abstract within document
       private void viewAbstract(HttpServletResponse response,
                                 String abstractpath, String docid)
                    throws ClassNotFoundException, IOException, SQLException,
                           McdbException, Exception
+      {
         PrintWriter out =null;
         try {
           response.setContentType("text/html");  //MIME type
           out = response.getWriter();
           Object[] abstracts = DBQuery.getNodeContent(abstractpath, docid);
           out.println("<html><head><title>Abstract</title></head>");
           out.println("<body bgcolor=\"white\"><h1>Abstract</h1>");
           for (int i=0; i<abstracts.length; i++) {
             out.println("<p>" + (String)abstracts[i] + "</p>");
+          }
           out.println("</body></html>");
         } catch (Exception e) {
            out.println("<?xml version=\"1.0\"?>");
            out.println("<error>");
            out.println(e.getMessage());
            out.println("</error>");
+        }
+      }
       /**
        * If metacat couldn't find a data file or document locally, it will read this
        * docid from its home server. This is for the replication feature

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 2072

Added by Matt Jones over 20 years ago