Merge pull request #71 from thesaurus-linguae-aegyptiae/tlaES-2September22_CV

Changes for searching  with encoding parameter

Author: cvertan

gradle/wrapper/gradle-wrapper.jar

@@ -37,6 +37,8 @@
 import tla.domain.command.SentenceSearch;
 import tla.domain.command.TextSearch;
 import tla.domain.command.TranslationSpec;
+import tla.domain.command.TranscriptionSpec;
+//import tla.domain.command.RootSpec;
 import tla.domain.dto.AnnotationDto;
 import tla.domain.dto.CorpusObjectDto;
 import tla.domain.dto.LemmaDto;
@@ -71,6 +73,20 @@ protected TranslationSpec convert(TranslationSpec source) {
             return source;
         }
     }
+    
+    public static class TranscriptionSpecConverter extends AbstractConverter<TranscriptionSpec, TranscriptionSpec> {
+        @Override
+        protected TranscriptionSpec convert(TranscriptionSpec source) {
+            return source;
+        }
+    }
+    
+   /* public static class RootSpecConverter extends AbstractConverter<RootSpec, RootSpec> {
+        @Override
+        protected RootSpec convert(RootSpec source) {
+            return source;
+        }
+    }*/
     /**
      * Container for configurations that can be attributed to an eClass specified
      * via {@link BTSeClass} annotation on top of an {@link TLAEntity} instance:
@@ -290,12 +306,33 @@ protected static ModelMapper initModelMapper() {
                 SentenceSearch::getPassport, SentenceSearchQueryBuilder::setPassport
             )
         );
+       /* modelMapper.createTypeMap(LemmaSearch.class, LemmaSearchQueryBuilder.class).addMappings(
+                m -> m.using(new TranslationSpecConverter()).map(
+                    LemmaSearch::getTranslation, LemmaSearchQueryBuilder::setTranslation
+                )
+            );*/
+        
+       
+        
         modelMapper.createTypeMap(TranslationSpec.class, TranslationSpec.class);
         modelMapper.createTypeMap(LemmaSearch.class, LemmaSearchQueryBuilder.class).addMappings(
             m -> m.using(new TranslationSpecConverter()).map(
                 LemmaSearch::getTranslation, LemmaSearchQueryBuilder::setTranslation
             )
         );
+       modelMapper.createTypeMap(TranscriptionSpec.class, TranscriptionSpec.class);
+        modelMapper.getTypeMap(LemmaSearch.class, LemmaSearchQueryBuilder.class).addMappings(
+                m -> m.using(new TranscriptionSpecConverter()).map(
+                    LemmaSearch::getTranscription, LemmaSearchQueryBuilder::setTranscription
+                )
+            );
+        
+      /*  modelMapper.createTypeMap(RootSpec.class, RootSpec.class);
+        modelMapper.getTypeMap(LemmaSearch.class, LemmaSearchQueryBuilder.class).addMappings(
+                m -> m.using(new RootSpecConverter()).map(
+                    LemmaSearch::getRoot, LemmaSearchQueryBuilder::setRoot
+                )
+            );*/
         modelMapper.getTypeMap(SentenceSearch.class, SentenceSearchQueryBuilder.class).addMappings(
             m -> m.using(new TranslationSpecConverter()).map(
                 SentenceSearch::getTranslation, SentenceSearchQueryBuilder::setTranslation

src/main/java/tla/backend/es/model/meta/ModelConfig.java

@@ -15,6 +15,8 @@
 import tla.backend.es.model.LemmaEntity;
 import tla.backend.service.ModelClass;
 import tla.domain.command.TypeSpec;
+import tla.domain.command.TranscriptionSpec;
+//import tla.domain.command.RootSpec;
 import tla.domain.model.Script;
 
 @Getter
@@ -46,13 +48,38 @@ public void setScript(List<Script> scripts) {
         this.filter(scriptFilter);
     }
 
-    public void setTranscription(String transcription) {
-        if (transcription != null) {
-			this.must(regexpQuery("transcription.unicode", maskRegExTranscription(transcription)));
+    public void setTranscription(TranscriptionSpec transcription) {
+    	System.out.println("Sent to query ");
+        if (transcription.getText() != null) {
+        	//int posEnc=transcription.indexOf("|");
+        	//String encod=transcription.substring(posEnc+1);
+        	System.out.println("Sent to query "+transcription.getEnc()[0]);
+        	if (transcription.getEnc()[0].equals("mdc")){
+        		
+        		this.must(regexpQuery("transcription.mdc", maskRegExTranscription(transcription.getText())));
+        	}
+        	else this.must(regexpQuery("transcription.unicode", maskRegExTranscription(transcription.getText())));
 			// works with Unicode only?
         }
+        
     }
 
+  /*  public void setRoot(RootSpec root) {
+    	
+        if (root != null) {
+        	//int posEnc=transcription.indexOf("|");
+        	//String encod=transcription.substring(posEnc+1);
+        	
+        	if (root.getEnc()[0].equals("mdc")){
+        		
+        		this.must(regexpQuery("relations.root.name", maskRegExTranscription(root.getText())));
+        	}
+        	else this.must(regexpQuery("relations.root.name", maskRegExTranscription(root.getText())));
+			// works with Unicode only?
+        }
+       
+    }*/
+    
     public String maskRegExTranscription(String transcription) {
         if (transcription != null) {
 			transcription = transcription.trim(); // cut whitespaces