/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 8866

Added by Jing Tao over 10 years ago

Add the code to handle the delete of the resource map.

     import edu.ucsb.nceas.metacat.accesscontrol.AccessControlList;
     import edu.ucsb.nceas.metacat.client.InsufficientKarmaException;
     import edu.ucsb.nceas.metacat.common.query.EnabledQueryEngines;
     import edu.ucsb.nceas.metacat.common.resourcemap.ResourceMapNamespaces;
     import edu.ucsb.nceas.metacat.database.DBConnection;
     import edu.ucsb.nceas.metacat.database.DBConnectionPool;
     import edu.ucsb.nceas.metacat.database.DatabaseService;
-...
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     import edu.ucsb.nceas.utilities.UtilException;
     import org.apache.commons.io.FileUtils;
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.io.input.XmlStreamReader;
     import org.apache.log4j.Logger;
-...
     			throw new McdbException("Could not delete file.  Accession Number number is null" );
+    		}
     		// remove the document from disk
     		String documentDir = null;
     		String documentPath = null;
     		try {
     		// remove the document from disk
         	String documentPath = null;
     		// get the correct location on disk
     		documentPath = getFilePath(accNumber, isXml);
     		// 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());
+    			    }
+    		}
+    	}
         private static String getFilePath(String accNumber, boolean isXml) throws McdbException{
         	if (accNumber == null) {
     			throw new McdbException("Could not get the file path since the Accession Number number is null" );
+    		}
         	String documentPath = null;
         	try {
         		String documentDir = null;
     			// get the correct location on disk
     			if (isXml) {
     				documentDir = PropertyService.getProperty("application.documentfilepath");
-...
     				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());
+    			    }
+    			}
     			return documentPath;
     		} 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
-...
                     	sysMeta.setDateSysMetadataModified(Calendar.getInstance().getTime());
                     	if(!removeAll) {
                     		HazelcastService.getInstance().getSystemMetadataMap().put(guid, sysMeta);
                     		MetacatSolrIndex.getInstance().submit(guid, sysMeta, null, false);
                     	} else {
                     		try {
                     			logMetacat.debug("the system metadata contains the key - guid "+guid.getValue()+" before removing is "+HazelcastService.getInstance().getSystemMetadataMap().containsKey(guid));
                     			HazelcastService.getInstance().getSystemMetadataMap().remove(guid);
                     			logMetacat.debug("the system metadata contains the guid "+guid.getValue()+" after removing is "+HazelcastService.getInstance().getSystemMetadataMap().containsKey(guid));
                     			if(ResourceMapNamespaces.isResourceMap(sysMeta.getFormatId())) {
                     				byte[] resourceMapData = FileUtils.readFileToByteArray(new File(getFilePath(accnum, isXML)));
                     				MetacatSolrIndex.getInstance().submit(guid, sysMeta, null, false, resourceMapData);
                     			} else {
                     				MetacatSolrIndex.getInstance().submit(guid, sysMeta, null, false);
+                    			}
                     		} catch (RuntimeException ee) {
                     			logMetacat.warn("we catch the run time exception in deleting system metadata "+ee.getMessage());
                     			throw new Exception("DocumentImpl.delete -"+ee.getMessage());
+                    		}
+                    	}
                         MetacatSolrIndex.getInstance().submit(guid, sysMeta, null, false);
+                }
                 // only commit if all of this was successful

+        }
         public void submit(Identifier pid, SystemMetadata systemMetadata, Map<String, List<Object>> fields, boolean followRevisions) {
         	submit(pid, systemMetadata, fields, followRevisions, null);
+        }
         public void submit(Identifier pid, SystemMetadata systemMetadata, Map<String, List<Object>> fields, boolean followRevisions, byte[] resourceMapData) {
         	IndexTask task = new IndexTask();
         	task.setSystemMetadata(systemMetadata);
         	task.setFields(fields);
         	if(resourceMapData != null) {
         		task.setResourceMapData(resourceMapData);
+        	}
     		HazelcastService.getInstance().getIndexQueue().put(pid, task);
     		// submit older revisions recursively otherwise they stay in the index!
-...
     			Identifier obsoletedPid = systemMetadata.getObsoletes();
     			SystemMetadata obsoletedSysMeta = HazelcastService.getInstance().getSystemMetadataMap().get(obsoletedPid);
     		    Map<String, List<Object>> obsoletedFields = EventLog.getInstance().getIndexFields(obsoletedPid, Event.READ.xmlValue());
     			this.submit(obsoletedPid, obsoletedSysMeta , obsoletedFields, followRevisions);
     			this.submit(obsoletedPid, obsoletedSysMeta , obsoletedFields, followRevisions, resourceMapData);
+    		}
+        }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 8866

Added by Jing Tao over 10 years ago