Permalink
Browse files

Merge remote-tracking branch '4sq/master'

Conflicts:
	src/main/scala/com/foursquare/slashem/QueryBuilder.scala
	src/test/scala/com/foursquare/slashem/ElasticQueryTest.scala
  • Loading branch information...
Holden Karau
Holden Karau committed Jun 3, 2012
2 parents 0b9a837 + 95c71e7 commit d0abe33b8ce0ff9ee226c1640e73e88f61548178
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/test/scala/com/foursquare/slashem/ElasticQueryTest.scala
@@ -406,6 +406,7 @@ class ElasticQueryTest extends SpecsMatchers with ScalaCheckMatchers {
Assert.assertEquals(res1.response.results.length, 1)
}
+ @Test
def testCustomScoreScripts {
val params: Map[String, Any] = Map("lat" -> -31.1, "lon" -> 74.0, "weight" -> 2000, "weight2" -> 0.03)
val response1 = ESimpleGeoPanda where(_.name contains "lolerskates") customScore("distance_score_magic", params) fetch()

0 comments on commit d0abe33

Please sign in to comment.