artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 11:27:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added search_type, scroll and scroll_id to elasticsearch

Browse Source
This commit is contained in:
Petar Bozin 2016-06-18 20:02:35 +00:00
parent 2664f5054a
commit f1e8b5b1e9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/code/search/search.scala
View File

@ -62,10 +62,10 @@ class elasticsearch extends Loggable {
}
private def constructQuery(userId: String, params: Map[String, String]): Req = {
var esScroll = ""
val esType = params.getOrElse("esType", "")
val q = params.getOrElse("q", "")
val source = params.getOrElse("source","")
//val filteredParams = params -- Set("esIndex", "esType")
//val jsonQuery = Json.encode(filteredParams)
//TODO: Workaround - HTTP and TCP ports differ. Should there be props entry for both?
val httpHost = ("http://" + esHost + ":" + esPortHTTP)
@ -77,6 +77,9 @@ class elasticsearch extends Loggable {
val sort = params.getOrElse("sort", "")
val from = params.getOrElse("from", "")
val df = params.getOrElse("df", "")
val scroll = params.getOrElse("scroll", "")
val scroll_id = params.getOrElse("scroll_id", "")
val search_type = params.getOrElse("search_type", "")
if (size != "")
parameters = parameters ++ Seq(("size", size))
if (sort != "")
@ -85,11 +88,20 @@ class elasticsearch extends Loggable {
parameters = parameters ++ Seq(("from", from))
if (df != "")
parameters = parameters ++ Seq(("df", df))
if (scroll != "")
parameters = parameters ++ Seq(("scroll", scroll))
if (search_type != "")
parameters = parameters ++ Seq(("search_type", search_type))
// scroll needs specific URL
if (scroll_id != "" && scroll != "") {
esScroll = "/scroll"
parameters = Seq(("scroll", scroll)) ++ Seq(("scroll_id", scroll_id))
}
}
else if (q == "" && source != "") {
parameters = Seq(("source", source))
}
val esUrl = Helpers.appendParams( s"${httpHost}/${esIndex}/${esType}${if (esType.nonEmpty) "/" else ""}_search", parameters )
val esUrl = Helpers.appendParams( s"${httpHost}/${esIndex}/${esType}${if (esType.nonEmpty) "/" else ""}_search${esScroll}", parameters )
println("[ES.URL]===> " + esUrl)
// Use this incase we cant log to elastic search