rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/rubyext/GeoLocation.h

@@ -68,6 +68,8 @@ void rho_geo_callcallback();
 void rho_geo_callcallback_error();
 int rho_geo_gettimeout_sec();
 
+double rho_geo_haversine_distance(double lat1, double lon1, double lat2, double lon2);
+
 #ifdef __cplusplus
 };
 #endif //__cplusplus

data/platform/shared/rubyext/RhoRuby.cpp

@@ -0,0 +1,31 @@
+#include "RhoRuby.h"
+#include "ruby/ext/rho/rhoruby.h"
+
+namespace rho {
+const _CRhoRuby& RhoRuby = _CRhoRuby();
+
+/*static*/ String _CRhoRuby::getMessageText(const char* szName)
+{
+    return rho_ruby_getMessageText(szName);
+}
+
+/*static*/ String _CRhoRuby::getErrorText(int nError)
+{
+    return rho_ruby_getErrorText(nError);
+}
+
+/*static*/ int  _CRhoRuby::getErrorFromResponse(net::INetResponse& resp)
+{
+    if ( !resp.isResponseRecieved())
+        return RhoRuby.ERR_NETWORK;
+
+    if ( resp.isUnathorized() )
+    	return RhoRuby.ERR_UNATHORIZED;
+
+    if ( !resp.isOK() )
+    	return RhoRuby.ERR_REMOTESERVER;
+
+    return RhoRuby.ERR_NONE;
+}
+
+}

data/platform/shared/rubyext/RhoRuby.h

@@ -0,0 +1,32 @@
+#ifndef _RHORUBY_H_
+#define _RHORUBY_H_
+
+#include "common/RhoStd.h"
+#include "net/INetRequest.h"
+#include "ruby/ext/rho/rhoruby.h"
+
+namespace rho {
+struct _CRhoRuby {
+static const int ERR_NONE = 0;
+static const int ERR_NETWORK = 1;
+static const int ERR_REMOTESERVER = 2;
+static const int ERR_RUNTIME = 3;
+static const int ERR_UNEXPECTEDSERVERRESPONSE = 4;
+static const int ERR_DIFFDOMAINSINSYNCSRC = 5;
+static const int ERR_NOSERVERRESPONSE = 6;
+static const int ERR_CLIENTISNOTLOGGEDIN = 7;
+static const int ERR_CUSTOMSYNCSERVER = 8;
+static const int ERR_UNATHORIZED = 9;
+static const int ERR_CANCELBYUSER = 10;
+static const int ERR_SYNCVERSION = 11;
+static const int ERR_GEOLOCATION = 12;
+
+static String getMessageText(const char* szName);
+static String getErrorText(int nError);
+static int    getErrorFromResponse(net::INetResponse& resp);
+
+};
+extern const _CRhoRuby& RhoRuby;
+}
+
+#endif //_RHORUBY_H_

data/platform/shared/rubyext/System.cpp

@@ -1,13 +1,14 @@
 #include "common/RhoPort.h"
 #include "ruby/ext/rho/rhoruby.h"
 #include "sync/ClientRegister.h"
+#include "common/RhodesApp.h"
 #include "logging/RhoLog.h"
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhoSystem"
 
 extern "C"
 {
-extern VALUE rho_sysimpl_get_property(char* szPropName);
+extern int rho_sysimpl_get_property(char* szPropName, VALUE* resValue);
 extern VALUE rho_sys_has_network();
 extern VALUE rho_sys_get_locale();
 extern int rho_sys_get_screen_width();
@@ -35,8 +36,8 @@ VALUE rho_sys_get_property(char* szPropName)
 	if (!szPropName || !*szPropName) 
         return rho_ruby_get_NIL();
     
-    VALUE res = rho_sysimpl_get_property(szPropName);
-    if (res)
+    VALUE res;
+    if (rho_sysimpl_get_property(szPropName, &res))
         return res;
 
 	if (strcasecmp("platform",szPropName) == 0) 
@@ -71,4 +72,14 @@ VALUE rho_sys_get_property(char* szPropName)
     return rho_ruby_get_NIL();
 }
 
+void rho_sys_set_push_notification(const char *url, const char* params)
+{
+    RHODESAPP().setPushNotification(url, params);
 }
+
+void rho_sys_set_screen_rotation_notification(const char *url, const char* params)
+{
+	RHODESAPP().setScreenRotationNotification(url, params);
+}
+
+} //extern "C"

data/platform/shared/rubyext/WebView.h

@@ -0,0 +1,21 @@
+#ifndef _RHOWEBVIEW_H_
+#define _RHOWEBVIEW_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+void rho_webview_refresh(int index);
+void rho_webview_navigate(const char* url, int index);
+void rho_webview_navigate_back();
+const char* rho_webview_execute_js(const char* js, int index);
+const char* rho_webview_current_location(int index);
+int rho_webview_active_tab();
+void rho_webview_set_menu_items(VALUE valMenu);
+void rho_webview_full_screen_mode(int enable);
+
+#ifdef __cplusplus
+};
+#endif //__cplusplus
+
+#endif //_RHOWEBVIEW_H_

data/platform/shared/sync/ClientRegister.cpp

@@ -1,12 +1,12 @@
 #include "ClientRegister.h"
 #include "sync/SyncThread.h"
 #include "common/RhoConf.h"
