/ - Diff - Metacat - Ecoinformatics Redmine

+    	}
         /**
          * Deletes a doc or data file from the filesystem using the accession number.
+         *
          * @param accNumber
          * @param isXml
          * @throws McdbException
          */
         private static void deleteFromFileSystem(String accNumber, boolean isXml) throws McdbException {
         	// must have an id
         	if (accNumber == null) {
     			throw new McdbException("Could not delete file.  Accession Number number is null" );
+    		}
     		// remove the document from disk
     		String documentDir = null;
     		String documentPath = null;
     		try {
     			// get the correct location on disk
     			if (isXml) {
     				documentDir = PropertyService.getProperty("application.documentfilepath");
     			} else {
     				documentDir = PropertyService.getProperty("application.datafilepath");
+    			}
     			documentPath = documentDir + FileUtil.getFS() + accNumber;
     			// delete it if it exists
     			if (accNumber != null && FileUtil.getFileStatus(documentPath) != FileUtil.DOES_NOT_EXIST) {
     			    try {
     			    	FileUtil.deleteFile(documentPath);
     			    } catch (IOException ioe) {
     			        throw new McdbException("Could not delete file: " + documentPath + " : " + ioe.getMessage());
+    			    }
+    			}
     		} catch (PropertyNotFoundException pnfe) {
     			throw new McdbException(pnfe.getClass().getName() + ": Could not delete file because: "
     					+ documentPath + " : " + pnfe.getMessage());
+    		}
+    	}
         /**
     	 * Strip out an inline data section from a 2.0.X version document. This assumes
     	 * that the inline element is within a distribution element and the id for the
     	 * distribution is the same as the subtreeid in the xml_access table.
-...
          *            the ID of the document to be deleted from the database
          */
         public static void delete(String accnum, String user,
           String[] groups, String notifyServer)
           String[] groups, String notifyServer, boolean removeFile)
           throws SQLException, InsufficientKarmaException, McdbDocNotFoundException,
           Exception
+        {
-...
                   //System.out.println("the string stored into cache is "+ resultsetBuffer.toString());
              	   DBQuery.clearQueryResultCache();
+                }
                 // remove the file if needed
                 if (removeFile) {
                 	deleteFromFileSystem(accnum, isXML);
+                }
                double end = System.currentTimeMillis()/1000;
                logMetacat.info("DocumentImpl.delete - total delete time is:  " + (end - start));
-...
                         xmldoc.toXml(System.out, null, null, true);
+                    }
                 } else if (action.equals("DELETE")) {
                     DocumentImpl.delete(docid, null, null,null);
                     DocumentImpl.delete(docid, null, null, null, false);
                     //System.out.println("Document deleted: " + docid);
                 } else {
                     /*

           // Delete a document from the database based on the docid
           try {
             DocumentImpl.delete(docid, user, groups, null); // null: don't notify server
             DocumentImpl.delete(docid, user, groups, null, false); // null: don't notify server
             EventLog.getInstance().log(request.getRemoteAddr(), request.getHeader("User-Agent"),
                     user, docid, "delete");
             response.setContentType("text/xml");

           if (allowed) {
               try {
                   // delete the document
             	  //  TODO: the method - or one like it - actually needs to remove content not just archive it
                   DocumentImpl.delete(localId, username, groupnames, null);
                   DocumentImpl.delete(localId, username, groupnames, null, true);
                   EventLog.getInstance().log(request.getRemoteAddr(), request.getHeader("User-Agent"), username, localId, Event.DELETE.xmlValue());
                   // archive it
-...
           if (allowed) {
               try {
                   // archive the document
             	  // this method just archives it in metacat
                   DocumentImpl.delete(localId, username, groupnames, null);
                   DocumentImpl.delete(localId, username, groupnames, null, false);
                   EventLog.getInstance().log(request.getRemoteAddr(), request.getHeader("User-Agent"), username, localId, Event.DELETE.xmlValue());
                   // archive it

              //because delete method docid should have rev number
              //so we just add one for it. This rev number is no sence.
              String accnum=docId+PropertyService.getProperty("document.accNumSeparator")+"1";
              DocumentImpl.delete(accnum, null, null, notifyServer);
              DocumentImpl.delete(accnum, null, null, notifyServer, false);
              logReplication.info("ReplicationHandler.handleDeleteSingleDocument - Successfully deleted doc " + docId);
              logReplication.info("ReplicationHandler.handleDeleteSingleDocument - Doc " + docId + " deleted");
              URL u = new URL("https://"+notifyServer);

     			logReplication.info("ReplicationService.handleForceReplicateDeleteRequest - force replication delete docid " + docid);
     			logReplication.info("ReplicationService.handleForceReplicateDeleteRequest - Force replication delete request from: " + server);
     			logReplication.info("ReplicationService.handleForceReplicateDeleteRequest - Force replication delete docid: " + docid);
     			DocumentImpl.delete(docid, null, null, server);
     			DocumentImpl.delete(docid, null, null, server, false);
     			logReplication.info("ReplicationService.handleForceReplicateDeleteRequest - document " + docid + " was successfully deleted ");
     			EventLog.getInstance().log(request.getRemoteAddr(), request.getHeader("User-Agent"), REPLICATIONUSER, docid,
     					"delete");

Project

General

Profile

Metacat

Revision 7150

Added by ben leinfelder over 12 years ago