Changeset 7089 for TI01-discovery-API


Ignore:
Timestamp:
25/06/10 13:56:05 (9 years ago)
Author:
mnagni
Message:

Fixed the CDATA truncation problem
Correctly filtered the ':' in the TermTarget? elements
Medin Discovery Service version 1.1.16

Location:
TI01-discovery-API/trunk/MEDINDiscoveryService
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI01-discovery-API/trunk/MEDINDiscoveryService/pom.xml

    r7058 r7089  
    44        <groupId>ndg.services.discovery</groupId> 
    55        <artifactId>MedinDiscoveryService</artifactId> 
    6         <version>1.1.15</version> 
     6        <version>1.1.16</version> 
    77        <packaging>aar</packaging> 
    88 
  • TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/services/discovery/DiscoveryServiceMEDINSkeleton.java

    r7058 r7089  
    110110 
    111111                try { 
    112                         responseContent.setTicketId(doSearch.getDoSearch().getTicketId()); 
     112                        if (doSearch.getDoSearch() != null && doSearch.getDoSearch().getTicketId() != null) { 
     113                                responseContent.setTicketId(doSearch.getDoSearch().getTicketId());       
     114                        }        
     115                         
     116                         
    113117                        SearchCriteria sc = doSearch.getDoSearch().getSearchCriteria(); 
    114118                        if (doSearch.getDoSearch().getSearchCriteria() == null 
     
    179183                DoPresentReturnDocument response = DoPresentReturnDocument.Factory.newInstance(); 
    180184                PresentReturnType responseContent = response.addNewDoPresentReturn(); 
    181                 responseContent.setTicketId(doPresent.getDoPresent().getTicketId()); 
     185 
     186                //if (doPresent.getDoPresent() != null && doPresent.getDoPresent().getTicketId() != null) { 
     187                        responseContent.setTicketId(doPresent.getDoPresent().getTicketId());     
     188                //}              
    182189 
    183190                boolean status = false; 
  • TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/services/discovery/model/SearchAgent.java

    r7033 r7089  
    244244                        term = term.replaceAll("(\\bNOT\\b)|(\\bnot\\b)|\\-", "!"); 
    245245                        term = term.replaceAll("(\\B\\\\&\\B\\s+)|(\\s+\\B\\\\!\\B)|(\\b\\s+\\b)", "|"); 
     246                        term = term.replaceAll(":", "\\\\\\\\:"); 
    246247                         
    247248                        if (illegalStart1.matcher(term).matches() || illegalStart2.matcher(term).matches() 
  • TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/resources/META-INF/DiscoverySchema.xsd

    r6767 r7089  
    108108                                </xs:annotation> 
    109109                        </xs:element> 
    110                         <xs:element name="TicketId" type="xs:string" minOccurs="1"> 
     110                        <xs:element name="TicketId" type="xs:string" minOccurs="0"> 
    111111                                <xs:annotation> 
    112112                                        <xs:documentation>Optional term that allow the client to track the request/response messages</xs:documentation> 
Note: See TracChangeset for help on using the changeset viewer.