Ignore:
Timestamp:
21/05/12 12:35:46 (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java

    r8173 r8322  
    55import java.util.ArrayList; 
    66import java.util.List; 
    7  
    8 import javax.persistence.NoResultException; 
    97 
    108import ndg.common.MessageFormatter; 
     
    299297        } 
    300298 
    301         private void fillCustomInfo(CustomInfo info, OriginalDocument result) { 
     299        private CustomInfo fillCustomInfo(OriginalDocument result) { 
     300                CustomInfo info = of.createCustomInfo(); 
    302301                info.setAuthors(result.getAuthors() != null ? result.getAuthors() : ""); 
    303302                info.setOriginalFormatName(result.getOriginalFormatName() != null ? result.getOriginalFormatName() : ""); 
     
    313312                info.setResourceLocator(result.getResourceLocator() != null ? result.getResourceLocator() : false); 
    314313                info.setDataCustodian(result.getDataCustodian() != null ? result.getDataCustodian() : null); 
    315                 info.setDataDistributor(result.getDataDistributor() != null ? result.getDataDistributor() : null);               
     314                info.setDataDistributor(result.getDataDistributor() != null ? result.getDataDistributor() : null); 
     315                return info; 
    316316        } 
    317317 
     
    322322                type.getSpatial().addAll(result.getSpatialType()); 
    323323                type.getTemporal().addAll(type.getTemporal()); 
    324                 CustomInfo info = of.createCustomInfo(); 
    325                 fillCustomInfo(info, result); 
     324                type.setAdditionalInformation(fillCustomInfo(result)); 
    326325                type.setDocument(result.getOriginalDocument()); 
    327326        } 
     
    333332                type.getSpatial().addAll(result.getSpatialType()); 
    334333                type.getTemporal().addAll(type.getTemporal()); 
    335                 CustomInfo info = of.createCustomInfo(); 
    336                 fillCustomInfo(info, result); 
     334                type.setAdditionalInformation(fillCustomInfo(result)); 
    337335        } 
    338336 
     
    340338                type.setDocumentId(result.getOriginalDocumentFilename()); 
    341339                type.setTitle(result.getDatasetName()); 
    342                 CustomInfo info = of.createCustomInfo(); 
    343                 fillCustomInfo(info, result); 
     340                type.setAdditionalInformation(fillCustomInfo(result)); 
    344341        } 
    345342 
Note: See TracChangeset for help on using the changeset viewer.