-#include "common/StringConverter.h"
 
 namespace rho{
 namespace sync{
 
 using namespace rho::common;
+using namespace rho::db;
 
 #define THREAD_WAIT_TIMEOUT 10
 
@@ -37,9 +37,12 @@ CClientRegister::CClientRegister(common::IRhoClassFactory* factory,const char* d
 
 	m_strDevicePin = device_pin;
 	m_NetRequest = factory->createNetRequest();
+    m_nPollInterval = POLL_INTERVAL_SECONDS;
 
     delete factory;
-	start(epLow);
+
+    if ( RHOCONF().getString("syncserver").length() > 0 )
+    	start(epLow);
 }
 
 CClientRegister::~CClientRegister()
@@ -61,34 +64,35 @@ void CClientRegister::run()
 				break;
 		}
 		
-		LOG(INFO)+"Waiting for "+ POLL_INTERVAL_SECONDS+ " sec to try again to register client";
-		wait(POLL_INTERVAL_SECONDS);
+		LOG(INFO)+"Waiting for "+ m_nPollInterval+ " sec to try again to register client";
+		wait(m_nPollInterval);
 	}
     LOG(INFO)+"ClientRegister thread shutdown";
 }
 
-String CClientRegister::getRegisterBody()
+String CClientRegister::getRegisterBody(const String& strClientID)
 {
 	int port = RHOCONF().getInt("push_port");
 
-    String strBody = "device_pin=" + m_strDevicePin + 
-        "&device_port=" + convertToStringA(port > 0 ? port : DEFAULT_PUSH_PORT) +
-        "&device_type=" + m_sysInfo->getPlatform();
-
-    return strBody;
+    return CSyncThread::getSyncEngine().getProtocol().getClientRegisterBody( strClientID, m_strDevicePin, 
+        port > 0 ? port : DEFAULT_PUSH_PORT, m_sysInfo->getPlatform());
 }
 
 boolean CClientRegister::doRegister(CSyncEngine& oSync) 
 {
 	String session = oSync.loadSession();
 	if ( session.length() == 0 )
+    {
+        m_nPollInterval = POLL_INTERVAL_INFINITE;
 		return false;
-	
+    }
+    m_nPollInterval = POLL_INTERVAL_SECONDS;    		
+
 	String client_id = oSync.loadClientID();
 	if ( client_id.length() == 0 )
 		return false;
 
-	DBResult( res, oSync.getDB().executeSQL("SELECT token,token_sent from client_info") );
+    DBResult( res, CDBAdapter::getUserDB().executeSQL("SELECT token,token_sent from client_info") );
     if ( !res.isEnd() ) {
 		String token = res.getStringByIdx(0); 
 		int token_sent = res.getIntByIdx(1);
@@ -99,28 +103,19 @@ boolean CClientRegister::doRegister(CSyncEngine& oSync)
 			return true; 
 		}
     }
-
-	String serverUrl = RHOCONF().getPath("syncserver");
-	if (serverUrl.length()>0) 
+	String strBody = getRegisterBody(client_id);
+    NetResponse(resp, getNet().pushData( oSync.getProtocol().getClientRegisterUrl(), strBody, &oSync ));
+	if( resp.isOK() )
     {
-		String strBody = getRegisterBody();
-    	strBody += "&client_id=" + client_id;
-
-        NetResponse(resp, getNet().pushData(serverUrl+"clientregister", strBody, &oSync ));
-		if( resp.isOK() )
-        {
 //				try {
-				oSync.getDB().executeSQL("UPDATE client_info SET token_sent=?, token=?", 1, m_strDevicePin );
+			CDBAdapter::getUserDB().executeSQL("UPDATE client_info SET token_sent=?, token=?", 1, m_strDevicePin );
 //				} catch(Exception ex) {
 //					LOG.ERROR("Error saving token_sent to the DB...");
 //				}	
-			LOG(INFO)+"Registered client sucessfully...";
-			return true;
-		} else {
-			LOG(INFO)+"Network error POST-ing device pin to the server...";
-		}
+		LOG(INFO)+"Registered client sucessfully...";
+		return true;
 	} else {
-		LOG(INFO)+"Can't register client because syncserver url is not configured...";
+		LOG(INFO)+"Network error POST-ing device pin to the server...";
 	}
 	
 	return false;

data/platform/shared/sync/ClientRegister.h

@@ -14,6 +14,7 @@ class CSyncEngine;
 
 #define WAIT_BEFOREKILL_SECONDS  3
 #define POLL_INTERVAL_SECONDS  60
+#define POLL_INTERVAL_INFINITE (unsigned int)(-1)
 #define DEFAULT_PUSH_PORT 100
 
 class CClientRegister : public common::CRhoThread
@@ -24,6 +25,7 @@ class CClientRegister : public common::CRhoThread
     common::CAutoPtr<common::ISystemInfo>  m_sysInfo;
 	common::CAutoPtr<net::INetRequest>     m_NetRequest;
 	String                                 m_strDevicePin;
+    unsigned int                           m_nPollInterval;
 public:
     static CClientRegister* Create(common::IRhoClassFactory* factory,const char* device_pin);
     //static void Destroy();
@@ -32,12 +34,14 @@ public:
 	virtual void run();	
 
     const String& getDevicePin(){return m_strDevicePin;}
-    boolean doRegister(CSyncEngine& oSync);
-    String getRegisterBody();
+
+    String getRegisterBody(const String& strClientID);
+
 private:
 	CClientRegister(common::IRhoClassFactory* factory,const char* device_pin);
     ~CClientRegister();
 
+    boolean doRegister(CSyncEngine& oSync);
     net::INetRequest& getNet(){ return *m_NetRequest; }
 
 };

