rhodes 2.0.3 → 2.1.0

data/platform/shared/sync/SyncEngine.cpp

@@ -8,10 +8,10 @@
 #include "sync/ClientRegister.h"
 #include "net/URI.h"
 #include "statistic/RhoProfiler.h"
-#include "rubyext/RhoRuby.h"
 #include "common/RhoTime.h"
 #include "common/RhoFilePath.h"
 #include "common/RhoFile.h"
+#include "common/RhoAppAdapter.h"
 #include "SyncProtocol_3.h"
 #include "net/URI.h"
 
@@ -40,8 +40,9 @@ void CSyncEngine::initProtocol()
 void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
 {
     setState(eState);
+    m_bIsSearch =  eState == esSearch;
     m_bStopByUser = false;
-    m_nErrCode = RhoRuby.ERR_NONE;
+    m_nErrCode = RhoAppAdapter.ERR_NONE;
     m_strError = "";
 
     loadAllSources();
@@ -50,7 +51,7 @@ void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
     if ( isSessionExist()  )
     {
         m_clientID = loadClientID();
-        if ( m_nErrCode == RhoRuby.ERR_NONE )
+        if ( m_nErrCode == RhoAppAdapter.ERR_NONE )
         {
             getNotify().cleanLastSyncObjectCount();
    	        doBulkSync();
@@ -58,7 +59,7 @@ void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
             return;
         }
     }else
-        m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN;
+        m_nErrCode = RhoAppAdapter.ERR_CLIENTISNOTLOGGEDIN;
 
     CSyncSource* src = null;
     if ( oSrcID != null )
@@ -71,7 +72,7 @@ void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
         getNotify().fireSyncNotification(src, true, src->m_nErrCode, "");
     }else
     {
-        getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, m_sources, getStartSource());
+        getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError );
     }
 
     stopSync();
@@ -139,17 +140,17 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         String strQuery = getProtocol().getServerQueryBody("", getClientID(), getSyncPageSize());
 
         if ( strParams.length() > 0 )
-            strQuery += strParams;
+            strQuery += strParams.at(0) == '&' ? strParams : "&" + strParams;
 
         for ( int i = 0; i < (int)arSources.size(); i++ )
         {
             CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
             if ( pSrc != null )
             {
-                strQuery += "&source[][name]=" + pSrc->getName();
+                strQuery += "&sources[][name]=" + pSrc->getName();
 
                 if ( !pSrc->isTokenFromDB() && pSrc->getToken() > 1 )
-                    strQuery += "&source[][token]=" + convertToStringA(pSrc->getToken());
+                    strQuery += "&sources[][token]=" + convertToStringA(pSrc->getToken());
             }
         }
 
@@ -159,7 +160,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         if ( !resp.isOK() )
         {
             stopSync();
-            m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+            m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
             m_strError = resp.getCharData();
             continue;
         }
@@ -171,12 +172,14 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         for( ; !oJsonArr.isEnd() && isContinueSync(); oJsonArr.next() )
         {
             CJSONArrayIterator oSrcArr(oJsonArr.getCurItem());
+            if (oSrcArr.isEnd())
+                break;
 
             int nVersion = 0;
             if ( !oSrcArr.isEnd() && oSrcArr.getCurItem().hasName("version") )
             {
                 nVersion = oSrcArr.getCurItem().getInt("version");
-                oJsonArr.next();
+                oSrcArr.next();
             }
 
             if ( nVersion != getProtocol().getVersion() )
@@ -184,16 +187,21 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
                 LOG(ERROR) + "Sync server send search data with incompatible version. Client version: " + convertToStringA(getProtocol().getVersion()) +
                     "; Server response version: " + convertToStringA(nVersion);
                 stopSync();
-                m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                m_nErrCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
                 m_strError = resp.getCharData();
                 continue;
             }
 
+            if ( !oSrcArr.isEnd() && oSrcArr.getCurItem().hasName("token"))
+            {
+                oSrcArr.next();
+            }
+
             if ( !oSrcArr.getCurItem().hasName("source") )
             {
                 LOG(ERROR) + "Sync server send search data without source name.";
                 stopSync();
-                m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                m_nErrCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
                 m_strError = resp.getCharData();
                 continue;
             }
@@ -204,7 +212,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             {
                 LOG(ERROR) + "Sync server send search data for unknown source name:" + strSrcName;
                 stopSync();
-                m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                m_nErrCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
                 m_strError = resp.getCharData();
                 continue;
             }
@@ -220,7 +228,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             break;
     }  
 
-    getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, m_sources, getStartSource());
+    getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError);
 
     //update db info
     CTimeInterval endTime = CTimeInterval::getCurrentTime();
