Merge remote-tracking branch 'senseidb/master'

.gitignore

@@ -27,3 +27,4 @@ target
 *.iml
 *.ipr
 *.iws
+sensei-ba/src/test/resources/data/index/*

README.md

@@ -16,7 +16,7 @@ Wiki is available at:
 
 Issues are tracked at: 
 
-[http://linkedin.jira.com/browse/SENSEI](http://linkedin.jira.com/browse/SENSEI)
+[https://senseidb.atlassian.net/browse/SENSEI](https://senseidb.atlassian.net/browse/SENSEI)
 
 ### Mailing List / Discussion Group
 

bin/start-sensei-node.sh

@@ -14,7 +14,15 @@ bin=`cd "$bin"; pwd`
 OS=`uname`
 IP="" # store IP
 case $OS in
-   Linux) IP=`/sbin/ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -n 1`;;
+   Linux) 
+        if [ -f /sbin/ifconfig ]
+        then
+            IP=`/sbin/ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -n 1`
+        else
+        # some linux use /bin/ifconfig (e.g. gentoo)
+            IP=`/bin/ifconfig | grep 'inet ' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $2}' | head -n 1`
+        fi
+        ;;
    FreeBSD|OpenBSD|Darwin) IP=`ifconfig | grep -E '^en[0-9]:' -A 4 | grep -E 'inet.[0-9]' | grep -v '127.0.0.1' | awk '{ print $2}' | head -n 1` ;;
    SunOS) IP=`ifconfig -a | grep inet | grep -v '127.0.0.1' | awk '{ print $2} ' | head -n 1` ;;
    *) IP="Unknown";;

clients/java/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.senseidb</groupId>
 		<artifactId>sensei-parent</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
+		<version>1.6.1-SNAPSHOT</version>
 		<relativePath>../../sensei-parent/pom.xml</relativePath>
 	</parent>
 

clients/java/src/main/java/com/senseidb/search/client/SenseiServiceProxy.java

@@ -72,16 +72,23 @@ public SenseiResult sendSearchRequest( SenseiClientRequest request)  {
     }
     public SenseiResult sendBQL( String bql) {
       try {
-        StringBuilder buffer = new StringBuilder();
-        buffer.append("{'bql':").append(bql).append("}");
-        String requestStr = buffer.toString();
-        String output = sendPostRaw(getSearchUrl(), requestStr);
+        String output = sendBQLRaw(bql);
         return JsonDeserializer.deserialize(SenseiResult.class, jsonResponse(output));
       } catch (Exception ex) {
         throw new RuntimeException(ex);
       }
     }
-
+    public String sendBQLRaw( String bql) {
+      try {
+        JSONObject bqlJson = new JSONObject().put("bql", bql);
+
+
+        String output = sendPostRaw(getSearchUrl(), bqlJson.toString());
+       return output;
+      } catch (Exception ex) {
+        throw new RuntimeException(ex);
+      }
+    }
 
   public Map<Long, JSONObject> sendGetRequest(long... uids) throws IOException, JSONException {
     Map<Long, JSONObject> ret = new LinkedHashMap<Long, JSONObject>(uids.length);

docs/pom.xml

@@ -11,7 +11,7 @@
 
   <artifactId>sensei-doc</artifactId>
 
-  <version>1.5.1-SNAPSHOT</version>
+  <version>1.6.1-SNAPSHOT</version>
 
   <url>http://www.senseidb.com</url>
 

example/cars/conf/schema.xml

@@ -29,7 +29,7 @@
 	     default delimiter is ","
 	 -->
 	<column name="tags" type="string" multi="true" delimiter=","/>
-	<!-- attributes: indexed,store,termvector are only used when type is text -->
+	<!-- attributes: indexed,termvector are only used when type is text -->
 	<column name="contents" type="text" index="ANALYZED" store="YES" termvector="YES" />
   </table>
 

example/cars/webapp/index.html

@@ -134,4 +134,4 @@ <h2>Hits</h2>
 
   </body>
 
-</html>
+</html>