From: Katja Luther Date: Mon, 13 May 2019 12:11:27 +0000 (+0200) Subject: ref #8229: update correct property path for search in name and taxon bulkeditor X-Git-Tag: 5.7.3^2~1 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5920a5e8c0b7f59368923d358de996fa4bf3edd3?hp=5bb1eb990df6522d294a9deb6eb7a87199ac8f60 ref #8229: update correct property path for search in name and taxon bulkeditor --- diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java index 616a25d89..6ebcb4cee 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java @@ -221,15 +221,22 @@ public class NameEditorInput extends AbstractBulkEditorInput { private List getPropertyPaths(){ List nameBasePropertyPaths = Arrays.asList(new String[] { - "name.descriptions", - "name.typeDesignations", - "name.status", - "name.nomenclaturalReference.inReference", - "name.taxonBases.taxonNodes", - "name.relationsFromThisName", - "name.relationsToThisName", - "name.homotypicalGroup.typifiedNames.taxonBases.synonyms.synonym.name.status", - "name.homotypicalGroup.typifiedNames.relationsToThisName.fromName"}); + "descriptions.descriptionElements.multilanguageText", + "descriptions.descriptionElements.*", + "typeDesignations", + "status", + "combinationAuthorship", + "exCombinationAuthorship", + "inCombinationAuthorship", + "basionymAuthorship", + "exBasionymAuthorship", + "inBasionymAuthorship", + "nomenclaturalReference.inReference", + "taxonBases.taxonNodes", + "relationsFromThisName", + "relationsToThisName", + "homotypicalGroup.typifiedNames.taxonBases.synonyms.synonym.name.status", + "homotypicalGroup.typifiedNames.relationsToThisName.fromName"}); return nameBasePropertyPaths; } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java index de4dc9a0c..f71a0e2ea 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java @@ -101,7 +101,8 @@ public class TaxonEditorInput extends AbstractBulkEditorInput{ // IFindTaxaAndNamesConfigurator newConfig = new FindTaxaAndNamesConfiguratorImpl<>(); // newConfig.setTitleSearchString(configurator.getTitleSearchStringSqlized()); // newConfig.setMatchMode(MatchMode.ANYWHERE); - + List propertyPaths = getPropertyPaths(); + configurator.setPropertyPaths(propertyPaths); List taxa = CdmStore.getSearchManager().findTaxa(configurator); List taxaCopy = new ArrayList(); for (TaxonBase taxon:taxa){ @@ -176,4 +177,12 @@ public class TaxonEditorInput extends AbstractBulkEditorInput{ super.saveModel(resetMerge); } + private List getPropertyPaths(){ + List taxonBasePropertyPaths = Arrays.asList(new String[] { + "descriptions.descriptionElements.*", + "typeDesignations"}); + + return taxonBasePropertyPaths; + } + }