Merge pull request #54 from delphi-hub/feature/feature-selection

Enabled field selections

Author: bhermann

build.sbt

@@ -27,7 +27,7 @@ libraryDependencies ++= Seq(
   "com.sksamuel.elastic4s" %% "elastic4s-http-streams" % elastic4sVersion,
 )
 
-libraryDependencies += "de.upb.cs.swt.delphi" %% "delphi-core" % "0.9.1"
+libraryDependencies += "de.upb.cs.swt.delphi" %% "delphi-core" % "0.9.2"
 
 libraryDependencies += "com.pauldijou" %% "jwt-core" % "4.2.0"
 

src/main/scala/de/upb/cs/swt/delphi/webapi/search/SearchQuery.scala

@@ -45,19 +45,32 @@ class SearchQuery(configuration: Configuration, featureExtractor: FeatureQuery)
 
   lazy val externalToInternalFeature = internalFeatures.map(i => i.name -> i.internalName).toMap
 
-  private def checkAndExecuteParsedQuery(ast: CombinatorialExpr, limit: Int): Try[SearchHits] = {
-    val fields = collectFieldNames(ast)
+  private def checkAndExecuteParsedQuery(parsedQuery: de.upb.cs.swt.delphi.core.ql.Query, limit: Int): Try[SearchHits] = {
+    val fields = collectFieldNames(parsedQuery.expr)
 
     val publicFieldNames = internalFeatures.map(i => i.name)
     val invalidFields = fields.toSet.filter(f => !publicFieldNames.contains(f))
 
     if (invalidFields.size > 0) return Failure(new IllegalArgumentException(s"Unknown field name(s) used. (${invalidFields.mkString(",")})"))
 
     val translatedFields = fields.toSet.map(externalToInternalFeature(_))
+    def getPrefix (in: String) : String = {
+      if (in.contains("*")) {
+        in.substring(0, in.indexOf("*"))
+      }
+      else {
+        in
+      }
+    }
+    val selectedFields = parsedQuery
+      .selections
+      .flatMap(f => internalFeatures.filter(i => i.name.startsWith(getPrefix(f.fieldName))))
+      .map(i => i.internalName)
+
 
     val query = searchWithType(configuration.esProjectIndex)
-      .query(translate(ast))
-      .sourceInclude(ArtifactTransformer.baseFields ++ translatedFields)
+      .query(translate(parsedQuery.expr))
+      .sourceInclude(ArtifactTransformer.baseFields ++ translatedFields ++ selectedFields)
       .limit(limit)
 
     val response = client.execute {
@@ -154,8 +167,8 @@ class SearchQuery(configuration: Configuration, featureExtractor: FeatureQuery)
       val parserResult = new Syntax(query.query).QueryRule.run()
       parserResult match {
         case Failure(e) => Failure(e)
-        case Success(ast) => {
-          checkAndExecuteParsedQuery(ast, query.limit.getOrElse(defaultFetchSize)) match {
+        case Success(parsedQuery) => {
+          checkAndExecuteParsedQuery(parsedQuery, query.limit.getOrElse(defaultFetchSize)) match {
             case Failure(e) => Failure(e)
             case Success(hits) => Success(ArtifactTransformer.transformResults(hits))
           }