Mercurial > hg > ismi-richfaces

changeset 131:8ae989269f51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New ArabicNormalizer. NormalizerUtils.normalize() now does both translit and arabic normalization. 108: arabic normalization is not applied Task-Url: https://it-dev.mpiwg-berlin.mpg.de/tracs/ismi/ticket/108
author casties
date Thu, 02 Feb 2017 17:59:35 +0100
parents 0078abf001fc
children 9f23184acf96
files src/main/java/de/mpiwg/itgroup/ismi/entry/beans/CurrentTextBean.java src/main/java/de/mpiwg/itgroup/ismi/search/beans/SampleSearch06.java src/main/java/de/mpiwg/itgroup/ismi/search/beans/Titles4PersonQuery.java src/main/java/de/mpiwg/itgroup/ismi/search/beans/Witness4TitleQuery.java src/main/java/de/mpiwg/itgroup/ismi/servlets/jsonmethods/JSONNormString.java
diffstat 5 files changed, 19 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/CurrentTextBean.java	Thu Feb 02 11:57:17 2017 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/CurrentTextBean.java	Thu Feb 02 17:59:35 2017 +0100
@@ -26,9 +26,9 @@
 import de.mpiwg.itgroup.ismi.auxObjects.AliasListenerObject;
 import de.mpiwg.itgroup.ismi.auxObjects.ListenerObject;
 import de.mpiwg.itgroup.ismi.util.guiComponents.Calendar;
+import de.mpiwg.itgroup.ismi.util.guiComponents.EntityList;
 import de.mpiwg.itgroup.ismi.util.guiComponents.Misattribution;
 import de.mpiwg.itgroup.ismi.util.guiComponents.MisattributionTable;
-import de.mpiwg.itgroup.ismi.util.guiComponents.EntityList;
 
 public class CurrentTextBean extends AbstractISMIBean implements Serializable{
 	private static final long serialVersionUID = 1017399812886455381L;
--- a/src/main/java/de/mpiwg/itgroup/ismi/search/beans/SampleSearch06.java	Thu Feb 02 11:57:17 2017 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/search/beans/SampleSearch06.java	Thu Feb 02 17:59:35 2017 +0100
@@ -12,6 +12,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.mpi.openmind.repository.bo.Entity;
 import org.mpi.openmind.repository.utils.NormalizerUtils;
+import org.mpi.openmind.repository.utils.OldNormalizerUtils;
 import org.mpi.openmind.repository.utils.TransliterationUtil;
 import org.mpi.openmind.search.utils.ResultEntry;
 import org.mpi.openmind.search.utils.SAttributeMultipleName;
@@ -319,8 +320,8 @@
 		public int compareTo(ResultEntry06 o) {
 			if(!this.personId.equals(o.personId)){
 				
-				int comparisonPerson = NormalizerUtils.normalizedToCompare(personNOv).compareTo(
-						NormalizerUtils.normalizedToCompare(o.personNOv));
+				int comparisonPerson = OldNormalizerUtils.normalizedToCompare(personNOv).compareTo(
+						OldNormalizerUtils.normalizedToCompare(o.personNOv));
 				if(comparisonPerson != 0){
 					return comparisonPerson;
 				}else{
@@ -353,8 +354,8 @@
 						}	
 					}	
 					//comparing title
-					int comparisonTitle = NormalizerUtils.normalizedToCompare(titleNOv).compareTo(
-							NormalizerUtils.normalizedToCompare(o.titleNOv));
+					int comparisonTitle = OldNormalizerUtils.normalizedToCompare(titleNOv).compareTo(
+							OldNormalizerUtils.normalizedToCompare(o.titleNOv));
 					return comparisonTitle;
 				}
 			}
--- a/src/main/java/de/mpiwg/itgroup/ismi/search/beans/Titles4PersonQuery.java	Thu Feb 02 11:57:17 2017 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/search/beans/Titles4PersonQuery.java	Thu Feb 02 17:59:35 2017 +0100
@@ -12,6 +12,7 @@
 import org.mpi.openmind.repository.bo.Entity;
 import org.mpi.openmind.repository.bo.Relation;
 import org.mpi.openmind.repository.utils.NormalizerUtils;
+import org.mpi.openmind.repository.utils.OldNormalizerUtils;
 import org.mpi.openmind.search.utils.ResultEntry;
 import org.mpi.openmind.search.utils.SAttributeMultipleName;
 import org.mpi.openmind.search.utils.SAttributeUniqueName;
