From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Wed, 20 Jun 2012 09:47:56 +0000 (+0000)
Subject: [part1/2] more tests for #476: Implement free-text search methods for TaxonBase and... 
X-Git-Tag: cdmlib-parent-3.0.11~23
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/d24ca58101ce8cc69f5b6ba28fa9fc905e472ba9

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

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 96ee855798..4a64a206b7 100644
--- 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 c0b66bc1c8..9581500627 100644
--- 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 38c75afe0f..badac82071 100644
--- 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")