Changeset 7907

Timestamp:

18/03/11 13:00:41 (9 years ago)

Author:

mnagni

Message:

better check of the ingestion process before the process is started.
Allowed to restart failed ingestion processes.

Location:

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization

Files:

• MailHelper.java (modified) (1 diff)
• ejb/ModelManager.java (modified) (1 diff)
• executor/ExecuteDoIngest.java (modified) (2 diffs)
• executor/IngesterImpl.java (modified) (1 diff)

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/MailHelper.java

@@ -82 +82 @@
          *            informed
          **/
-        public void dispatchedDoIngestMail(IngestRequest request) throws NdgExecutionException {
-                ModelManagerRemote mmr = EJBBeanFactory.getModelManager();
-                HiProcess process = mmr.getHiProcess(request.getProcessID());
-                
-                if (request.getEmailIDs() == null)
-                        return;
-                
+        public void dispatchedDoIngestMail(IngestRequest request, HiProcess process) throws NdgExecutionException {
+                ModelManagerRemote mmr = EJBBeanFactory.getModelManager();              
                 List<String> mailTo = filterEmail(request.getEmailIDs(), process.getProviderId());
-
                 String text = mmr.getConfigurationParameter(ServiceConfigurationParameter.NEW_DISPATCHED_INGEST_MAIL);
                 Object[] params = { process.getId() };

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/ModelManager.java

@@ -500 +500 @@
                         List<String> ids = new ArrayList<String>();
                         for (Integer id : providerID) {
-                                ids.add(id.toString());
+                                if(id != null) {
+                                        ids.add(id.toString()); 
+                                }                                                               
                         }
                         query.setParameter("providerIDs", ids);

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/executor/ExecuteDoIngest.java

@@ -16 +16 @@
 import ndg.services.revitalization.EJBBeanFactory;
 import ndg.services.revitalization.MailHelper;
+import ndg.services.revitalization.ejb.interfaces.ModelManagerRemote;
 import ndg.services.revitalization.harvest.IngestRequest;
+import ndg.services.revitalization.jpa.HiProcess;
 import ndg.services.schemas.revitalization.DoIngestRequest;
 import ndg.services.schemas.revitalization.DoIngestResponse;
@@ -33 +35 @@
                 
                 IngestRequest request = new IngestRequest(doRequest.getProcessID().getId(), doRequest.getEmailReportID());              
+                
+                ModelManagerRemote mmr = EJBBeanFactory.getModelManager();
+                HiProcess process = mmr.getHiProcess(request.getProcessID());
+
+                if (process == null)
+                        throw new NdgExecutionException("Process does not exist. The request rejected.");               
+                
+                if (request.getEmailIDs() == null)
+                        throw new NdgExecutionException("EmailID cannot be null. The request rejected.");
+                
                 EJBBeanFactory.getMessageDispatcher().dispatchHarvestRequest(request);
-                MailHelper.getInstance().dispatchedDoIngestMail(request);
+                MailHelper.getInstance().dispatchedDoIngestMail(request, process);
         } 
 }

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/executor/IngesterImpl.java

@@ -79 +79 @@
                         hiProcess = getHiProcess();
                         //in future a StatePattern could be better
-                        if (!hiProcess.getHiStatus().getId().equals("end_harv")) {
+                        if (!(hiProcess.getHiStatus().getId().equals("end_harv") || hiProcess.getHiStatus().getId().equals("failed_ingest"))) {
                                 String msg = EJBBeanFactory.getModelManager().getConfigurationParameter(ServiceConfigurationParameter.PROCESS_UNAVAILABLE_EMAIL);
                                 throw new NdgExecutionException(new NdgMessage(msg, new Object[] {hiProcess.getId(), hiProcess.getHiStatus().getId()}, null));