SSS-226

Author: dtheiler

serv/ss-datatypes/ss-entity/ss-entity-impl/src/main/java/at/kc/tugraz/ss/serv/datatypes/entity/impl/SSEntityImpl.java

@@ -84,6 +84,7 @@
 import at.kc.tugraz.ss.serv.serv.api.SSUserRelationGathererI;
 import at.kc.tugraz.ss.serv.serv.api.SSUsersResourcesGathererI;
 import at.kc.tugraz.ss.serv.serv.caller.SSServCallerU;
+import at.kc.tugraz.ss.service.search.datatypes.SSSearchOpE;
 import at.kc.tugraz.ss.service.userevent.datatypes.SSUEE;
 import java.util.ArrayList;
 import java.util.List;
@@ -574,10 +575,21 @@ public List<SSEntity> entitiesForLabelsAndDescriptionsGet(final SSServPar parA)
     try{
       final SSEntitiesForLabelsAndDescriptionsGetPar  par = new SSEntitiesForLabelsAndDescriptionsGetPar(parA);
 
-      return sqlFct.getEntitiesForLabelsAndDescriptions(
-        SSStrU.distinctWithoutEmptyAndNull(par.requireds),
-        SSStrU.distinctWithoutEmptyAndNull(par.absents),
-        SSStrU.distinctWithoutEmptyAndNull(par.eithers));
+      //TODO a lot of improvement and error handling here
+      
+      if(!par.requireds.isEmpty()){
+        return sqlFct.getEntitiesForLabelsAndDescriptionsWithSQLLike(par.requireds, par.requireds, SSSearchOpE.and);
+      }
+      
+      if(!par.eithers.isEmpty()){
+        return sqlFct.getEntitiesForLabelsAndDescriptionsWithSQLLike(par.eithers, par.eithers, SSSearchOpE.or);
+      }
+      
+      if(!par.absents.isEmpty()){
+        throw new UnsupportedOperationException("absents not suppported yet");
+      }
+      
+      return new ArrayList<>();
 
     }catch(Exception error){
       SSServErrReg.regErrThrow(error);
@@ -591,10 +603,26 @@ public List<SSEntity> entitiesForLabelsGet(final SSServPar parA) throws Exceptio
     try{
       final SSEntitiesForLabelsGetPar  par      = new SSEntitiesForLabelsGetPar(parA);
 
-      return sqlFct.getEntitiesForLabels(
-        SSStrU.distinctWithoutEmptyAndNull(par.requireds),
-        SSStrU.distinctWithoutEmptyAndNull(par.absents),
-        SSStrU.distinctWithoutEmptyAndNull(par.eithers));
+     //TODO a lot of improvment and error handling here
+      
+      if(!par.requireds.isEmpty()){
+        return sqlFct.getEntitiesForLabelsAndDescriptionsWithSQLLike(par.requireds, new ArrayList<>(), SSSearchOpE.and);
+        //TODO could also use public List<SSEntity> getEntitiesForLabelsAndDescriptions(final List<String> requireds,final List<String> absents,final List<String> eithers);
+        //here, although it depends on the innodb_ft_min_token_size setting for InnoDB MYSQL tables then, and stopwords and so on
+        //see http://dba.stackexchange.com/questions/51144/mysql-match-against-boolean-mode and http://dev.mysql.com/doc/refman/5.6/en/fulltext-stopwords.html
+        //please consider that the actual version doesnt exploit MYSQL indexes on labels and descriptions
+      }
+      
+      if(!par.eithers.isEmpty()){
+        return sqlFct.getEntitiesForLabelsAndDescriptionsWithSQLLike(par.eithers, new ArrayList<>(), SSSearchOpE.or);
+      }
+      
+      if(!par.absents.isEmpty()){
+        throw new UnsupportedOperationException("absents not suppported yet");
+      }
+      
+      return new ArrayList<>();
+      
 
     }catch(Exception error){
       SSServErrReg.regErrThrow(error);
@@ -608,11 +636,21 @@ public List<SSEntity> entitiesForDescriptionsGet(final SSServPar parA) throws Ex
     try{
       final SSEntitiesForDescriptionsGetPar  par      = new SSEntitiesForDescriptionsGetPar(parA);
 
-      return sqlFct.getEntitiesForDescriptions(
-        SSStrU.distinctWithoutEmptyAndNull(par.requireds),
-        SSStrU.distinctWithoutEmptyAndNull(par.absents),
-        SSStrU.distinctWithoutEmptyAndNull(par.eithers));
+      //TODO a lot of improvement and error handling here
+      
+      if(!par.requireds.isEmpty()){
+        return sqlFct.getEntitiesForLabelsAndDescriptionsWithSQLLike(new ArrayList<>(), par.requireds, SSSearchOpE.and);
+      }
+      
+      if(!par.eithers.isEmpty()){
+        return sqlFct.getEntitiesForLabelsAndDescriptionsWithSQLLike(new ArrayList<>(), par.eithers, SSSearchOpE.or);
+      }
+      
+      if(!par.absents.isEmpty()){
+        throw new UnsupportedOperationException("absents not suppported yet");
+      }
 
+      return new ArrayList<>();
     }catch(Exception error){
       SSServErrReg.regErrThrow(error);
       return null;