/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 2570

Added by Matt Jones almost 19 years ago

Formatting cleanup, fixed a missing 'private' declaration. Preparing for LSID integration work.

     import java.util.Iterator;
     import java.util.PropertyResourceBundle;
     import java.util.Vector;
     import java.util.regex.PatternSyntaxException;
     import java.util.zip.ZipEntry;
     import java.util.zip.ZipOutputStream;
-...
     import javax.servlet.http.HttpServletResponse;
     import javax.servlet.http.HttpSession;
     import edu.ucsb.nceas.utilities.Options;
     import org.ecoinformatics.eml.EMLParser;
     import com.oreilly.servlet.multipart.FilePart;
-...
     import com.oreilly.servlet.multipart.ParamPart;
     import com.oreilly.servlet.multipart.Part;
     import edu.ucsb.nceas.utilities.Options;
     /**
      * A metadata catalog server implemented as a Java Servlet
+     *
-...
+            }
+        }
         /**
          * Close all db connections from the pool
          */
         public void destroy()
+        {
             // Close all db connection
             System.out.println("Destroying MetacatServlet");
             DBConnectionPool.release();
+        }
         /** Handle "GET" method requests from HTTP clients */
         public void doGet(HttpServletRequest request, HttpServletResponse response)
                 throws ServletException, IOException
+        {
             // Process the data and send back the response
             handleGetOrPost(request, response);
+        }
         /** Handle "POST" method requests from HTTP clients */
         public void doPost(HttpServletRequest request, HttpServletResponse response)
                 throws ServletException, IOException
+        {
             // Process the data and send back the response
             handleGetOrPost(request, response);
+        }
         /**
          * Index the paths specified in the metacat.properties
          */
         void checkIndexPaths(){
         private void checkIndexPaths(){
             MetaCatUtil.pathsForIndexing
                 = MetaCatUtil.getOptionList(MetaCatUtil.getOption("indexed_paths"));
             if (MetaCatUtil.pathsForIndexing != null) {
                 MetaCatUtil.debugMessage("Indexing paths....", 20);
                 DBConnection conn = null;
                 int serialNumber = -1;
                 PreparedStatement pstmt = null;
                 PreparedStatement pstmt1 = null;
                 ResultSet rs = null;
                 for (int i = 0; i < MetaCatUtil.pathsForIndexing.size(); i++) {
                     MetaCatUtil.formattedDebugMessage("Checking if '"
                                + (String) MetaCatUtil.pathsForIndexing.elementAt(i)
                                + "' is indexed.... ",30, false, true);
                     try {
                         //check out DBConnection
                         conn = DBConnectionPool.
                             getDBConnection("MetaCatServlet.checkIndexPaths");
                         serialNumber = conn.getCheckOutSerialNumber();
                         pstmt = conn.prepareStatement(
                             "SELECT * FROM xml_path_index " + "WHERE path = ?");
                         pstmt.setString(1, (String) MetaCatUtil.pathsForIndexing
                                         .elementAt(i));
                         pstmt.execute();
                         rs = pstmt.getResultSet();
                         if (!rs.next()) {
                             MetaCatUtil.formattedDebugMessage("not indexed yet.", 30,
                                                            true, false);
                             rs.close();
                             pstmt.close();
                             conn.increaseUsageCount(1);
                             MetaCatUtil.debugMessage(
                                   "Inserting following path in xml_path_index: "
                                   + (String)MetaCatUtil.pathsForIndexing
                                                        .elementAt(i), 60);
                             pstmt = conn.prepareStatement("SELECT DISTINCT n.docid, "
                                   + "n.nodedata, n.nodedatanumerical, n.parentnodeid"
                                   + " FROM xml_nodes n, xml_index i WHERE"
-...
                                             pathsForIndexing.elementAt(i));
                             pstmt.execute();
                             rs = pstmt.getResultSet();
                             int count = 0;
                             MetaCatUtil.debugMessage(
                                            "Executed the select statement for: "
                                            + (String) MetaCatUtil.pathsForIndexing
                                              .elementAt(i), 60);
                             try {
                                 while (rs.next()) {
                                     String docid = rs.getString(1);
                                     String nodedata = rs.getString(2);
                                     float nodedatanumerical = rs.getFloat(3);
                                     int parentnodeid = rs.getInt(4);
                                     if (!nodedata.trim().equals("")) {
                                         pstmt1 = conn.prepareStatement(
                                             "INSERT INTO xml_path_index"
                                             + " (docid, path, nodedata, "
                                             + "nodedatanumerical, parentnodeid)"
                                             + " VALUES (?, ?, ?, ?, ?)");
                                         pstmt1.setString(1, docid);
                                         pstmt1.setString(2, (String) MetaCatUtil.
                                                     pathsForIndexing.elementAt(i));
                                         pstmt1.setString(3, nodedata);
                                         pstmt1.setFloat(4, nodedatanumerical);
                                         pstmt1.setFloat(5, parentnodeid);
                                         pstmt1.execute();
                                         pstmt1.close();
                                         count++;
+                                    }
+                                }
+                            }
-...
                                 System.out.println("Exception:" + e.getMessage());
                                 e.printStackTrace();
+                            }
                             rs.close();
                             pstmt.close();
                             conn.increaseUsageCount(1);
                             MetaCatUtil.debugMessage("Indexed " + count
                                     + " records from xml_nodes for '"
                                     + (String) MetaCatUtil.pathsForIndexing.elementAt(i)
                                     + "'", 20);
                         } else {
                             MetaCatUtil.formattedDebugMessage("already indexed.", 30,
                                                            true, false);
+                        }
                         rs.close();
                         pstmt.close();
                         conn.increaseUsageCount(1);
                     } catch (Exception e) {
                         MetaCatUtil.debugMessage("error in DocumentImpl.delete: "
                                                  + e.getMessage(), 30);
-...
                         //check in DBonnection
                         DBConnectionPool.returnDBConnection(conn, serialNumber);
+                    }
+                }
                 MetaCatUtil.debugMessage("Path Indexing Completed", 20);
+            }
+        }
         /**
          * Close all db connections from the pool
          */
         public void destroy()
+        {
             // Close all db connection
             System.out.println("Destroying MetacatServlet");
             DBConnectionPool.release();
+        }
         /** Handle "GET" method requests from HTTP clients */
         public void doGet(HttpServletRequest request, HttpServletResponse response)
                 throws ServletException, IOException
+        {
             // Process the data and send back the response
             handleGetOrPost(request, response);
+        }
         /** Handle "POST" method requests from HTTP clients */
         public void doPost(HttpServletRequest request, HttpServletResponse response)
                 throws ServletException, IOException
+        {
             // Process the data and send back the response
             handleGetOrPost(request, response);
+        }
         /**
          * Control servlet response depending on the action parameter specified
          */
-...
          * @param response the response object linked to the client
          * @param conn the database connection
          */
         protected void handleSQuery(PrintWriter out, Hashtable params,
         private void handleSQuery(PrintWriter out, Hashtable params,
                 HttpServletResponse response, String user, String[] groups,
                 String sessionid)
+        {
-...
          *            squery.
          * @param response the response object linked to the client
          */
         protected void handleQuery(PrintWriter out, Hashtable params,
         private void handleQuery(PrintWriter out, Hashtable params,
                 HttpServletResponse response, String user, String[] groups,
                 String sessionid)
+        {
-...
             ServletOutputStream out = null;
             // Zip output stream
             ZipOutputStream zOut = null;
             DocumentImpl docImpls = null;
             DBQuery queryObj = null;
             String[] docs = new String[10];

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 2570

Added by Matt Jones almost 19 years ago