Changeset 8322

Timestamp:

21/05/12 12:35:46 (8 years ago)

Author:

mnagni

Message:

Complete - # 22405: Mail not bound
 http://team.ceda.ac.uk/trac/ceda/ticket/22405
Complete - # 22442: Debug MEDIN DWS SOAP response
 http://team.ceda.ac.uk/trac/ceda/ticket/22442

File:

• mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java (modified) (6 diffs)

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.persistence.NoResultException;
 
 import ndg.common.MessageFormatter;
@@ -299 +297 @@
         }
 
-        private void fillCustomInfo(CustomInfo info, OriginalDocument result) {
+        private CustomInfo fillCustomInfo(OriginalDocument result) {
+                CustomInfo info = of.createCustomInfo();
                 info.setAuthors(result.getAuthors() != null ? result.getAuthors() : "");
                 info.setOriginalFormatName(result.getOriginalFormatName() != null ? result.getOriginalFormatName() : "");
@@ -313 +312 @@
                 info.setResourceLocator(result.getResourceLocator() != null ? result.getResourceLocator() : false);
                 info.setDataCustodian(result.getDataCustodian() != null ? result.getDataCustodian() : null);
-                info.setDataDistributor(result.getDataDistributor() != null ? result.getDataDistributor() : null);              
+                info.setDataDistributor(result.getDataDistributor() != null ? result.getDataDistributor() : null);
+                return info;
         }
 
@@ -322 +322 @@
                 type.getSpatial().addAll(result.getSpatialType());
                 type.getTemporal().addAll(type.getTemporal());
-                CustomInfo info = of.createCustomInfo();
-                fillCustomInfo(info, result);
+                type.setAdditionalInformation(fillCustomInfo(result));
                 type.setDocument(result.getOriginalDocument());
         }
@@ -333 +332 @@
                 type.getSpatial().addAll(result.getSpatialType());
                 type.getTemporal().addAll(type.getTemporal());
-                CustomInfo info = of.createCustomInfo();
-                fillCustomInfo(info, result);
+                type.setAdditionalInformation(fillCustomInfo(result));
         }
 
@@ -340 +338 @@
                 type.setDocumentId(result.getOriginalDocumentFilename());
                 type.setTitle(result.getDatasetName());
-                CustomInfo info = of.createCustomInfo();
-                fillCustomInfo(info, result);
+                type.setAdditionalInformation(fillCustomInfo(result));
         }