Changeset 7907
- Timestamp:
- 18/03/11 13:00:41 (10 years ago)
- Location:
- RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/MailHelper.java
r7625 r7907 82 82 * informed 83 83 **/ 84 public void dispatchedDoIngestMail(IngestRequest request) throws NdgExecutionException { 85 ModelManagerRemote mmr = EJBBeanFactory.getModelManager(); 86 HiProcess process = mmr.getHiProcess(request.getProcessID()); 87 88 if (request.getEmailIDs() == null) 89 return; 90 84 public void dispatchedDoIngestMail(IngestRequest request, HiProcess process) throws NdgExecutionException { 85 ModelManagerRemote mmr = EJBBeanFactory.getModelManager(); 91 86 List<String> mailTo = filterEmail(request.getEmailIDs(), process.getProviderId()); 92 93 87 String text = mmr.getConfigurationParameter(ServiceConfigurationParameter.NEW_DISPATCHED_INGEST_MAIL); 94 88 Object[] params = { process.getId() }; -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/ModelManager.java
r7905 r7907 500 500 List<String> ids = new ArrayList<String>(); 501 501 for (Integer id : providerID) { 502 ids.add(id.toString()); 502 if(id != null) { 503 ids.add(id.toString()); 504 } 503 505 } 504 506 query.setParameter("providerIDs", ids); -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/executor/ExecuteDoIngest.java
r7389 r7907 16 16 import ndg.services.revitalization.EJBBeanFactory; 17 17 import ndg.services.revitalization.MailHelper; 18 import ndg.services.revitalization.ejb.interfaces.ModelManagerRemote; 18 19 import ndg.services.revitalization.harvest.IngestRequest; 20 import ndg.services.revitalization.jpa.HiProcess; 19 21 import ndg.services.schemas.revitalization.DoIngestRequest; 20 22 import ndg.services.schemas.revitalization.DoIngestResponse; … … 33 35 34 36 IngestRequest request = new IngestRequest(doRequest.getProcessID().getId(), doRequest.getEmailReportID()); 37 38 ModelManagerRemote mmr = EJBBeanFactory.getModelManager(); 39 HiProcess process = mmr.getHiProcess(request.getProcessID()); 40 41 if (process == null) 42 throw new NdgExecutionException("Process does not exist. The request rejected."); 43 44 if (request.getEmailIDs() == null) 45 throw new NdgExecutionException("EmailID cannot be null. The request rejected."); 46 35 47 EJBBeanFactory.getMessageDispatcher().dispatchHarvestRequest(request); 36 MailHelper.getInstance().dispatchedDoIngestMail(request );48 MailHelper.getInstance().dispatchedDoIngestMail(request, process); 37 49 } 38 50 } -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/executor/IngesterImpl.java
r7625 r7907 79 79 hiProcess = getHiProcess(); 80 80 //in future a StatePattern could be better 81 if (! hiProcess.getHiStatus().getId().equals("end_harv")) {81 if (!(hiProcess.getHiStatus().getId().equals("end_harv") || hiProcess.getHiStatus().getId().equals("failed_ingest"))) { 82 82 String msg = EJBBeanFactory.getModelManager().getConfigurationParameter(ServiceConfigurationParameter.PROCESS_UNAVAILABLE_EMAIL); 83 83 throw new NdgExecutionException(new NdgMessage(msg, new Object[] {hiProcess.getId(), hiProcess.getHiStatus().getId()}, null));
Note: See TracChangeset
for help on using the changeset viewer.