@@ -258,14 +266,14 @@ void CSyncEngine::doSyncSource(const CSourceID& oSrcID)
 
             src.sync();
 
-            getNotify().fireSyncNotification(&src, true, src.m_nErrCode, src.m_nErrCode == RhoRuby.ERR_NONE ? RhoRuby.getMessageText("sync_completed") : "");
+            getNotify().fireSyncNotification(&src, true, src.m_nErrCode, src.m_nErrCode == RhoAppAdapter.ERR_NONE ? RhoAppAdapter.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;
+            src.m_nErrCode = RhoAppAdapter.ERR_RUNTIME;
 
             getNotify().fireSyncNotification(&src, true, src.m_nErrCode, "");
         }
@@ -296,8 +304,8 @@ CSyncSource* CSyncEngine::findSourceByName(const String& strSrcName)
 
 void CSyncEngine::loadAllSources()
 {
-    m_sources.clear();
-    m_arPartitions.clear();
+    m_sources.removeAllElements();
+    m_arPartitions.removeAllElements();
 
     DBResult( res, getUserDB().executeSQL("SELECT source_id,sync_type,name, partition from sources ORDER BY sync_priority") );
     for ( ; !res.isEnd(); res.next() )
@@ -314,6 +322,49 @@ void CSyncEngine::loadAllSources()
 
         m_sources.addElement( new CSyncSource( res.getIntByIdx(0), strName, strShouldSync, getDB(strPartition), *this) );
     }
+
+    checkSourceAssociations();
+}
+
+static int findSrcIndex( VectorPtr<CSyncSource*>& sources, const String& strSrcName)
+{
+    for ( int i = 0; i < (int)sources.size(); i++)
+    {
+        if (strSrcName.compare(sources.elementAt(i)->getName()) == 0 )
+            return i;
+    }
+
+    return -1;
+}
+
+void CSyncEngine::checkSourceAssociations()
+{
+    Hashtable<String, int> hashPassed;
+    
+    for( int nCurSrc = m_sources.size()-1; nCurSrc > 0 ; )
+    {
+        CSyncSource& oCurSrc = *(m_sources.elementAt(nCurSrc));
+        if ( oCurSrc.getAssociations().size() == 0 || hashPassed.containsKey(oCurSrc.getName()) )
+            nCurSrc--;
+        else
+        {
+            int nSrc = nCurSrc;
+            for( int i = 0; i < (int)oCurSrc.getAssociations().size(); i++ )
+            {
+                const CSyncSource::CAssociation& oAssoc = oCurSrc.getAssociations().elementAt(i);
+                int nAssocSrcIndex = findSrcIndex( m_sources, oAssoc.m_strSrcName);
+                if ( nAssocSrcIndex >=0 && nAssocSrcIndex < nSrc )
+                {
+                    m_sources.removeElementAt( nSrc, false );
+                    m_sources.insertElementAt( &oCurSrc, nAssocSrcIndex );
+
+                    nSrc = nAssocSrcIndex;
+                }
+            }
+        }
+
+        hashPassed.put(oCurSrc.getName(), 1);
+    }
 }
 
 String CSyncEngine::readClientID()
@@ -374,7 +425,7 @@ void CSyncEngine::processServerSources(String strSources)
     if ( strSources.length() > 0 )
     {
         if (isNoThreadedMode())
-            rho_ruby_loadserversources(strSources.c_str());            
+            RhoAppAdapter.loadServerSources(strSources);
         else
         {
             NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null ));
