[part1/2] more tests for #476: Implement free-text search methods for TaxonBase and...

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DefinedTermBaseFieldBridge.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DefinedTermBaseFieldBridge.java
index 96ee855798a4642c8b0bca0d36836a89edbd35e6..4a64a206b7d11f16e37bb700024046ce6814bafe 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DefinedTermBaseFieldBridge.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DefinedTermBaseFieldBridge.java
@@ -65,7 +65,7 @@ public class DefinedTermBaseFieldBridge implements FieldBridge {
                     allField.setBoost(luceneOptions.getBoost());
             document.add(allField);
 
-            Field langField = new Field(name + ".representation." + representation.getLanguageLabel(),
+            Field langField = new Field(name + ".representation." + representation.getLanguage().getUuid().toString(),
                     representation.getText(),
                     luceneOptions.getStore(),
                     luceneOptions.getIndex(),

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/MultilanguageTextFieldBridge.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/MultilanguageTextFieldBridge.java
index c0b66bc1c8823148335a5bdcea8cbe7d0398b193..95815006273150b4e82d7eec16b4e6ec4aac655f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/MultilanguageTextFieldBridge.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/MultilanguageTextFieldBridge.java
@@ -53,7 +53,7 @@ public class MultilanguageTextFieldBridge implements FieldBridge {
                     allField.setBoost(luceneOptions.getBoost());
             document.add(allField);
 
-            Field langField = new Field(name + "." + languageString.getLanguageLabel(),
+            Field langField = new Field(name + "." + languageString.getLanguage().getUuid(),
                     languageString.getText(),
                     luceneOptions.getStore(),
                     luceneOptions.getIndex(),

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
index 38c75afe0f8e605e655ec5930b0a9bb78af0e71c..badac82071eaf1ccdad6c0017b8febb9a690217a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
@@ -121,8 +121,9 @@ public abstract class DescriptionElementBase extends AnnotatableEntity implement
     @OneToMany(fetch = FetchType.LAZY)
     @JoinTable(name = "DescriptionElementBase_ModifyingText")
     @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
-    @Field
-    @FieldBridge(impl=MultilanguageTextFieldBridge.class)
+//    @Field
+//    @FieldBridge(impl=MultilanguageTextFieldBridge.class)
+    @IndexedEmbedded
     private Map<Language,LanguageString> modifyingText = new HashMap<Language,LanguageString>();
 
     @XmlElementWrapper(name = "Media")