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 616a25d89e08d51e6c941758dc3d1355e9a8eea4..6ebcb4ceeb4e145690d49b2b8be3fb1a4c7d47a7 100644 (file)
--- 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<TaxonName> {
 
     private List<String> getPropertyPaths(){
         List<String> 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 de4dc9a0c0b314c522ae9751b9d4758bf53b0b61..f71a0e2ea9ab065bb621c112f7290faa111c126d 100644 (file)
--- 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<TaxonBase>{
 //             IFindTaxaAndNamesConfigurator<TaxonBase> newConfig = new FindTaxaAndNamesConfiguratorImpl<>();\r
 //             newConfig.setTitleSearchString(configurator.getTitleSearchStringSqlized());\r
 //             newConfig.setMatchMode(MatchMode.ANYWHERE);\r
-\r
+           List<String> propertyPaths = getPropertyPaths();\r
+           configurator.setPropertyPaths(propertyPaths);\r
                List<TaxonBase> taxa =  CdmStore.getSearchManager().findTaxa(configurator);\r
                List<TaxonBase> taxaCopy = new ArrayList<TaxonBase>();\r
                for (TaxonBase taxon:taxa){\r
@@ -176,4 +177,12 @@ public class TaxonEditorInput extends AbstractBulkEditorInput<TaxonBase>{
         super.saveModel(resetMerge);\r
     }\r
 \r
+    private List<String> getPropertyPaths(){\r
+        List<String> taxonBasePropertyPaths = Arrays.asList(new String[] {\r
+        "descriptions.descriptionElements.*",\r
+        "typeDesignations"});\r
+\r
+        return taxonBasePropertyPaths;\r
+   }\r
+\r
 }\r