rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/rubyJVM/src/com/rho/sync/SyncThread.java

@@ -32,6 +32,7 @@ import com.rho.db.DBAdapter;
 import com.rho.db.IDBResult;
 import com.xruby.runtime.builtin.*;
 import com.xruby.runtime.lang.*;
+import java.util.Vector;
 
 public class SyncThread extends RhoThread
 {
@@ -102,13 +103,14 @@ public class SyncThread extends RhoThread
     {
 	    String m_strFrom;
 	    boolean   m_bSyncChanges;
-	    int     m_nProgressStep;
-        public SyncSearchCommand(String from, String params, int source_id, boolean sync_changes, int nProgressStep)
+	    Vector/*<rho::String>*/ m_arSources;
+	    
+        public SyncSearchCommand(String from, String params, Vector arSources, boolean sync_changes, int nProgressStep)
 	    {
-        	super(scSearchOne,params,source_id, false);
+        	super(scSearchOne,params,nProgressStep, false);
 		    m_strFrom = from;
 		    m_bSyncChanges = sync_changes;
-		    m_nProgressStep = nProgressStep;
+		    m_arSources = arSources;
 	    }
     };
    	
@@ -133,7 +135,10 @@ public class SyncThread extends RhoThread
 	    stop(SYNC_WAIT_BEFOREKILL_SECONDS);
 	    LOG.INFO( "Sync engine thread shutdown" );
 		
-	    getDBAdapter().close();
+	    if ( ClientRegister.getInstance() != null )
+	    	ClientRegister.getInstance().Destroy();
+	    
+	    DBAdapter.closeAll();
 	    
 	    m_pInstance = null;
 	}
@@ -142,7 +147,7 @@ public class SyncThread extends RhoThread
 	{
 		super(factory);
 		
-		m_oSyncEngine = new SyncEngine(DBAdapter.getInstance());
+		m_oSyncEngine = new SyncEngine();
 		m_nPollInterval = SYNC_POLL_INTERVAL_SECONDS;
 		if( RhoConf.getInstance().isExist("sync_poll_interval") )
 			m_nPollInterval = RhoConf.getInstance().getInt("sync_poll_interval");
@@ -153,16 +158,19 @@ public class SyncThread extends RhoThread
 	    m_mxStackCommands = getSyncObject();
 	    	
 	    ClientRegister.Create(factory);
-	    	    
-	    start(epLow);
+	    
+		if ( RhoConf.getInstance().getString("syncserver").length() > 0 )
+			start(epLow);
 	}
 
     public static SyncThread getInstance(){ return m_pInstance; }
     public static SyncEngine getSyncEngine(){ return m_pInstance!= null ? m_pInstance.m_oSyncEngine : null; }
