Project

General

Profile

« Previous | Next » 

Revision 47125f72

Added by Andreas Kohlbecker over 1 year ago

ref #9684 updating CdmBaseType constant names to latest model

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/CdmBaseType.java
39 39
    /**
40 40
     * refers to the baseClass {@link TaxonBase}
41 41
     */
42
    TAXON(TaxonBase.class),
43
    NONVIRALNAME(TaxonName.class),
42
    TAXON_BASE(TaxonBase.class),
43
    TAXON_NAME(TaxonName.class),
44 44
    DESCRIPTION_ELEMENT(DescriptionElementBase.class),
45 45
    DESCRIPTION(DescriptionBase.class),
46 46
    SPECIMEN_OR_OBSERVATIONBASE(SpecimenOrObservationBase.class),
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java
102 102
     * the {@link eu.etaxonomy.cdm.model.name.TaxonName taxon name} used and the {@link eu.etaxonomy.cdm.model.reference.Reference reference}
103 103
     * using it as a synonym and not as an ("accepted/correct") {@link Taxon taxon}.
104 104
     *
105
     * @param  TaxonName    the taxon name used
105
     * @param  TAXON_NAME    the taxon name used
106 106
     * @param  sec          the reference using the taxon name
107 107
     * @see  #Synonym(TaxonName, Reference)
108 108
     */
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
772 772

  
773 773

  
774 774
        Map<CdmBaseType, String> idFieldMap = new HashMap<CdmBaseType, String>();
775
        idFieldMap.put(CdmBaseType.NONVIRALNAME, "id");
775
        idFieldMap.put(CdmBaseType.TAXON_NAME, "id");
776 776

  
777 777
        // --- initialize taxa, highlight matches ....
778 778
        ISearchResultBuilder searchResultBuilder = new SearchResultBuilder(luceneSearch, luceneSearch.getQuery());
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
1576 1576
        }
1577 1577

  
1578 1578
        Map<CdmBaseType, String> idFieldMap = new HashMap<>();
1579
        idFieldMap.put(CdmBaseType.TAXON, "id");
1579
        idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
1580 1580

  
1581 1581
        // ---  initialize taxa, thighlight matches ....
1582 1582
        ISearchResultBuilder searchResultBuilder = new SearchResultBuilder(luceneSearch, luceneSearch.getQuery());
......
1644 1644
        }
1645 1645

  
1646 1646
        Map<CdmBaseType, String> idFieldMap = new HashMap<>();
1647
        idFieldMap.put(CdmBaseType.TAXON, "id");
1647
        idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
1648 1648

  
1649 1649
        // ---  initialize taxa, thighlight matches ....
1650 1650
        ISearchResultBuilder searchResultBuilder = new SearchResultBuilder(luceneSearch, luceneSearch.getQuery());
......
1913 1913
            luceneSearches.add(prepareFindByFullTextSearch(taxonBaseSubclass,
1914 1914
                    queryString, classification, subtree, className,
1915 1915
                    includeUnpublished, languages, highlightFragments, sortFields));
1916
            idFieldMap.put(CdmBaseType.TAXON, "id");
1916
            idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
1917 1917
            /* A) does not work!!!!
1918 1918
            if(addDistributionFilter){
1919 1919
                // in this case we need a filter which uses a join query
......
1965 1965
            byCommonNameSearch.setQuery(builder.build());
1966 1966
            byCommonNameSearch.setSortFields(sortFields);
1967 1967

  
1968
            idFieldMap.put(CdmBaseType.TAXON, "id");
1968
            idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
1969 1969

  
1970 1970
            luceneSearches.add(byCommonNameSearch);
1971 1971

  
......
2008 2008
            luceneSearches.add(prepareFindByTaxonRelationFullTextSearch(
2009 2009
                    new TaxonRelationshipEdge(relTypes, Direction.relatedTo),
2010 2010
                    queryString, classification, subtree, includeUnpublished, languages, highlightFragments, sortFields));
2011
            idFieldMap.put(CdmBaseType.TAXON, "id");
2011
            idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
2012 2012

  
2013 2013
            if(addDistributionFilter){
2014 2014
                String fromField = "inDescription.taxon.id"; // in DescriptionElementBase index
......
2063 2063
            luceneSearches.add(prepareFindByTaxonRelationFullTextSearch(
2064 2064
                    new TaxonRelationshipEdge(relTypes, Direction.relatedTo),
2065 2065
                    queryString, classification, subtree, includeUnpublished, languages, highlightFragments, sortFields));
2066
            idFieldMap.put(CdmBaseType.TAXON, "id");
2066
            idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
2067 2067

  
2068 2068
            if(addDistributionFilter){
2069 2069
                String fromField = "inDescription.taxon.id"; // in DescriptionElementBase index
......
2271 2271
        ISearchResultBuilder searchResultBuilder = new SearchResultBuilder(multiSearch, multiSearch.getQuery());
2272 2272

  
2273 2273
        Map<CdmBaseType, String> idFieldMap = new HashMap<>();
2274
        idFieldMap.put(CdmBaseType.TAXON, "id");
2274
        idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
2275 2275
        idFieldMap.put(CdmBaseType.DESCRIPTION_ELEMENT, "inDescription.taxon.id");
2276 2276

  
2277 2277
        List<SearchResult<TaxonBase>> searchResults = searchResultBuilder.createResultSet(

Also available in: Unified diff