Project

General

Profile

« Previous | Next » 

Revision 54457f88

Added by Patrick Plitzner over 5 years ago

ref #7806 Fix URL compilation for gfbio term search

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/webimport/termimport/requests/RequestSearch.java
55 55
    @Override
56 56
    protected List<RequestParameter> getServiceParameters() {
57 57
        List<RequestParameter> params = new ArrayList<>();
58
        params.add(new RequestParameter(TerminologyServiceConstants.ATTR_QUERY, searchString));
59 58
        if(searchString.contains(ASTERISK)){
60 59
            params.add(new RequestParameter(MATCH_TYPE, REGEX));
61
            if(searchString.startsWith(ASTERISK)){
62
                searchString.replaceFirst(ASTERISK, REGEX_BEGINNING);
60
            if(!searchString.startsWith(ASTERISK)){
61
                searchString = REGEX_BEGINNING + searchString;
63 62
            }
64
            if(searchString.endsWith(ASTERISK)){
65
                searchString = searchString.substring(0, searchString.length()-1);
63
            if(!searchString.endsWith(ASTERISK)){
66 64
                searchString += REGEX_END;
67 65
            }
68 66
            searchString = searchString.replace(ASTERISK, REGEX_WILDCARD);
......
70 68
        else{
71 69
            params.add(new RequestParameter(MATCH_TYPE, EXACT));
72 70
        }
71
        params.add(new RequestParameter(TerminologyServiceConstants.ATTR_QUERY, searchString));
73 72
        params.add(new RequestParameter(INTERNAL_ONLY, TRUE));
74 73
        params.add(new RequestParameter(TerminologyServiceConstants.ATTR_TERMINOLOGIES,
75 74
                selectedOntologies.stream()

Also available in: Unified diff