data/platform/shared/sync/ISyncProtocol.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "common/RhoStd.h"
+
+namespace rho {
+namespace sync {
+
+struct ISyncProtocol
+{
+    virtual const String& getContentType() = 0;
+    virtual int getVersion() = 0;
+
+    virtual String getLoginUrl() = 0;
+    virtual String getLoginBody( const String& name, const String& password)=0;
+    virtual String getClientCreateUrl() = 0;
+
+    virtual String getClientRegisterUrl() = 0;
+    virtual String getClientRegisterBody(const String& strClientID, const String& strPin, int nPort, const String& strType ) = 0;
+
+    virtual String getClientResetUrl(const String& strClientID) = 0;
+    virtual String getClientChangesUrl() = 0;
+
+    virtual String getServerQueryUrl(const String& strAction) = 0;
+    virtual String getServerQueryBody(const String& strSrcName, const String& strClientID, int nPageSize )=0;
+
+};
+
+}
+}

data/platform/shared/sync/SyncEngine.cpp

@@ -1,29 +1,21 @@
 #include "SyncEngine.h"
 #include "SyncSource.h"
+#include "SyncThread.h"
 
 #include "json/JSONIterator.h"
 #include "common/RhoConf.h"
-#include "common/RhoFilePath.h"
 #include "common/StringConverter.h"
 #include "sync/ClientRegister.h"
 #include "net/URI.h"
 #include "statistic/RhoProfiler.h"
