/src/edu/ucsb/nceas/metacat/MetaCatServlet.java - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 2102

Added by Matt Jones about 20 years ago

Added additional logging calls for read, upload, insert, update, delete, and
other commands. Now need to get a reporting function working and this
bug 101 will be largely finished.

+                    }
                 } else if (action.equals("export")) {
                     handleExportAction(params, response, username, groupnames,
                             password);
                     handleExportAction(params, response, username,
                             groupnames, password);
                 } else if (action.equals("read")) {
                     handleReadAction(params, response, username, password,
                     handleReadAction(params, request, response, username, password,
                             groupnames);
                 } else if (action.equals("readinlinedata")) {
                     handleReadInlineDataAction(params, response, username,
                     handleReadInlineDataAction(params, request, response, username,
                             password, groupnames);
                 } else if (action.equals("insert") || action.equals("update")) {
                     PrintWriter out = response.getWriter();
                     if ((username != null) && !username.equals("public")) {
                         handleInsertOrUpdateAction(out, params, username,
                                 groupnames);
                         handleInsertOrUpdateAction(request, response,
                                 out, params, username, groupnames);
                     } else {
                         out.println("Permission denied for user " + username + " "
                                 + action);
-...
                 } else if (action.equals("delete")) {
                     PrintWriter out = response.getWriter();
                     if ((username != null) && !username.equals("public")) {
                         handleDeleteAction(out, params, response, username,
                         handleDeleteAction(out, params, request, response, username,
                                 groupnames);
                     } else {
                         out.println("Permission denied for " + action);
-...
          * @param user the username sent the request
          * @param groups the user's groupnames
          */
         private void handleExportAction(Hashtable params,
                 HttpServletResponse response, String user, String[] groups,
                 String passWord)
         private void handleExportAction(Hashtable params,
                 HttpServletResponse response,
                 String user, String[] groups, String passWord)
+        {
             // Output stream
             ServletOutputStream out = null;
-...
          * @param groups the user's groupnames
          */
         private void handleReadInlineDataAction(Hashtable params,
                 HttpServletResponse response, String user, String passWord,
                 String[] groups)
                 HttpServletRequest request, HttpServletResponse response,
                 String user, String passWord, String[] groups)
+        {
             String[] docs = new String[10];
             String inlineDataId = null;
-...
                             + " doesn't have permission " + " to read document "
                             + docId);
                 } else if (controller.hasSubTreeAccessControl()) {
                     // if the document has subtree control, we need to check subtree
                     // control
                     // if the document has subtree control, we need to check
                     // subtree control
                     // get node id for inlinedata
                     long nodeId = getInlineDataNodeId(inlineDataId, docId);
                     if (!controller.hasPermissionForSubTreeNode(user, groups,
                             AccessControlInterface.READSTRING, nodeId)) { throw new Exception(
                             "User " + user + " doesn't have permission "
                                     + " to read inlinedata " + inlineDataId); }//if
                         AccessControlInterface.READSTRING, nodeId)) {
                         throw new Exception(
                         "User " + user + " doesn't have permission "
                         + " to read inlinedata " + inlineDataId);
+                    }
+                }
                 // Get output stream
-...
+                }
                 out.close();
                 EventLog.getInstance().log(request.getRemoteAddr(), user,
                         inlineDataId, "readinlinedata");
             } catch (Exception e) {
                 try {
                     PrintWriter pw = null;
-...
          * presentation if requested; zip files when more than one were requested.
+         *
          * @param params the Hashtable of HTTP request parameters
          * @param request the HTTP request object linked to the client
          * @param response the HTTP response object linked to the client
          * @param user the username sent the request
          * @param groups the user's groupnames
          */
         private void handleReadAction(Hashtable params,
         private void handleReadAction(Hashtable params, HttpServletRequest request,
                 HttpServletResponse response, String user, String passWord,
                 String[] groups)
+        {
-...
                             // get only docid, eliminate the rest
                             docid = (String) murlQueryStr.get("docid");
                             if (zip) {
                                 addDocToZip(docid, zout, user, groups);
                                 addDocToZip(request, docid, zout, user, groups);
                             } else {
                                 readFromMetacat(response, docid, qformat,
                                 readFromMetacat(request, response, docid, qformat,
                                         abstrpath, user, groups, zip, zout,
                                         withInlineData, params);
+                            }
-...
                         } else {
                             docid = docs[i];
                             if (zip) {
                                 addDocToZip(docid, zout, user, groups);
                                 addDocToZip(request, docid, zout, user, groups);
                             } else {
                                 readFromURLConnection(response, docid);
+                            }
+                        }
                     } catch (MalformedURLException mue) {
                         MetaCatUtil.debugMessage("MUE handleReadAction", 5);
                         docid = docs[i];
                         if (zip) {
                             addDocToZip(docid, zout, user, groups);
                             addDocToZip(request, docid, zout, user, groups);
                         } else {
                             readFromMetacat(response, docid, qformat, abstrpath,
                                 user, groups, zip, zout, withInlineData, params);
                             readFromMetacat(request, response, docid, qformat,
                                     abstrpath, user, groups, zip, zout,
                                     withInlineData, params);
+                        }
+                    }
+                }
-...
         /** read metadata or data from Metacat
          */
         private void readFromMetacat(HttpServletResponse response, String docid,
                 String qformat, String abstrpath, String user, String[] groups,
                 boolean zip, ZipOutputStream zout, boolean withInlineData,
                 Hashtable params) throws ClassNotFoundException, IOException,
                 SQLException, McdbException, Exception
         private void readFromMetacat(HttpServletRequest request,
                 HttpServletResponse response, String docid, String qformat,
                 String abstrpath, String user, String[] groups, boolean zip,
                 ZipOutputStream zout, boolean withInlineData, Hashtable params)
                 throws ClassNotFoundException, IOException, SQLException,
                 McdbException, Exception
+        {
             try {
-...
+                    }
+                }
                 EventLog.getInstance().log("192.168.1.103", "public",
                 EventLog.getInstance().log(request.getRemoteAddr(), user,
                         docid, "read");
             } catch (Exception except) {
                 throw except;
-...
          * @throws McdbException
          * @throws Exception
          */
         private void addDocToZip(String docid, ZipOutputStream zout, String user,
                 String[] groups) throws ClassNotFoundException, IOException,
                 SQLException, McdbException, Exception
         private void addDocToZip(HttpServletRequest request, String docid,
                 ZipOutputStream zout, String user, String[] groups) throws
                 ClassNotFoundException, IOException, SQLException, McdbException,
                 Exception
+        {
             byte[] bytestring = null;
             ZipEntry zentry = null;
-...
                         zout.write(bytestring, 0, bytestring.length);
                         zout.closeEntry();
+                    }
                     EventLog.getInstance().log("192.168.1.103", "public",
                     EventLog.getInstance().log(request.getRemoteAddr(), user,
                             docid, "read");
                 } catch (Exception except) {
                     throw except;
-...
          * Handle the database putdocument request and write an XML document to the
          * database connection
          */
         private void handleInsertOrUpdateAction(PrintWriter out, Hashtable params,
         private void handleInsertOrUpdateAction(HttpServletRequest request,
                 HttpServletResponse response, PrintWriter out, Hashtable params,
                 String user, String[] groups)
+        {
             DBConnection dbConn = null;
-...
                                     + accNumber + "...", 10);
                             if (accNumber.equals("")) {
                                 accNumber = null;
                             }//if
+                            }
                             newdocid = documentWrapper.write(dbConn, xml, pub, dtd,
                                     doAction, accNumber, user, groups);
                         }//try
                         catch (NullPointerException npe) {
                             EventLog.getInstance().log(request.getRemoteAddr(),
                                     user, accNumber, action[0]);
                         } catch (NullPointerException npe) {
                             newdocid = documentWrapper.write(dbConn, xml, pub, dtd,
                                     doAction, null, user, groups);
                         }//catch
                     }//try
                             EventLog.getInstance().log(request.getRemoteAddr(),
                                     user, "", action[0]);
+                        }
+                    }
                     finally {
                         // Return db connection
                         DBConnectionPool.returnDBConnection(dbConn, serialNumber);
-...
          * database connection
          */
         private void handleDeleteAction(PrintWriter out, Hashtable params,
                 HttpServletResponse response, String user, String[] groups)
                 HttpServletRequest request, HttpServletResponse response,
                 String user, String[] groups)
+        {
             String[] docid = (String[]) params.get("docid");
-...
                 // BEFORE ACCESSING ARRAY
                 try {
                     DocumentImpl.delete(docid[0], user, groups);
                     EventLog.getInstance().log(request.getRemoteAddr(),
                         user, docid[0], "delete");
                     response.setContentType("text/xml");
                     out.println("<?xml version=\"1.0\"?>");
                     out.println("<success>");
-...
                             File newFile = new File(dataDirectory, docid);
                             long size = filePart.writeTo(newFile);
                             EventLog.getInstance().log(request.getRemoteAddr(),
                                     username, docid, "upload");
                             // Force replication this data file
                             // To data file, "insert" and update is same
                             // The fourth parameter is null. Because it is

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 2102

Added by Matt Jones about 20 years ago