Merge branch 'master' of github.com:senseidb/sensei

Conflicts: sensei-core/pom.xml sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java
vzhabiuk · Mar 22, 2013 · 57cd40b · 57cd40b
2 parents 85cc131 + a5a1e1e
commit 57cd40b
Show file tree

Hide file tree

Showing 160 changed files with 7,879 additions and 57,408 deletions.
diff --git a/bin/load-index b/bin/load-index
@@ -42,7 +42,7 @@ def main(argv):
         "type"        : "exec",
         "mbean"       : "com.senseidb:zoie-name=pair-admin-%s-%s" % (self.node['id'], self.part),
         "operation"   : "loadIndex",
-        "arguments"   : [os.path.join(uri, str(self.part))]
+        "arguments"   : [os.path.join(uri, "shard" + str(self.part))]
       })
       if not res.get('value'):
         if res.get('status') == 404:

diff --git a/bin/start-sensei-node.sh b/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";;

diff --git a/example/cars/conf/schema.xml b/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>
 

diff --git a/example/cars/webapp/images/sensei_black.jpg b/example/cars/webapp/images/sensei_black.jpg
diff --git a/example/cars/webapp/index.html b/example/cars/webapp/index.html
@@ -134,4 +134,4 @@ <h2>Hits</h2>
 
   </body>
 
-</html>
+</html>