-#include "ruby/ext/rho/rhoruby.h"
+#include "rubyext/RhoRuby.h"
+#include "common/RhoTime.h"
+#include "common/RhoFilePath.h"
+#include "common/RhoFile.h"
+#include "SyncProtocol_3.h"
 #include "net/URI.h"
 
 namespace rho {
-const _CRhoRuby& RhoRuby = _CRhoRuby();
-
-/*static*/ String _CRhoRuby::getMessageText(const char* szName)
-{
-    return rho_ruby_getMessageText(szName);
-}
-
-/*static*/ String _CRhoRuby::getErrorText(int nError)
-{
-    return rho_ruby_getErrorText(nError);
-}
-
 namespace sync {
 IMPLEMENT_LOGCLASS(CSyncEngine,"Sync");
 
@@ -31,27 +23,59 @@ using namespace rho::net;
 using namespace rho::common;
 using namespace rho::json;
 
-CSyncEngine::CSyncEngine(db::CDBAdapter& db): m_dbAdapter(db), m_NetRequest(0), m_syncState(esNone), m_oSyncNotify(*this)
+CSyncEngine::CSyncEngine():m_NetRequest(0), m_syncState(esNone), m_oSyncNotify(*this)
 {
+    m_bNoThreaded = false;
     m_bStopByUser = false;
     m_nSyncPageSize = 2000;
-    m_bNoThreaded = false;
+
+    initProtocol();
 }
 
-String CSyncEngine::SYNC_PAGE_SIZE() { return convertToStringA(m_nSyncPageSize); }
+void CSyncEngine::initProtocol()
+{
+    m_SyncProtocol = new CSyncProtocol_3();
+}
 
-void CSyncEngine::doSyncAllSources()
+void CSyncEngine::prepareSync(ESyncState eState)
 {
-    setState(esSyncAllSources);
+    setState(eState);
     m_bStopByUser = false;
+    m_nErrCode = RhoRuby.ERR_NONE;
+
     loadAllSources();
 
     m_strSession = loadSession();
     if ( isSessionExist()  )
     {
         m_clientID = loadClientID();
-        getNotify().cleanLastSyncObjectCount();
+        if ( m_nErrCode == RhoRuby.ERR_NONE )
+        {
+            getNotify().cleanLastSyncObjectCount();
+   	        doBulkSync();
+
+            return;
+        }
+    }else
+        m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN;
+
+    if ( m_sources.size() > 0 )
+    {
+        CSyncSource& src = *m_sources.elementAt(getStartSource());
+        src.m_nErrCode = m_nErrCode;
+        getNotify().fireSyncNotification(&src, true, src.m_nErrCode, "");
+    }else
+        getNotify().fireSyncNotification(null, true, m_nErrCode, "");
+
+    stopSync();
+}
+
+void CSyncEngine::doSyncAllSources()
+{
+    prepareSync(esSyncAllSources);
 
+    if ( isContinueSync() )
+    {
 	    PROF_CREATE_COUNTER("Net");	    
 	    PROF_CREATE_COUNTER("Parse");
 	    PROF_CREATE_COUNTER("DB");
@@ -71,74 +95,181 @@ void CSyncEngine::doSyncAllSources()
 	    PROF_STOP("Sync");
 
     }
-    else
-    {
-        if ( m_sources.size() > 0 )
-        {
-            CSyncSource& src = *m_sources.elementAt(getStartSource());
-    	    //src.m_strError = "Client is not logged in. No sync will be performed.";
-            src.m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN;
 
-            getNotify().fireSyncNotification(&src, true, src.m_nErrCode, "");
-        }else
-            getNotify().fireSyncNotification(null, true, RhoRuby.ERR_CLIENTISNOTLOGGEDIN, "");
-    }
+    getNotify().cleanCreateObjectErrors();
 
     if ( getState() != esExit )
         setState(esNone);
 }
 
-void CSyncEngine::doSyncSource(const CSourceID& oSrcID, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep)
+void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep)
 {
-    setState(esSyncSource);
-    m_bStopByUser = false;
-    loadAllSources();
+    prepareSync(esSearch);
+    if ( !isContinueSync() )
+    {
+        if ( getState() != esExit )
+            setState(esNone);
+
+        return;
+    }
 
-    CSyncSource* pSrc = findSource(oSrcID);
-    if ( pSrc != null )
+    CTimeInterval startTime = CTimeInterval::getCurrentTime();
+
+    if ( bSearchSyncChanges )
     {
-        CSyncSource& src = *pSrc;
-
-        LOG(INFO) +"Started synchronization of the data source: " + src.getName();
-
-    	src.m_strParams = strParams;
-    	src.m_strAction = strAction;
-    	src.m_bSearchSyncChanges = bSearchSyncChanges;
-        src.m_nProgressStep = nProgressStep;
-      	if ( oSrcID.m_strUrl.length() != 0 )
-       	{
-            net::URI uri(oSrcID.m_strUrl);
-       		src.setUrlParams(uri.getQueryString());
-
-            if (uri.getScheme().length()>0)
-       			src.setUrl(uri.getPathSpecificPart());
-       	}
-
-	    m_strSession = loadSession();
-	    if ( isSessionExist()  ) {
-	    	m_clientID = loadClientID();
-	        if ( getState() != esStop )
+        for ( int i = 0; i < (int)arSources.size(); i++ )
+        {
+            CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
+            if ( pSrc != null )
+                pSrc->syncClientChanges();
+        }
+    }
+
+    int nErrCode = 0;
+    while( isContinueSync() )
+    {
+        int nSearchCount = 0;
+        String strUrl = getProtocol().getServerQueryUrl(strAction);
+        String strQuery = getProtocol().getServerQueryBody("", getClientID(), getSyncPageSize());
+
+        if ( strParams.length() > 0 )
+            strQuery += strParams;
+
+        for ( int i = 0; i < (int)arSources.size(); i++ )
+        {
+            CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
+            if ( pSrc != null )
             {
-                getNotify().cleanLastSyncObjectCount();
-	            src.sync();
+                strQuery += "&sources[][name]=" + pSrc->getName();
+
+                if ( !pSrc->isTokenFromDB() && pSrc->getToken() > 1 )
+                    strQuery += "&sources[][token]=" + convertToStringA(pSrc->getToken());
             }
-	    } else {
-	    	//src.m_strError = "Client is not logged in. No sync will be performed.";
-            src.m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN;
-	    }
+        }
 
-        getNotify().fireSyncNotification(&src, true, src.m_nErrCode, src.m_nErrCode == RhoRuby.ERR_NONE ? RhoRuby.getMessageText("sync_completed") : "");
-    }else
-    {
-        LOG(ERROR) + "Sync one source : Unknown Source " + oSrcID.toString();
+		LOG(INFO) + "Call search on server. Url: " + (strUrl+strQuery);
+        NetResponse(resp,getNet().pullData(strUrl+strQuery, this));
 
-        CSyncSource src(*this);
-    	//src.m_strError = "Unknown sync source.";
-        src.m_nErrCode = RhoRuby.ERR_RUNTIME;
+        if ( !resp.isOK() )
+        {
+            stopSync();
+            nErrCode = RhoRuby.getErrorFromResponse(resp);
+            continue;
+        }
+
+        const char* szData = resp.getCharData();
+
+        CJSONArrayIterator oJsonArr(szData);
+
+        for( ; !oJsonArr.isEnd() && isContinueSync(); oJsonArr.next() )
+        {
+            CJSONArrayIterator oSrcArr(oJsonArr.getCurItem());
+
+            int nVersion = 0;
+            if ( !oSrcArr.isEnd() && oSrcArr.getCurItem().hasName("version") )
+            {
+                nVersion = oSrcArr.getCurItem().getInt("version");
+                oJsonArr.next();
+            }
+
+            if ( nVersion != getProtocol().getVersion() )
+            {
+                LOG(ERROR) + "Sync server send search data with incompatible version. Client version: " + convertToStringA(getProtocol().getVersion()) +
+                    "; Server response version: " + convertToStringA(nVersion);
+                stopSync();
+                nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                continue;
+            }
+
+            if ( !oSrcArr.getCurItem().hasName("source") )
+            {
+                LOG(ERROR) + "Sync server send search data without source name.";
+                stopSync();
+                nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                continue;
+            }
+
+            String strSrcName = oSrcArr.getCurItem().getString("source");
+            CSyncSource* pSrc = findSourceByName(strSrcName);
+            if ( pSrc == null )
+            {
+                LOG(ERROR) + "Sync server send search data for unknown source name:" + strSrcName;
+                stopSync();
+                nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                continue;
+            }
+
+            oSrcArr.reset(0);
+            pSrc->m_bIsSearch = true;
+            pSrc->setProgressStep(nProgressStep);
+            pSrc->processServerResponse_ver3(oSrcArr);
+
+            nSearchCount += pSrc->getCurPageCount();
+        }
+
+        if ( nSearchCount == 0 )
+            break;
+    }  
 
+    if ( isContinueSync() )
+    	getNotify().fireSyncNotification(null, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
+    else if ( nErrCode != 0 )
+    {
+        CSyncSource& src = *m_sources.elementAt(getStartSource());
+        src.m_nErrCode = nErrCode;
+        src.m_bIsSearch = true;
         getNotify().fireSyncNotification(&src, true, src.m_nErrCode, "");
     }
 
+    //update db info
+    CTimeInterval endTime = CTimeInterval::getCurrentTime();
+    unsigned long timeUpdated = CLocalTime().toULong();
+    for ( int i = 0; i < (int)arSources.size(); i++ )
+    {
+        CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
+        if ( pSrc == null )
+            continue;
+        CSyncSource& oSrc = *pSrc;
+        oSrc.getDB().executeSQL("UPDATE sources set last_updated=?,last_inserted_size=?,last_deleted_size=?, \
+						 last_sync_duration=?,last_sync_success=?, backend_refresh_time=? WHERE source_id=?", 
+                         timeUpdated, oSrc.getInsertedCount(), oSrc.getDeletedCount(), 
+                         (endTime-startTime).toULong(), oSrc.getGetAtLeastOnePage(), oSrc.getRefreshTime(),
+                         oSrc.getID() );
+    }
+    //
+
+    getNotify().cleanCreateObjectErrors();
+    if ( getState() != esExit )
+        setState(esNone);
+}
+
+void CSyncEngine::doSyncSource(const CSourceID& oSrcID)
+{
+    prepareSync(esSyncSource);
+
+    if ( isContinueSync() )
+    {
+        CSyncSource* pSrc = findSource(oSrcID);
+        if ( pSrc != null )
+        {
+            CSyncSource& src = *pSrc;
+            LOG(INFO) +"Started synchronization of the data source: " + src.getName();
+
+            src.sync();
+
+            getNotify().fireSyncNotification(&src, true, src.m_nErrCode, src.m_nErrCode == RhoRuby.ERR_NONE ? RhoRuby.getMessageText("sync_completed") : "");
+        }else
+        {
+            LOG(ERROR) + "Sync one source : Unknown Source " + oSrcID.toString();
+
+            CSyncSource src(*this, getUserDB() );
+    	    //src.m_strError = "Unknown sync source.";
+            src.m_nErrCode = RhoRuby.ERR_RUNTIME;
+
+            getNotify().fireSyncNotification(&src, true, src.m_nErrCode, "");
+        }
+    }
+
     getNotify().cleanCreateObjectErrors();
 
     if ( getState() != esExit )
@@ -159,29 +290,28 @@ CSyncSource* CSyncEngine::findSource(const CSourceID& oSrcID)
 
 CSyncSource* CSyncEngine::findSourceByName(const String& strSrcName)
 {
-    CSourceID oSrcID;
-    oSrcID.m_strName = strSrcName;
-    return findSource(oSrcID);
+    return findSource(CSourceID(strSrcName));
 }
 
 void CSyncEngine::loadAllSources()
 {
     m_sources.clear();
+    m_arPartitions.clear();
 
-    DBResult( res, getDB().executeSQL("SELECT source_id,source_url,token,name from sources ORDER BY priority") );
+    DBResult( res, getUserDB().executeSQL("SELECT source_id,sync_type,name, partition from sources ORDER BY priority") );
     for ( ; !res.isEnd(); res.next() )
     { 
-        String strDbUrl = res.getStringByIdx(1);
-        if ( strDbUrl.length() == 0 )
+        String strShouldSync = res.getStringByIdx(1);
+        if ( strShouldSync.compare("none") == 0 )
             continue;
 
-        String strUrl = strDbUrl.find("http") == 0 ? strDbUrl : CFilePath::join(RHOCONF().getPath("syncserver") , strDbUrl);
-        if ( strUrl.at(strUrl.length()-1) == '/' || strUrl.at(strUrl.length()-1) == '\\' )
-            strUrl.erase(strUrl.end()-1);
+        String strName = res.getStringByIdx(2);
+        String strPartition = res.getStringByIdx(3);
 
-        String strName = res.getStringByIdx(3);
-        if ( strUrl.length() > 0 )
-            m_sources.addElement( new CSyncSource( res.getIntByIdx(0), strUrl, strName, res.getUInt64ByIdx(2), *this) );
+        if ( m_arPartitions.indexOf(strPartition) < 0 )
+            m_arPartitions.addElement(strPartition);
+
+        m_sources.addElement( new CSyncSource( res.getIntByIdx(0), strName, strShouldSync, getDB(strPartition), *this) );
     }
 }
 
@@ -191,9 +321,8 @@ String CSyncEngine::loadClientID()
     synchronized(m_mxLoadClientID)
     {
         boolean bResetClient = false;
-
         {
-            DBResult( res, getDB().executeSQL("SELECT client_id,reset from client_info limit 1") );
+            DBResult( res, getUserDB().executeSQL("SELECT client_id,reset from client_info limit 1") );
             if ( !res.isEnd() )
             {
                 clientID = res.getStringByIdx(0);
@@ -205,73 +334,248 @@ String CSyncEngine::loadClientID()
         {
             clientID = requestClientIDByNet();
 
-            getDB().executeSQL("DELETE FROM client_info");
-            getDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
+            DBResult( res , getUserDB().executeSQL("SELECT * FROM client_info") );
+            if ( !res.isEnd() )
+                getUserDB().executeSQL("UPDATE client_info SET client_id=?", clientID);
+            else
+                getUserDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
+
         }else if ( bResetClient )
         {
     	    if ( !resetClientIDByNet(clientID) )
-            {
-                if ( m_sources.size() > 0 )
-                {
-                    CSyncSource& src = *m_sources.elementAt(getStartSource());
-                    src.m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-
-                    getNotify().fireSyncNotification(&src, true, src.m_nErrCode, "");
-                }else
-                    getNotify().fireSyncNotification(null, true, RhoRuby.ERR_REMOTESERVER, "");
-
     		    stopSync();
-            }
     	    else
-    		    getDB().executeSQL("UPDATE client_info SET reset=? where client_id=?", 0, clientID );	    	
+    		    getUserDB().executeSQL("UPDATE client_info SET reset=? where client_id=?", 0, clientID );	    	
         }
     }
+
     return clientID;
 }
 
-boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Exception
+void CSyncEngine::processServerSources(String strSources)
 {
-    String serverUrl = RHOCONF().getPath("syncserver");
-    String strUrl = serverUrl + "clientreset";
-    String strQuery = "?client_id=" + strClientID;
-    if ( CClientRegister::getInstance() != null )
-        strQuery += "&" + CClientRegister::getInstance()->getRegisterBody();
-    
-    NetResponse( resp, getNet().pullData(strUrl+strQuery, this) );
-    return resp.isOK();
-/*    if ( resp.isOK() )
+    if ( strSources.length() > 0 )
     {
-        if ( CClientRegister::getInstance() != null )
-            return CClientRegister::getInstance()->doRegister(*this);
+        NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null ));
+        loadAllSources();
 
-        return true;
+        rho_db_init_attr_manager();
     }
+}
 
-    return false;*/
+boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Exception
+{
+    //TODO: send client register info in client reset 
+    //String strBody = "";
+    //if ( CClientRegister::getInstance() != null )
+    //    strBody += CClientRegister::getInstance()->getRegisterBody();
+
+    NetResponse( resp, getNet().pullData(getProtocol().getClientResetUrl(strClientID), this) );
+
+/*    processServerSources("{\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"priority\":\"0\","
+        "\"schema_version\":\"7.0\",\"schema\":{"
+        "\"columns\":[\'brand\',\'created_at\',\'name\',\'price\',\'quantity\',\'sku\',\'updated_at\']"*/
+/*        "\"sql\":\"CREATE TABLE Product ( "
+        "brand varchar default NULL,"
+        "created_at varchar default NULL,"
+        "name varchar default NULL,"
+        "price varchar default NULL,"
+        "quantity int default NULL,"
+        "sku varchar default NULL,"
+        "updated_at varchar default NULL,"
+        "test varchar default NULL,"
+        "object varchar(255) PRIMARY KEY )\"*/
+        //"}}]}"); 
+
+    if ( !resp.isOK() )
+        m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+    else
+    {
+        processServerSources(resp.getCharData());
+    }
+
+    return resp.isOK();
 }
 
 String CSyncEngine::requestClientIDByNet()
 {
-    String serverUrl = RHOCONF().getPath("syncserver");
-    String strUrl = serverUrl + "clientcreate";
-    String strQuery = SYNC_SOURCE_FORMAT();
-    if ( CClientRegister::getInstance() != null )
-        strQuery += "&" + CClientRegister::getInstance()->getRegisterBody();
+    //TODO: send client register info in client create 
+    //String strBody = "";
+    //if ( CClientRegister::getInstance() != null )
+    //    strBody += CClientRegister::getInstance()->getRegisterBody();
 
-    NetResponse(resp,getNet().pullData(strUrl+strQuery, this));
+    NetResponse(resp,getNet().pullData(getProtocol().getClientCreateUrl(), this));
     if ( resp.isOK() && resp.getCharData() != null )
     {
         const char* szData = resp.getCharData();
+        /*
+        "{\"client\":{\"client_id\":\"vasy\"},\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"priority\":\"0\","
+        "\"schema\":{\"version\":\"1.0\","
+        "\"sql\":\"CREATE TABLE Product ( "
+        "brand varchar default NULL,"
+        "created_at varchar default NULL,"
+        "name varchar default NULL,"
+        "price varchar default NULL,"
+        "quantity int default NULL,"
+        "sku varchar default NULL,"
+        "updated_at varchar default NULL,"
+        "object varchar(255) PRIMARY KEY )\"}}]}";*/
+
         CJSONEntry oJsonEntry(szData);
 
+        if (oJsonEntry.hasName("server_sources") )
+            processServerSources(szData);
+
         CJSONEntry oJsonObject = oJsonEntry.getEntry("client");
         if ( !oJsonObject.isEmpty() )
             return oJsonObject.getString("client_id");
+    }else
+    {
+        m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+        if ( m_nErrCode == RhoRuby.ERR_NONE )
+            m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
     }
 
     return "";
 }
 
+void CSyncEngine::doBulkSync()//throws Exception
+{
+    if ( !RHOCONF().isExist("bulksync_state") )
+        return;
+
+    int nBulkSyncState = RHOCONF().getInt("bulksync_state");
+    if ( nBulkSyncState >= 1 || !isContinueSync() )
+        return;
+
+	LOG(INFO) + "Bulk sync: start";
+    getNotify().fireBulkSyncNotification(false, "start", "", RhoRuby.ERR_NONE);        
+
+    for (int i = 0; i < (int)m_arPartitions.size() && isContinueSync(); i++)
+        loadBulkPartition(m_arPartitions.elementAt(i));
+
+    if (isContinueSync())
+    {
+        RHOCONF().setInt("bulksync_state", 1, true);
+        getNotify().fireBulkSyncNotification(true, "", "", RhoRuby.ERR_NONE);
+    }
+}
+
+extern "C" int rho_unzip_file(const char* szZipPath);
+
+static String getHostFromUrl( const String& strUrl );
+void CSyncEngine::loadBulkPartition(const String& strPartition )
+{
+    db::CDBAdapter& dbPartition = getDB(strPartition); 
+    String serverUrl = RHOCONF().getPath("syncserver");
+    String strUrl = serverUrl + "bulk_data";
+    String strQuery = "?client_id=" + m_clientID + "&partition=" + strPartition;
+    String strDataUrl = "", strCmd = "";
+
+  	getNotify().fireBulkSyncNotification(false, "start", strPartition, RhoRuby.ERR_NONE);
+
+    while(strCmd.length() == 0&&isContinueSync())
+    {	    
+        NetResponse( resp, getNet().pullData(strUrl+strQuery, this) );
+        const char* szData = resp.getCharData();
+        if ( !resp.isOK() || szData == null || *szData == 0)
+        {
+    	    LOG(ERROR) + "Bulk sync failed: server return an error.";
+    	    stopSync();
+    	    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_REMOTESERVER);
+    	    return;
+        }
+
+	    LOG(INFO) + "Bulk sync: got response from server: " + szData;
+    	
+        CJSONEntry oJsonEntry(szData);
+        strCmd = oJsonEntry.getString("result");
+        if ( oJsonEntry.hasName("url") )
+   	        strDataUrl = oJsonEntry.getString("url");
+        
+        if ( strCmd.compare("wait") == 0)
+        {
+            int nTimeout = RHOCONF().getInt("bulksync_timeout_sec");
+            if ( nTimeout == 0 )
+                nTimeout = 5;
+
+            CSyncThread::getInstance()->wait(nTimeout);
+            strCmd = "";
+        }
+    }
+
+    if ( strCmd.compare("nop") == 0)
+    {
+	    LOG(INFO) + "Bulk sync return no data.";
+      	getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_NONE);
+
+	    return;
+    }
+
+    if ( !isContinueSync() )
+        return;
+
+   	getNotify().fireBulkSyncNotification(false, "download", strPartition, RhoRuby.ERR_NONE);
+
+    String fDataName = makeBulkDataFileName(/*"data/bbook/bbook_1264475432.data"*/strDataUrl, dbPartition.getDBPath(), "");//, "_bulk");
+    String strZip = ".rzip";
+    String strSqlDataUrl = /*"http://204.236.220.203/data/bbook/bbook_1264475432.data" + strZip;*/getHostFromUrl(serverUrl) + strDataUrl+strZip;
+    LOG(INFO) + "Bulk sync: download data from server: " + strSqlDataUrl;
+    {
+        NetResponse( resp1, getNet().pullFile(strSqlDataUrl, fDataName+strZip, this, null) );
+        if ( !resp1.isOK() )
+        {
+	        LOG(ERROR) + "Bulk sync failed: cannot download database file.";
+	        stopSync();
+	        getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_REMOTESERVER);
+	        return;
+        }
+    }
+
+    if ( !isContinueSync() )
+        return;
+
+    LOG(INFO) + "Bulk sync: unzip db";
+
+    if ( !rho_unzip_file((fDataName+strZip).c_str()) )
+    {
+        CRhoFile::deleteFile((fDataName+strZip).c_str());
+        LOG(ERROR) + "Bulk sync failed: cannot unzip database file.";
+        stopSync();
+        getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE);
+        return;
+    }
+    CRhoFile::deleteFile((fDataName+strZip).c_str());
+
+	LOG(INFO) + "Bulk sync: start change db";
+   	getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoRuby.ERR_NONE);
+    
+    dbPartition.setBulkSyncDB(fDataName);
+
+	LOG(INFO) + "Bulk sync: end change db";
+   	getNotify().fireBulkSyncNotification(false, "", strPartition, RhoRuby.ERR_NONE);
+}
+
+String CSyncEngine::makeBulkDataFileName(String strDataUrl, String strDbPath, String strExt)
+{
+    CFilePath oUrlPath(strDataUrl);
+    String strNewName = oUrlPath.getBaseName();
+    String strOldName = RHOCONF().getString("bulksync_filename");
+    if ( strOldName.length() > 0 && strNewName.compare(strOldName) != 0 )
+    {
+        CFilePath oFilePath(strDbPath);
+        String strFToDelete = oFilePath.changeBaseName(strOldName+strExt);
+        LOG(INFO) + "Bulk sync: remove old bulk file '" + strFToDelete + "'";
+
+        CRhoFile::deleteFile( strFToDelete.c_str() );
+    }
+
+    RHOCONF().setString("bulksync_filename", strNewName, true);
+
+    CFilePath oFilePath(strDbPath);
+    return oFilePath.changeBaseName(strNewName+strExt);
+}
+
 int CSyncEngine::getStartSource()
 {
     for( int i = 0; i < (int)m_sources.size(); i++ )
@@ -286,10 +590,14 @@ int CSyncEngine::getStartSource()
 
 void CSyncEngine::syncAllSources()
 {
+    //TODO: do not stop on error source
     boolean bError = false;
     for( int i = getStartSource(); i < (int)m_sources.size() && isContinueSync(); i++ )
     {
         CSyncSource& src = *m_sources.elementAt(i);
+        if ( src.getSyncType().compare("bulk_sync_only")==0 )
+            continue;
+
         if ( isSessionExist() && getState() != esStop )
             src.sync();
 
@@ -301,61 +609,19 @@ void CSyncEngine::syncAllSources()
     	getNotify().fireSyncNotification(null, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
 }
 
-static String getServerFromUrl( const String& strUrl );
-boolean CSyncEngine::checkAllSourcesFromOneDomain()//throws Exception
-{
-	loadAllSources();
-	
-    if ( m_sources.size() == 0 )
-        return true;
-
-    //All sources should be from one domain
-    CSyncSource& src0 = *m_sources.elementAt(0);
-    String srv0 = getServerFromUrl(src0.getUrl());
-    for( int i = 1; i < (int)m_sources.size(); i++ )
-    {
-        CSyncSource& src = *m_sources.elementAt(i);
-        String srv = getServerFromUrl(src.getUrl());
-        if ( srv.compare( srv0 ) != 0 )
-            return false;
-    }
-	
-    return true;
-}
-
 void CSyncEngine::login(String name, String password, String callback)
 {
     PROF_START("Login");
 	//try {
-	if ( !checkAllSourcesFromOneDomain() )
-	{
-        getNotify().callLoginCallback(callback, RhoRuby.ERR_DIFFDOMAINSINSYNCSRC, "");
-    	return;
-	}
 
-    String serverUrl = RHOCONF().getPath("syncserver");
-    String strBody = "login=" + name + "&password=" + password + "&remember_me=1";
-
-    NetResponse( resp, getNet().pullCookies( serverUrl+"client_login", strBody, this ) );
-    
-    if ( !resp.isResponseRecieved())
+    NetResponse( resp, getNet().pullCookies( getProtocol().getLoginUrl(), getProtocol().getLoginBody(name, password), this ) );
+    int nErrCode = RhoRuby.getErrorFromResponse(resp);
+    if ( nErrCode != RhoRuby.ERR_NONE )
     {
-        getNotify().callLoginCallback(callback, RhoRuby.ERR_NETWORK, resp.getCharData());
+        getNotify().callLoginCallback(callback, nErrCode, resp.getCharData());
         return;
     }
 
-    if ( resp.isUnathorized() )
-    {
-        getNotify().callLoginCallback(callback, RhoRuby.ERR_UNATHORIZED, resp.getCharData());
-    	return;
-    }
-
-    if ( !resp.isOK() )
-    {
-        getNotify().callLoginCallback(callback, RhoRuby.ERR_REMOTESERVER, resp.getCharData());
-    	return;
-    }
-
     String strSession = resp.getCharData();
     if ( strSession.length() == 0 )
     {
@@ -364,12 +630,16 @@ void CSyncEngine::login(String name, String password, String callback)
         return;
     }
 
-    //TODO: move session to client_info table
-    getDB().executeSQL( "UPDATE sources SET session=?", strSession );
+    DBResult( res , getUserDB().executeSQL("SELECT * FROM client_info") );
+    if ( !res.isEnd() )
+        getUserDB().executeSQL( "UPDATE client_info SET session=?", strSession );
+    else
+        getUserDB().executeSQL("INSERT INTO client_info (session) values (?)", strSession);
+
 
     if ( CClientRegister::getInstance() != null )
         CClientRegister::getInstance()->stopWait();
-    
+
     getNotify().callLoginCallback(callback, RhoRuby.ERR_NONE, "" );
 	
     PROF_STOP("Login");
@@ -382,18 +652,18 @@ void CSyncEngine::login(String name, String password, String callback)
 
 boolean CSyncEngine::isLoggedIn()
  {
-    int nCount = 0;
-    DBResult( res , getDB().executeSQL("SELECT count(session) FROM sources") );
-     if ( !res.isEnd() )
-        nCount = res.getIntByIdx(0);
-
-    return nCount > 0;
+    String strRes = "";
+    DBResult( res , getUserDB().executeSQL("SELECT session FROM client_info") );
+    if ( !res.isEnd() )
+    	strRes = res.getStringByIdx(0);
+    
+    return strRes.length() > 0;
 }
 
 String CSyncEngine::loadSession()
 {
     m_strSession = "";
-    DBResult( res , getDB().executeSQL("SELECT session FROM sources WHERE session IS NOT NULL") );
+    DBResult( res , getUserDB().executeSQL("SELECT session FROM client_info") );
     
     if ( !res.isEnd() )
     	m_strSession = res.getStringByIdx(0);
@@ -403,7 +673,7 @@ String CSyncEngine::loadSession()
 
 void CSyncEngine::logout()
 {
-    getDB().executeSQL( "UPDATE sources SET session=NULL" );
+    getUserDB().executeSQL( "UPDATE client_info SET session=NULL" );
     m_strSession = "";
 
     loadAllSources();
@@ -414,12 +684,12 @@ void CSyncEngine::setSyncServer(char* syncserver)
 	rho_conf_setString("syncserver", syncserver);
 	rho_conf_save();
 
-    getDB().executeSQL("DELETE FROM client_info");
+    getUserDB().executeSQL("DELETE FROM client_info");
 
 	logout();
 }
 
-static String getServerFromUrl( const String& strUrl )
+static String getHostFromUrl( const String& strUrl )
 {
     const char* url = strUrl.c_str();
     const char* pStartSrv, *pEndSrv;
@@ -437,16 +707,14 @@ static String getServerFromUrl( const String& strUrl )
     if ( !pEndSrv )
         pEndSrv = strchr( pStartSrv, '\\');
 
-    nSrvLen = pEndSrv ? (pEndSrv - pStartSrv) : strlen(pStartSrv);
-    return String(pStartSrv, nSrvLen);
+    nSrvLen = pEndSrv ? (pEndSrv+1 - url) : strlen(url);
+    return String(url, nSrvLen);
 }
 
 String CSyncEngine::CSourceID::toString()const
 {
     if ( m_strName.length() > 0 )
         return "name : " + m_strName;
-    else if ( m_strUrl.length() > 0 )
-        return "url : " + m_strUrl;
 
     return "# : " + convertToStringA(m_nID);
 }
@@ -455,14 +723,6 @@ boolean CSyncEngine::CSourceID::isEqual(CSyncSource& src)const
 {
     if ( m_strName.length() > 0 )
         return src.getName().compare(m_strName)==0;
-    else if ( m_strUrl.length() > 0 )
-    {
-        net::URI uri1(m_strUrl);
-        net::URI uri2(src.getUrl());
-    	
-    	return uri1.getPath().compare(uri2.getPath()) == 0;
-        //return src.getUrl().compare(m_strUrl)==0;
-    }
 
     return m_nID == src.getID();
 }