@@ -427,8 +428,8 @@
 		public int compareTo(Titles4PersonEntry o) {
 			if(!this.personId.equals(o.personId)){
 				
-				int comparisonPerson = NormalizerUtils.normalizedToCompare(personNOv).compareTo(
-						NormalizerUtils.normalizedToCompare(o.personNOv));
+				int comparisonPerson = OldNormalizerUtils.normalizedToCompare(personNOv).compareTo(
+						OldNormalizerUtils.normalizedToCompare(o.personNOv));
 				if(comparisonPerson != 0){
 					return comparisonPerson;
 				}else{
@@ -461,8 +462,8 @@
 						}	
 					}	
 					//comparing title
-					int comparisonTitle = NormalizerUtils.normalizedToCompare(titleNOv).compareTo(
-							NormalizerUtils.normalizedToCompare(o.titleNOv));
+					int comparisonTitle = OldNormalizerUtils.normalizedToCompare(titleNOv).compareTo(
+							OldNormalizerUtils.normalizedToCompare(o.titleNOv));
 					return comparisonTitle;
 				}
 			}
--- a/src/main/java/de/mpiwg/itgroup/ismi/search/beans/Witness4TitleQuery.java	Thu Feb 02 11:57:17 2017 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/search/beans/Witness4TitleQuery.java	Thu Feb 02 17:59:35 2017 +0100
@@ -8,6 +8,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.mpi.openmind.repository.bo.Entity;
 import org.mpi.openmind.repository.utils.NormalizerUtils;
+import org.mpi.openmind.repository.utils.OldNormalizerUtils;
 import org.mpi.openmind.search.utils.ResultEntry;
 import org.mpi.openmind.search.utils.SAttributeMultipleName;
 import org.mpi.openmind.search.utils.SAttributeUniqueName;
@@ -223,16 +224,16 @@
 				}	
 				
 				//comparing title
-				int comparisonTitle = NormalizerUtils.normalizedToCompare(titleNOv).compareTo(
-						NormalizerUtils.normalizedToCompare(o.titleNOv));
+				int comparisonTitle = OldNormalizerUtils.normalizedToCompare(titleNOv).compareTo(
+						OldNormalizerUtils.normalizedToCompare(o.titleNOv));
 				if(comparisonTitle != 0){
 					return comparisonTitle;
 				}
 			}else{
 				if(!this.witnessId.equals(o.witnessId)){
 					//comparing witness
-					int comparisonWitness = NormalizerUtils.normalizedToCompare(titleNOv).compareTo(
-							NormalizerUtils.normalizedToCompare(o.titleNOv));
+					int comparisonWitness = OldNormalizerUtils.normalizedToCompare(titleNOv).compareTo(
+							OldNormalizerUtils.normalizedToCompare(o.titleNOv));
 					return comparisonWitness;
 				}
 			}
--- a/src/main/java/de/mpiwg/itgroup/ismi/servlets/jsonmethods/JSONNormString.java	Thu Feb 02 11:57:17 2017 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/servlets/jsonmethods/JSONNormString.java	Thu Feb 02 17:59:35 2017 +0100
@@ -10,8 +10,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.json.JSONObject;
 import org.mpi.openmind.cache.WrapperService;
-import org.mpi.openmind.repository.utils.ArabicNormalizerUtils;
-import org.mpi.openmind.repository.utils.ArabicTranslitNormalizer;
+import org.mpi.openmind.repository.utils.NormalizerUtils;
 
 public class JSONNormString extends AbstractServletJSONMethod {
 
@@ -34,14 +33,14 @@
             }
             if (type.equalsIgnoreCase("arabic_translit")) {
                 if (text != null) {
-                    String normText = ArabicTranslitNormalizer.normalize(text);
+                    String normText = NormalizerUtils.normalizeArabicTranslit(text);
                     json.put("text", text);
                     json.put("normalization_type", "arabic_translit");
                     json.put("normalized_text", normText);
                 }
             } else if (type.equalsIgnoreCase("arabic")) {
                 if (text != null) {
-                    String normText = ArabicNormalizerUtils.normalize(text);
+                    String normText = NormalizerUtils.normalizeArabic(text);
                     json.put("text", text);
                     json.put("normalization_type", type);
                     json.put("normalized_text", normText);