-    static DBAdapter getDBAdapter(){ return DBAdapter.getInstance(); }
 
     void addSyncCommand(SyncCommand oSyncCmd)
     { 
+		if ( RhoConf.getInstance().getString("syncserver").length() == 0 )
+			return;
+		
     	LOG.INFO( "addSyncCommand: " + oSyncCmd.m_nCmdCode );
     	synchronized(m_mxStackCommands)
     	{
@@ -188,7 +196,7 @@ public class SyncThread extends RhoThread
     	try{
 	    	long nowTime = (TimeInterval.getCurrentTime().toULong())/1000;
 	    	
-		    IDBResult res = m_oSyncEngine.getDB().executeSQL("SELECT last_updated from sources");
+		    IDBResult res = DBAdapter.getUserDB().executeSQL("SELECT last_updated from sources");
 		    long latestTimeUpdated = 0;
 		    for ( ; !res.isEnd(); res.next() )
 		    { 
@@ -293,35 +301,19 @@ public class SyncThread extends RhoThread
 	        break;
 	    case scChangePollInterval:
 	        break;
-	    case scSyncOneByUrl:
-	        {
-	            SyncEngine.SourceID oSrcID = new SyncEngine.SourceID();
-	            oSrcID.m_strUrl = oSyncCmd.m_strCmdParam;
-	
-	            checkShowStatus(oSyncCmd);
-	            m_oSyncEngine.doSyncSource(oSrcID,"","",false, -1 );
-	        }
-	        break;
         case scSyncOne:
 	        {
-	            SyncEngine.SourceID oSrcID = new SyncEngine.SourceID();
-	            oSrcID.m_nID = oSyncCmd.m_nCmdParam;
-	            oSrcID.m_strName = oSyncCmd.m_strCmdParam;
-	
-	            checkShowStatus(oSyncCmd);
-	            m_oSyncEngine.doSyncSource(oSrcID,"","",false, -1 );
+				checkShowStatus(oSyncCmd);
+	            m_oSyncEngine.doSyncSource(new SyncEngine.SourceID(oSyncCmd.m_nCmdParam,oSyncCmd.m_strCmdParam));
 	        }
 	        break;
 	        
 	    case scSearchOne:
 		    {
-	            SyncEngine.SourceID oSrcID = new SyncEngine.SourceID();
-	            oSrcID.m_nID = oSyncCmd.m_nCmdParam;
-		    	
-	            checkShowStatus(oSyncCmd);
-		        m_oSyncEngine.doSyncSource(oSrcID, oSyncCmd.m_strCmdParam, 
-		            ((SyncSearchCommand)oSyncCmd).m_strFrom, ((SyncSearchCommand)oSyncCmd).m_bSyncChanges,
-		            ((SyncSearchCommand)oSyncCmd).m_nProgressStep);
+				checkShowStatus(oSyncCmd);
+	            m_oSyncEngine.doSearch( ((SyncSearchCommand)oSyncCmd).m_arSources, oSyncCmd.m_strCmdParam, 
+	                    ((SyncSearchCommand)oSyncCmd).m_strFrom, ((SyncSearchCommand)oSyncCmd).m_bSyncChanges,
+	                    oSyncCmd.m_nCmdParam);
 		    }
 	        break;
 	        
@@ -367,7 +359,18 @@ public class SyncThread extends RhoThread
 	
 	public static void doSyncSourceByUrl(String strSrcUrl, boolean bShowStatus)
 	{
-		getInstance().addSyncCommand(new SyncCommand(SyncThread.scSyncOneByUrl, strSrcUrl, bShowStatus) );
+		if (bShowStatus&&(m_statusListener != null)) {
+			m_statusListener.createStatusPopup(RhoRuby.getMessageText("syncronizing_data"));
+		}
+
+			
+	    int nLastSlash = strSrcUrl.lastIndexOf('\\');
+	    if ( nLastSlash < 0 )
+	    	nLastSlash = strSrcUrl.lastIndexOf('/');
+
+	    String strName = nLastSlash >=0 ? strSrcUrl.substring(nLastSlash + 1) : strSrcUrl;
+		
+	    getInstance().addSyncCommand(new SyncCommand(SyncThread.scSyncOne, strName, (int)0, false ) );		
 	}
 	
 	public static void stopSync()throws Exception
@@ -375,13 +378,15 @@ public class SyncThread extends RhoThread
 		if ( getSyncEngine().isSyncing() )
 		{
 			getSyncEngine().stopSyncByUser();
+			getInstance().stopWait();
+			
 			int nWait = 0;
 			//while( nWait < 30000 && getSyncEngine().getState() != SyncEngine.esNone )
-			while( nWait < 30000 && getSyncEngine().getDB().isInsideTransaction() )
+			while( nWait < 30000 && DBAdapter.isAnyInsideTransaction() )
 				try{ Thread.sleep(100); nWait += 100; }catch(Exception e){}
 				
 			//if (getSyncEngine().getState() != SyncEngine.esNone)
-			if ( getSyncEngine().getDB().isInsideTransaction() )	
+			if ( DBAdapter.isAnyInsideTransaction() )
 			{
 				getSyncEngine().exitSync();
 				getInstance().stop(0);
@@ -463,7 +468,7 @@ public class SyncThread extends RhoThread
 			}
 		});
 		
-		klass.getSingletonClass().defineMethod("dosearch_source",
+		klass.getSingletonClass().defineMethod("dosearch",
 			new RubyVarArgMethod() {
 				protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) {
 					if ( args.size() != 7 )
@@ -471,7 +476,8 @@ public class SyncThread extends RhoThread
 								"in SyncEngine.dosearch_source: wrong number of arguments ( " + args.size() + " for " + 7 + " )");			
 					
 					try{
-						int source_id = args.get(0).toInt();
+						Vector arSources = RhoRuby.makeVectorStringFromArray(args.get(0));
+						
 						String from = args.get(1).toStr();
 						String params = args.get(2).toStr();
 						
@@ -484,9 +490,9 @@ public class SyncThread extends RhoThread
 						stopSync();
 
 						if ( callback != null && callback.length() > 0 )
-							getSyncEngine().getNotify().setSearchNotification(source_id, callback, callback_params);
+							getSyncEngine().getNotify().setSearchNotification(callback, callback_params);
 						
-						getInstance().addSyncCommand(new SyncSearchCommand(from,params,source_id,bSearchSyncChanges, nProgressStep) );
+						getInstance().addSyncCommand(new SyncSearchCommand(from,params,arSources,bSearchSyncChanges, nProgressStep) );
 					}catch(Exception e)
 					{
 						LOG.ERROR("SyncEngine.login", e);
@@ -512,37 +518,6 @@ public class SyncThread extends RhoThread
 			}
 		});
 		
-		klass.getSingletonClass().defineMethod("lock_sync_mutex",
-			new RubyNoArgMethod() {
-				protected RubyValue run(RubyValue receiver, RubyBlock block) {
-					try{
-					    DBAdapter db = getDBAdapter();
-					    db.setUIWaitDB(true);
-					    db.Lock();
-					}catch(Exception e)
-					{
-						LOG.ERROR("lock_sync_mutex failed", e);
-						throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
-					}
-				    
-				    return RubyConstant.QNIL;
-				}
-			});
-		klass.getSingletonClass().defineMethod("unlock_sync_mutex",
-			new RubyNoArgMethod() {
-				protected RubyValue run(RubyValue receiver, RubyBlock block) {
-					try{
-					    DBAdapter db = getDBAdapter();
-					    db.Unlock();
-					}catch(Exception e)
-					{
-						LOG.ERROR("unlock_sync_mutex failed", e);
-						throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
-					}
-					
-				    return RubyConstant.QNIL;
-				}
-			});
 		klass.getSingletonClass().defineMethod("login",
 				new RubyVarArgMethod() {
 					protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) {
@@ -572,19 +547,15 @@ public class SyncThread extends RhoThread
 		klass.getSingletonClass().defineMethod("logged_in",
 			new RubyNoArgMethod() {
 				protected RubyValue run(RubyValue receiver, RubyBlock block) {
-					DBAdapter db = getDBAdapter();
+					DBAdapter db = DBAdapter.getUserDB();
 
 					try{
-						db.setUIWaitDB(true);
 					    return getSyncEngine().isLoggedIn() ? 
 					    		ObjectFactory.createInteger(1) : ObjectFactory.createInteger(0);
 					}catch(Exception e)
 					{
 						LOG.ERROR("logged_in failed", e);
 						throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
-					}finally
-					{
-						db.setUIWaitDB(false);
 					}
 				    
 				}
@@ -593,20 +564,15 @@ public class SyncThread extends RhoThread
 		klass.getSingletonClass().defineMethod("logout",
 			new RubyNoArgMethod() {
 				protected RubyValue run(RubyValue receiver, RubyBlock block) {
-					DBAdapter db = getDBAdapter();
+					DBAdapter db = DBAdapter.getUserDB();
 
 					try{
 						stopSync();
-						
-						db.setUIWaitDB(true);
 					    getSyncEngine().logout();
 					}catch(Exception e)
 					{
 						LOG.ERROR("logout failed", e);
 						throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
-					}finally
-					{
-						db.setUIWaitDB(false);
 					}
 					
 				    return RubyConstant.QNIL;
@@ -647,30 +613,30 @@ public class SyncThread extends RhoThread
 				}
 			});
 		
-		klass.getSingletonClass().defineMethod("set_initial_notification",
+		klass.getSingletonClass().defineMethod("set_bulk_notification",
 				new RubyTwoArgMethod() {
 					protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyValue arg2, RubyBlock block) {
 						
 						try{
 							String url = arg1.toStr();
 							String params = arg2.toStr();
-							getSyncEngine().getNotify().setInitialSyncNotification(url, params);
+							getSyncEngine().getNotify().setBulkSyncNotification(url, params);
 						}catch(Exception e)
 						{
-							LOG.ERROR("set_initial_notification failed", e);
+							LOG.ERROR("set_bulk_notification failed", e);
 							throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 						}
 						return RubyConstant.QNIL;
 					}
 				});
-		klass.getSingletonClass().defineMethod("clear_initial_notification",
+		klass.getSingletonClass().defineMethod("clear_bulk_notification",
 				new RubyNoArgMethod() {
 					protected RubyValue run(RubyValue receiver, RubyBlock block) {
 						try{
-							getSyncEngine().getNotify().clearInitialSyncNotification();
+							getSyncEngine().getNotify().clearBulkSyncNotification();
 						}catch(Exception e)
 						{
-							LOG.ERROR("clear_initial_notification failed", e);
+							LOG.ERROR("clear_bulk_notification failed", e);
 							throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 						}
 						
@@ -711,11 +677,12 @@ public class SyncThread extends RhoThread
 			});
 		
 		klass.getSingletonClass().defineMethod("get_src_attrs",
-				new RubyOneArgMethod() {
-					protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) {
+				new RubyTwoArgMethod() {
+					protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyValue arg1, RubyBlock block) {
 						try{
+							String strPartition = arg0.toStr(); 
 							int nSrcID = arg1.toInt();
-							return getDBAdapter().getAttrMgr().getAttrsBySrc(nSrcID);
+							return DBAdapter.getDB(strPartition).getAttrMgr().getAttrsBySrc(nSrcID);
 						}catch(Exception e)
 						{
 							LOG.ERROR("get_src_attrs failed", e);
@@ -724,6 +691,23 @@ public class SyncThread extends RhoThread
 					}
 			});
 
+		klass.getSingletonClass().defineMethod("is_blob_attr",
+				new RubyVarArgMethod() {
+					protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) {
+						try{
+							String strPartition = args.get(0).toStr(); 
+							Integer nSrcID = new Integer(args.get(1).toInt());
+							String strAttrName = args.get(2).toStr();
+							boolean bExists = DBAdapter.getDB(strPartition).getAttrMgr().isBlobAttr(nSrcID, strAttrName);
+							return ObjectFactory.createBoolean(bExists);
+						}catch(Exception e)
+						{
+							LOG.ERROR("get_src_attrs failed", e);
+							throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+						}
+					}
+			});
+		
 		klass.getSingletonClass().defineMethod("set_objectnotify_url",
 				new RubyOneArgMethod() {
 					protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) {

data/platform/shared/rubyJVM/src/com/xruby/GeneratedMethods/RubySymbol_Methods.java

@@ -22,6 +22,7 @@ klass.defineMethod( "to_s", new RubyNoArgMethod(){
 		return ((RubySymbol)receiver).to_s();}
 });
 klass.aliasMethod("id2name","to_s");
+klass.aliasMethod("to_str","to_s");
 
 klass.defineMethod( "===", new RubyOneArgMethod(){ 
 	protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyThread.java

@@ -241,6 +241,12 @@ public class RubyThread extends RubyBasic {
         return mainThread;
     }
 
+    //RHO
+    public static boolean isMainThread(){
+        return mainThread.thread_ == Thread.currentThread();
+    }
+    //RHO
+    
     //@RubyLevelMethod(name="stop?")
     public RubyValue getStoped(){
         return ObjectFactory.createBoolean(stoped);

data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyRuntime.java

@@ -105,13 +105,15 @@ public class RubyRuntime {
     public static RubyClass XMLParserClass;
     //RHO
 
-    public static final RubyValue TOP_LEVEL_SELF_VALUE;
+    public static /*final*/ RubyValue TOP_LEVEL_SELF_VALUE;
 
     private static RubyMethod respondToMethod;
 
     public static boolean running = false;
 
-    static {
+//    static {
+    private static void initClasses()
+    {
         //Note: order is important: should creare parent classes first!
 
         ObjectClass = ClassFactory.defineBootClass("Object", null);
@@ -385,6 +387,8 @@ public class RubyRuntime {
             return;
         }
 
+        initClasses();
+        
         initARGV(args);
 
         RubyAPI.setTopLevelConstant(RubyAPI.isWindows() ? ObjectFactory.createString("mswin32") : ObjectFactory.createString("java"), "RUBY_PLATFORM");

data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubySymbol.java

@@ -10,9 +10,21 @@ import com.xruby.runtime.builtin.RubyFixnum;
 import com.xruby.runtime.builtin.RubyString;
 
 //@RubyLevelClass(name="Symbol")
-public class RubySymbol extends RubySpecialValue {
+public class RubySymbol extends RubyValue {
     private RubyID id;
 
+	public void setRubyClass(RubyClass klass) {
+		throw new RubyException(RubyRuntime.TypeErrorClass, this.getRubyClass().getName() + " can't be set class");
+	}
+	
+	public RubyClass getSingletonClass() {
+    	throw new RubyException(RubyRuntime.TypeErrorClass, this.getRubyClass().getName() + " can't define singleton");
+    }
+
+	public RubyValue clone() {
+		throw new RubyException(RubyRuntime.TypeErrorClass, "can't clone " + this.getRubyClass().getName());
+	}
+    
     public RubySymbol(RubyID id) {
         this.id = id;
     }
@@ -46,6 +58,10 @@ public class RubySymbol extends RubySpecialValue {
         return this.id.toFixnum();
     }
 
+    public boolean respondTo(RubyID id) {
+    	return super.respondTo(id);
+    }
+    
     //@RubyLevelMethod(name="to_s", alias="id2name")
     public RubyString to_s() {
         return ObjectFactory.createString(id.toString());

data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyValue.java

@@ -283,6 +283,7 @@ public abstract class RubyValue extends BlockCallStatus implements Cloneable {
             return this;
         }
 
+        RubyClass theClass = this.getRubyClass();
         if (!this.respondTo(id)) {
             throw new RubyException("can't convert " + this.getRubyClass().getName() + " into " + klass.getName());
         }

data/platform/shared/rubyJVM/src/org/json/me/JSONObject.java

@@ -398,6 +398,9 @@ public class JSONObject {
             return ((Double)o).doubleValue();
         } else if (o instanceof String) {
             try {
+            	if ( ((String)o).length() == 0 )
+            		return 0;
+            	
                 return Double.valueOf((String)o).doubleValue();
             } catch (Exception e) {
                 throw new JSONException("JSONObject[" + quote(key) +

data/platform/shared/rubyext/GeoLocation.cpp

@@ -176,5 +176,28 @@ int rho_geo_gettimeout_sec()
     return RHODESAPP().getGeo().getGeoTimeoutSec();
 }
 
+double rho_geo_haversine_distance(double lat1, double lon1, double lat2, double lon2)
+{
+	if ((lat1 == lat2) && (lon1 == lon2))
+		return 0;
+
+	const double RAD_PER_DEG = 0.017453293; //PI/180
+	const int Rmiles = 3956;                //radius of the great circle in miles
+
+	double dlon = lon2 - lon1;
+	double dlat = lat2 - lat1;
+	double dlon_rad = dlon * RAD_PER_DEG;
+	double dlat_rad = dlat * RAD_PER_DEG;
+	double lat1_rad = lat1 * RAD_PER_DEG;
+	//double lon1_rad = lon1 * RAD_PER_DEG;
+	double lat2_rad = lat2 * RAD_PER_DEG;
+	//double lon2_rad = lon2 * RAD_PER_DEG;
+
+	double a = pow((sin(dlat_rad/2)), 2) + cos(lat1_rad) * cos(lat2_rad) * pow(sin(dlon_rad/2), 2);
+	double c = 2 * atan2(sqrt(a), sqrt(1-a));
+	double dMi = Rmiles * c; //delta between the two points in mile
+
+	return dMi;
 }
 
+} //extern "C"