@@ -413,7 +464,7 @@ boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Excep
 
     if ( !resp.isOK() )
     {
-        m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+        m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
         m_strError = resp.getCharData();
     }
     /*else
@@ -458,10 +509,11 @@ String CSyncEngine::requestClientIDByNet()
             return oJsonObject.getString("client_id");
     }else
     {
-        m_nErrCode = RhoRuby.getErrorFromResponse(resp);
-        if ( m_nErrCode == RhoRuby.ERR_NONE )
-            m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+        m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
         m_strError = resp.getCharData();
+
+        if ( m_nErrCode == RhoAppAdapter.ERR_NONE )
+            m_nErrCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
     }
 
     return "";
@@ -479,7 +531,7 @@ void CSyncEngine::doBulkSync()//throws Exception
         return;
 
 	LOG(INFO) + "Bulk sync: start";
-    getNotify().fireBulkSyncNotification(false, "start", "", RhoRuby.ERR_NONE);        
+    getNotify().fireBulkSyncNotification(false, "start", "", RhoAppAdapter.ERR_NONE);        
 
     for (int i = 0; i < (int)m_arPartitions.size() && isContinueSync(); i++)
         loadBulkPartition(m_arPartitions.elementAt(i));
@@ -487,7 +539,7 @@ void CSyncEngine::doBulkSync()//throws Exception
     if (isContinueSync())
     {
         RHOCONF().setInt("bulksync_state", 1, true);
-        getNotify().fireBulkSyncNotification(true, "", "", RhoRuby.ERR_NONE);
+        getNotify().fireBulkSyncNotification(true, "", "", RhoAppAdapter.ERR_NONE);
     }
 }
 
@@ -502,7 +554,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
     String strQuery = "?client_id=" + m_clientID + "&partition=" + strPartition;
     String strDataUrl = "", strCmd = "";
 
-  	getNotify().fireBulkSyncNotification(false, "start", strPartition, RhoRuby.ERR_NONE);
+  	getNotify().fireBulkSyncNotification(false, "start", strPartition, RhoAppAdapter.ERR_NONE);
 
     while(strCmd.length() == 0&&isContinueSync())
     {	    
@@ -512,7 +564,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
         {
     	    LOG(ERROR) + "Bulk sync failed: server return an error.";
     	    stopSync();
-    	    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_REMOTESERVER);
+    	    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_REMOTESERVER);
     	    return;
         }
 
@@ -537,7 +589,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
     if ( strCmd.compare("nop") == 0)
     {
 	    LOG(INFO) + "Bulk sync return no data.";
-      	getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_NONE);
+      	getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_NONE);
 
 	    return;
     }
@@ -545,7 +597,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
     if ( !isContinueSync() )
         return;
 
-   	getNotify().fireBulkSyncNotification(false, "download", strPartition, RhoRuby.ERR_NONE);
+   	getNotify().fireBulkSyncNotification(false, "download", strPartition, RhoAppAdapter.ERR_NONE);
 
     String fDataName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "");
     String strZip = ".rzip";
@@ -557,7 +609,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
         {
 	        LOG(ERROR) + "Bulk sync failed: cannot download database file.";
 	        stopSync();
-	        getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_REMOTESERVER);
+	        getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_REMOTESERVER);
 	        return;
         }
     }
@@ -572,19 +624,19 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
         CRhoFile::deleteFile((fDataName+strZip).c_str());
         LOG(ERROR) + "Bulk sync failed: cannot unzip database file.";
         stopSync();
-        getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE);
+        getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.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);
+   	getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoAppAdapter.ERR_NONE);
     
     dbPartition.setBulkSyncDB(fDataName);
     processServerSources(String("{\"partition\":\"") + strPartition + "\"}");
 
 	LOG(INFO) + "Bulk sync: end change db";
-   	getNotify().fireBulkSyncNotification(false, "", strPartition, RhoRuby.ERR_NONE);
+   	getNotify().fireBulkSyncNotification(false, "", strPartition, RhoAppAdapter.ERR_NONE);
 }
 
 String CSyncEngine::makeBulkDataFileName(String strDataUrl, String strDbPath, String strExt)
@@ -616,31 +668,42 @@ int CSyncEngine::getStartSource()
             return i;
     }
 
-    return 0;
+    return -1;
+}
+
+boolean CSyncEngine::syncOneSource(int i)
+{
+    CSyncSource& src = *m_sources.elementAt(i);
+    if ( src.getSyncType().compare("bulk_sync_only")==0 )
+        return true;
+
+    if ( isSessionExist() && getState() != esStop )
+        src.sync();
+
+    getNotify().onSyncSourceEnd(i, m_sources);
+
+    return src.m_nErrCode == RhoAppAdapter.ERR_NONE;
 }
 
 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();
+    int nStartSrc = getStartSource();
+    if ( nStartSrc >= 0 )
+        bError = !syncOneSource(nStartSrc);
 
-        getNotify().onSyncSourceEnd(i, m_sources);
-        bError = src.m_nErrCode != RhoRuby.ERR_NONE;
+    //TODO: do not stop on error source
+    for( int i = 0; i < (int)m_sources.size() && isContinueSync(); i++ )
+    {
+        bError = !syncOneSource(i);
     }
 
     if ( !bError)
-    	getNotify().fireSyncNotification(null, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
+    	getNotify().fireSyncNotification(null, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
 }
 
-void CSyncEngine::login(String name, String password, String callback)
+void CSyncEngine::login(String name, String password, const CSyncNotification& oNotify)
 {
 //    processServerSources("{\"sources\":{ \"Product\":{}, \"Customer\":{}}}");
 /*
@@ -657,10 +720,10 @@ void CSyncEngine::login(String name, String password, String callback)
 	//try {
 
     NetResponse( resp, getNet().pullCookies( getProtocol().getLoginUrl(), getProtocol().getLoginBody(name, password), this ) );
-    int nErrCode = RhoRuby.getErrorFromResponse(resp);
-    if ( nErrCode != RhoRuby.ERR_NONE )
+    int nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
+    if ( nErrCode != RhoAppAdapter.ERR_NONE )
     {
-        getNotify().callLoginCallback(callback, nErrCode, resp.getCharData());
+        getNotify().callLoginCallback(oNotify, nErrCode, resp.getCharData());
         return;
     }
 
@@ -668,17 +731,19 @@ void CSyncEngine::login(String name, String password, String callback)
     if ( strSession.length() == 0 )
     {
     	LOG(ERROR) + "Return empty session.";
-    	getNotify().callLoginCallback(callback, RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE, "" );
+    	getNotify().callLoginCallback(oNotify, RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE, "" );
         return;
     }
-
-    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);
-
-    getNotify().callLoginCallback(callback, RhoRuby.ERR_NONE, "" );
+	
+	{
+		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);
+	}
+	
+    getNotify().callLoginCallback(oNotify, RhoAppAdapter.ERR_NONE, "" );
 	
     PROF_STOP("Login");
 
@@ -688,7 +753,7 @@ void CSyncEngine::login(String name, String password, String callback)
 	//}catch(Exception exc)
 	//{
 	//	LOG.ERROR("Login failed.", exc);
-    //	callLoginCallback(callback, RhoRuby.ERR_RUNTIME, exc.getMessage() );
+    //	callLoginCallback(callback, RhoAppAdapter.ERR_RUNTIME, exc.getMessage() );
 	//}
 }
 
@@ -721,14 +786,20 @@ void CSyncEngine::logout()
     //loadAllSources();
 }
 	
-void CSyncEngine::setSyncServer(char* syncserver)
+void CSyncEngine::setSyncServer(const char* syncserver)
 {
-	rho_conf_setString("syncserver", syncserver);
-	rho_conf_save();
-
-    getUserDB().executeSQL("DELETE FROM client_info");
+	String strOldSrv = RHOCONF().getString("syncserver");
+	String strNewSrv = syncserver ? syncserver : "";
+	
+	if ( strOldSrv.compare(strNewSrv) != 0)
+	{
+		rho_conf_setString("syncserver", syncserver);
+		rho_conf_save();
+		
+		getUserDB().executeSQL("DELETE FROM client_info");
 
-	logout();
+		logout();
+	}
 }
 
 static String getHostFromUrl( const String& strUrl )

data/platform/shared/sync/SyncEngine.h

@@ -47,6 +47,7 @@ private:
 	boolean m_bNoThreaded;
     int m_nErrCode;
     String m_strError;
+    boolean m_bIsSearch;
 
 public:
     CSyncEngine();
@@ -60,14 +61,15 @@ public:
     void doSyncSource(const CSourceID& oSrcID);
     void doSearch(rho::Vector<rho::String>& arSources, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep);
 
-    void login(String name, String password, String callback);
+    void login(String name, String password, const CSyncNotification& oNotify);
     boolean isLoggedIn();
     String loadSession();
     void logout();
-	void setSyncServer(char* syncserver);
+	void setSyncServer(const char* syncserver);
 
     void setState(ESyncState eState){ m_syncState = eState; }
     ESyncState getState()const{ return m_syncState; }
+    boolean isSearch()const{ return m_bIsSearch; }
     boolean isContinueSync()const{ return m_syncState != esExit && m_syncState != esStop; }
 	boolean isSyncing()const{ return m_syncState == esSyncAllSources || m_syncState == esSyncSource; }
     void stopSync(){ if (isContinueSync()){ setState(esStop); if(m_NetRequest) m_NetRequest->cancel();} }
@@ -83,7 +85,6 @@ public:
     virtual const String& getContentType(){ return getProtocol().getContentType();}
 
     void loadAllSources();
-    void syncAllSources();
     void prepareSync(ESyncState eState, const CSourceID* oSrcID);
 
     VectorPtr<CSyncSource*>& getSources(){ return m_sources; }
@@ -104,7 +105,7 @@ public:
     void setSyncPageSize(int nPageSize){ m_nSyncPageSize = nPageSize; }
 
     boolean isNoThreadedMode(){ return m_bNoThreaded; }
-    void setNonThreadedMode(bool b){m_bNoThreaded = b;}
+    void setNonThreadedMode(boolean b){m_bNoThreaded = b;}
 private:
  
     CSyncSource* findSource(const CSourceID& oSrcID);
@@ -116,6 +117,10 @@ private:
 
     void initProtocol();
     void processServerSources(String strSources);
+    void checkSourceAssociations();
+
+    boolean syncOneSource(int i);
+    void syncAllSources();
 
     friend class CSyncSource;
 };