Ignore:
Timestamp:
04/06/08 17:04:25 (11 years ago)
Author:
cbyrom
Message:

Add code to allow format to be specified as ISO19115 but search for ISO19139
in postgres DB (which is the format that the ingest service specifies)

Location:
TI01-discovery/branches/ws-Discovery2-upgrade/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/services/discovery/PresentAgent.java

    r3978 r3990  
    5353                if (DiscoveryServiceSkeleton.isValidFormat(s)) 
    5454                { 
    55                         this.format = s; 
     55                        // NB iso19115 is a superset iso19139 - the ingest service uses the latter terminology so 
     56                        // convert for retrieving data from postgres db 
     57                        if (s.equals(DiscoveryServiceSkeleton.ISO19115_FORMAT)) 
     58                                s = "ISO19139"; 
     59                        else 
     60                                this.format = s; 
    5661                } 
    5762                else 
  • TI01-discovery/branches/ws-Discovery2-upgrade/src/unittests/ndg/testclient/discovery/DiscoveryServiceClientTest.java

    r3985 r3990  
    828828        { 
    829829                String results = client.runPresent(new String[]{DOC_NAME_1, INVALID_BIT + DOC_NAME_2},  
    830                                 DiscoveryServiceSkeleton.ISO19139_FORMAT); 
     830                                DiscoveryServiceSkeleton.ISO19115_FORMAT); 
    831831                assertNotNull(results); 
    832832                assertFalse(results.contains("<urn:status>false</urn:status>")); 
Note: See TracChangeset for help on using the changeset viewer.