rhodes 2.2.6 → 2.3.0.beta.1

data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java

@@ -27,6 +27,7 @@ import com.rho.RhoProfiler;
 import com.rho.RhoAppAdapter;
 import com.rho.TimeInterval;
 import com.rho.db.*;
+import com.rho.file.IFileAccess;
 import com.rho.net.*;
 import com.rho.*;
 import java.io.IOException;
@@ -39,6 +40,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		new RhoLogger("Sync");
 	private static final RhoProfiler PROF = RhoProfiler.RHO_STRIP_PROFILER ? new RhoEmptyProfiler() : 
 		new RhoProfiler();
+	RhoConf RHOCONF(){ return RhoConf.getInstance(); }
 	
     public static final int esNone = 0, esSyncAllSources = 1, esSyncSource = 2, esSearch=3, esStop = 4, esExit = 5;
 
@@ -111,7 +113,6 @@ public class SyncEngine implements NetRequest.IRhoSession
     };
     
     Vector/*<SyncSource*>*/ m_sources = new Vector();
-    Vector/*<String>*/      m_arPartitions = new Vector();    
     NetRequest m_NetRequest;
     ISyncProtocol m_SyncProtocol;
     int         m_syncState;
@@ -476,7 +477,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    {
 	        int nSrcID = resSrc.getIntByIdx(0);
 	        IDBResult res = db.executeSQL("SELECT source_id,sync_type,name, partition from sources WHERE source_id=?", nSrcID);
-	        if ( res.isEnd() )
+	        if ( res.isOneEnd() )
 	            continue;
 
 	        SyncSource src = new SyncSource( res.getIntByIdx(0), res.getStringByIdx(2), "none", db, this );
@@ -485,25 +486,32 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    }
 	}
 	
-	void loadAllSources()throws DBException
+	void loadAllSources()throws Exception
 	{
+		if (isNoThreadedMode())
+	        RhoAppAdapter.loadAllSyncSources();
+	    else
+	    {
+	        getNet().pushData( getNet().resolveUrl("/system/loadallsyncsources"), "", null );
+	    }
+		
 	    m_sources.removeAllElements();
-	    m_arPartitions.removeAllElements();
-	    
-	    IDBResult res = getUserDB().executeSQL("SELECT source_id,sync_type,name, partition from sources ORDER BY sync_priority");
-	    for ( ; !res.isEnd(); res.next() )
-	    { 
-	        String strShouldSync = res.getStringByIdx(1);
-	        if ( strShouldSync.compareTo("none") == 0)
-	            continue;
+	    Vector/*<String>*/ arPartNames = DBAdapter.getDBAllPartitionNames();
 
-	        String strName = res.getStringByIdx(2);
-	        String strPartition = res.getStringByIdx(3);
-	        
-	        if ( m_arPartitions.indexOf(strPartition) < 0 )
-	        	m_arPartitions.addElement(strPartition);
-	        
-	        m_sources.addElement( new SyncSource( res.getIntByIdx(0), strName, strShouldSync, getDB(strPartition), this) );
+	    for( int i = 0; i < (int)arPartNames.size(); i++ )
+	    {
+	        DBAdapter dbPart = DBAdapter.getDB((String)arPartNames.elementAt(i));	    
+		    IDBResult res = dbPart.executeSQL("SELECT source_id,sync_type,name from sources ORDER BY sync_priority");
+		    for ( ; !res.isEnd(); res.next() )
+		    { 
+		        String strShouldSync = res.getStringByIdx(1);
+		        if ( strShouldSync.compareTo("none") == 0)
+		            continue;
+	
+		        String strName = res.getStringByIdx(2);
+		        
+		        m_sources.addElement( new SyncSource( res.getIntByIdx(0), strName, strShouldSync, dbPart, this) );
+		    }
 	    }
 	    
 	    checkSourceAssociations();
@@ -557,7 +565,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		synchronized( m_mxLoadClientID )
 		{
 	        IDBResult res = getUserDB().executeSQL("SELECT client_id,reset from client_info");
-	        if ( !res.isEnd() )
+	        if ( !res.isOneEnd() )
 	            clientID = res.getStringByIdx(0);
 		}
 		
@@ -573,7 +581,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    boolean bResetClient = false;
 		    {
 		        IDBResult res = getUserDB().executeSQL("SELECT client_id,reset from client_info");
-		        if ( !res.isEnd() )
+		        if ( !res.isOneEnd() )
 		        {
 		            clientID = res.getStringByIdx(0);
 		            bResetClient = res.getIntByIdx(1) > 0;
@@ -585,7 +593,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		        clientID = requestClientIDByNet();
 		
 	            IDBResult res = getUserDB().executeSQL("SELECT * FROM client_info");
-	            if ( !res.isEnd() )
+	            if ( !res.isOneEnd() )
 	            	getUserDB().executeSQL("UPDATE client_info SET client_id=?", clientID);
 	            else
 	            	getUserDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
@@ -613,7 +621,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	            RhoAppAdapter.loadServerSources(strSources);            
 	        else
 	        {
-	        	NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null);
+	        	getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null);
 	        }
 	        
 	        loadAllSources();
@@ -697,8 +705,9 @@ public class SyncEngine implements NetRequest.IRhoSession
 		LOG.INFO("Bulk sync: start");
 		getNotify().fireBulkSyncNotification(false, "start", "", RhoAppAdapter.ERR_NONE);
 		
-	    for (int i = 0; i < (int)m_arPartitions.size() && isContinueSync(); i++)
-	        loadBulkPartition( (String)m_arPartitions.elementAt(i));
+		Vector/*<String>*/ arPartNames = DBAdapter.getDBAllPartitionNames();
+	    for( int i = 0; i < (int)arPartNames.size()&& isContinueSync(); i++ )
+	        loadBulkPartition( (String)arPartNames.elementAt(i));
 
 	    if (isContinueSync())
 	    {
@@ -760,44 +769,74 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    getNotify().fireBulkSyncNotification(false, "download", strPartition, RhoAppAdapter.ERR_NONE);
 	    
 	    String fDataName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "_bulk.data");
-	    String strHsqlDataUrl = FilePath.join(getHostFromUrl(serverUrl), strDataUrl) + ".hsqldb.data";
-	    LOG.INFO("Bulk sync: download data from server: " + strHsqlDataUrl);
+	    String fScriptName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "_bulk.script" );
+	    
+	    String strZip = ".gzip";
+	    if (Capabilities.USE_SQLITE)
 	    {
-		    NetResponse resp1 = getNet().pullFile(strHsqlDataUrl, fDataName, this, null);
-		    if ( !resp1.isOK() )
+		    String strHsqlDataUrl = FilePath.join(getHostFromUrl(serverUrl), strDataUrl) + strZip;
+		    downloadBulkDataAndUnzip(strHsqlDataUrl, fDataName+strZip, strPartition);
+	    }
+	    else
+	    {
+		    String strHsqlDataUrl = FilePath.join(getHostFromUrl(serverUrl), strDataUrl) + ".hsqldb.data" + strZip;
+		    downloadBulkDataAndUnzip(strHsqlDataUrl, fDataName+strZip, strPartition);
+	        if ( !isContinueSync() )
+	            return;
+		    
+		    String strHsqlScriptUrl = FilePath.join(getHostFromUrl(serverUrl), strDataUrl) + ".hsqldb.script";
+		    LOG.INFO("Bulk sync: download script from server: " + strHsqlScriptUrl);
 		    {
-			    LOG.ERROR("Bulk sync failed: cannot download database file: " + resp1.getRespCode() );
-			    stopSync();
-			    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.getErrorFromResponse(resp1));
-			    return;
+			    NetResponse resp1 = getNet().pullFile(strHsqlScriptUrl, fScriptName, this, null);
+			    if ( !resp1.isOK() )
+			    {
+				    LOG.ERROR("Bulk sync failed: cannot download database file.");
+				    stopSync();
+				    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.getErrorFromResponse(resp1));
+			    }
 		    }
 	    }
-	    
         if ( !isContinueSync() )
             return;
 	    
-	    String fScriptName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "_bulk.script" );
-	    String strHsqlScriptUrl = FilePath.join(getHostFromUrl(serverUrl), strDataUrl) + ".hsqldb.script";
-	    LOG.INFO("Bulk sync: download script from server: " + strHsqlScriptUrl);
+		LOG.INFO("Bulk sync: start change db");
+		getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoAppAdapter.ERR_NONE);
+		
+	    dbPartition.setBulkSyncDB(fDataName, fScriptName);
+	    processServerSources("{\"partition\":\"" + strPartition + "\"}");
+	    
+		LOG.INFO("Bulk sync: end change db");
+		getNotify().fireBulkSyncNotification(false, "", strPartition, RhoAppAdapter.ERR_NONE);
+	}
+	
+	void downloadBulkDataAndUnzip(String strDataUrl, String fDataName, String strPartition)throws Exception
+	{
+	    LOG.INFO("Bulk sync: download data from server: " + strDataUrl);
 	    {
-		    NetResponse resp1 = getNet().pullFile(strHsqlScriptUrl, fScriptName, this, null);
+		    NetResponse resp1 = getNet().pullFile(strDataUrl, fDataName, this, null);
 		    if ( !resp1.isOK() )
 		    {
-			    LOG.ERROR("Bulk sync failed: cannot download database file.");
+			    LOG.ERROR("Bulk sync failed: cannot download database file: " + resp1.getRespCode() );
 			    stopSync();
 			    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.getErrorFromResponse(resp1));
 			    return;
 		    }
 	    }
-	    
-		LOG.INFO("Bulk sync: start change db");
-		getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoAppAdapter.ERR_NONE);
 		
-	    dbPartition.setBulkSyncDB(fDataName, fScriptName);
-	    processServerSources("{\"partition\":\"" + strPartition + "\"}");
+	    LOG.INFO("Bulk sync: unzip db");
+
+	    try
+	    {
+	    	RhoClassFactory.createRhoRubyHelper().unzip_file(fDataName);
+	    }catch(Exception exc)
+	    {
+	        LOG.ERROR("Bulk sync failed: cannot unzip database file.", exc);
+	        stopSync();
+	        getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE);
+	    }
 	    
-		LOG.INFO("Bulk sync: end change db");
-		getNotify().fireBulkSyncNotification(false, "", strPartition, RhoAppAdapter.ERR_NONE);
+	    IFileAccess fs = RhoClassFactory.createFileAccess();
+	    fs.delete(fDataName);
 	}
 	
 	String makeBulkDataFileName(String strDataUrl, String strDbPath, String strExt)throws Exception
@@ -879,7 +918,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    	getNotify().fireSyncNotification(null, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
 	}
 	
-	void login(String name, String password, String callback)
+	void login(String name, String password, SyncNotify.SyncNotification oNotify)
 	{
 		try {
 /*			
@@ -900,13 +939,13 @@ public class SyncEngine implements NetRequest.IRhoSession
 			    int nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
 			    if ( nErrCode != RhoAppAdapter.ERR_NONE )
 			    {
-			        getNotify().callLoginCallback(callback, nErrCode, resp.getCharData());
+			        getNotify().callLoginCallback(oNotify, nErrCode, resp.getCharData());
 			        return;
 			    }
 		    }catch(IOException exc)
 		    {
 				LOG.ERROR("Login failed.", exc);
-		    	getNotify().callLoginCallback(callback, RhoAppAdapter.getNetErrorCode(exc), "" );
+		    	getNotify().callLoginCallback(oNotify, RhoAppAdapter.getNetErrorCode(exc), "" );
 		    	return;
 		    }
 		    
@@ -914,7 +953,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    if ( strSession == null || strSession.length() == 0 )
 		    {
 		    	LOG.ERROR("Return empty session.");
-		    	getNotify().callLoginCallback(callback, RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE, "" );
+		    	getNotify().callLoginCallback(oNotify, RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE, "" );
 		        return;
 		    }
 		    
@@ -922,12 +961,27 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    	return;
 		    
 		    IDBResult res = getUserDB().executeSQL("SELECT * FROM client_info");
-		    if ( !res.isEnd() )
+		    if ( !res.isOneEnd() )
 		    	getUserDB().executeSQL( "UPDATE client_info SET session=?", strSession );
 		    else
 		    	getUserDB().executeSQL("INSERT INTO client_info (session) values (?)", strSession);
 		
-	    	getNotify().callLoginCallback(callback, RhoAppAdapter.ERR_NONE, "" );
+		    if ( RHOCONF().isExist("rho_sync_user") )
+		    {
+		        String strOldUser = RHOCONF().getString("rho_sync_user");
+		        if ( name.compareTo(strOldUser) != 0 )
+		        {
+		            if (isNoThreadedMode())
+		                RhoAppAdapter.resetDBOnSyncUserChanged();
+		            else
+		            {
+		                NetResponse resp1 = getNet().pushData( getNet().resolveUrl("/system/resetDBOnSyncUserChanged"), "", null );
+		            }
+		        }
+		    }
+		    RHOCONF().setString("rho_sync_user", name, true);
+		    
+	    	getNotify().callLoginCallback(oNotify, RhoAppAdapter.ERR_NONE, "" );
 		    
 	    	if ( ClientRegister.getInstance() != null )
 	    		ClientRegister.getInstance().startUp();	    	
@@ -935,7 +989,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		}catch(Exception exc)
 		{
 			LOG.ERROR("Login failed.", exc);
-	    	getNotify().callLoginCallback(callback, RhoAppAdapter.ERR_RUNTIME, "" );
+	    	getNotify().callLoginCallback(oNotify, RhoAppAdapter.ERR_RUNTIME, "" );
 		}
 	}
 
@@ -944,7 +998,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    String strRes = "";
 	    IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
 	    
-	    if ( !res.isEnd() )
+	    if ( !res.isOneEnd() )
 	    	strRes = res.getStringByIdx(0);
 	    
 	    return strRes.length() > 0;
@@ -955,7 +1009,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		m_strSession = "";
 	    IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
 	    
-	    if ( !res.isEnd() )
+	    if ( !res.isOneEnd() )
 	    	m_strSession = res.getStringByIdx(0);
 	    
 	    return m_strSession;
@@ -972,15 +1026,19 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    //loadAllSources();
 	}
 	
-	public void setSyncServer(String url)throws Exception
+	public void setSyncServer(String syncserver)throws Exception
 	{
-		RhoConf.getInstance().setPropertyByName("syncserver", url);
-		RhoConf.getInstance().saveToFile();
-		RhoConf.getInstance().loadConf();
-		
-		getUserDB().executeSQL("DELETE FROM client_info");
+		String strOldSrv = RhoConf.getInstance().getString("syncserver");
+		String strNewSrv = syncserver != null ? syncserver : "";
 		
-		logout();
+		if ( strOldSrv.compareTo(strNewSrv) != 0)
+		{
+			RhoConf.getInstance().setString("syncserver", syncserver, true);
+			
+			getUserDB().executeSQL("DELETE FROM client_info");
+
+			logout();
+		}
 	}
 	
 	static String getHostFromUrl( String strUrl )

data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java

@@ -18,7 +18,7 @@ public class SyncNotify {
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		new RhoLogger("Sync");
 
-    static class SyncNotification
+    public static class SyncNotification
     {
         String m_strUrl ="", m_strParams="";
         boolean m_bRemoveAfterFire;
@@ -26,7 +26,13 @@ public class SyncNotify {
         SyncNotification(){m_bRemoveAfterFire = false;}
         
         SyncNotification(String strUrl, String strParams, boolean bRemoveAfterFire)
-        { m_strUrl = strUrl; m_strParams = strParams; m_bRemoveAfterFire = bRemoveAfterFire; }
+        {
+            if ( strUrl.length() > 0 )
+                m_strUrl = RhodesApp.getInstance().canonicalizeRhoUrl(strUrl);
+        	
+        	m_strParams = strParams; 
+        	m_bRemoveAfterFire = bRemoveAfterFire; 
+        }
     };
 	
 	public static final Integer enNone = new Integer(0), enDelete=new Integer(1), enUpdate=new Integer(2), enCreate=new Integer(3);
@@ -164,7 +170,7 @@ public class SyncNotify {
                     if ( nNotifyType == enDelete.intValue() )
                     {
                         IDBResult res = getDB().executeSQL("SELECT object FROM object_values where object=? LIMIT 1 OFFSET 0", strObject );
-                        if ( !res.isEnd() )
+                        if ( !res.isOneEnd() )
                             nNotifyType = enUpdate.intValue();    
                     }
 */
@@ -193,7 +199,7 @@ public class SyncNotify {
                 return;
         }
 
-        callNotify(strUrl, strBody);
+        callNotify( new SyncNotification(strUrl,"",false), strBody);
     }
 
     void onObjectChanged(Integer nSrcID, String strObject, Integer nType)
@@ -285,7 +291,7 @@ public class SyncNotify {
 
         cleanCreateObjectErrors();
     }
-    
+/*    
 	void setSyncNotification(int source_id, String strUrl, String strParams )throws Exception
 	{
 		LOG.INFO( "Set notification. Source ID: " + source_id + "; Url :" + strUrl + "; Params: " + strParams );
@@ -308,7 +314,26 @@ public class SyncNotify {
 				LOG.INFO( " Done Set notification. Source ID: " + source_id + "; Url :" + strFullUrl + "; Params: " + strParams );
 		    }
 		}
-	}
+	}*/
+    void setSyncNotification(int source_id, SyncNotification pNotify)
+    {
+        LOG.INFO("Set notification. Source ID: " + source_id + ";" + (pNotify != null? pNotify.toString() : "") );
+
+    	if ( source_id == -1 )
+    	{
+    		synchronized(m_mxSyncNotifications)
+            {
+                m_pAllNotification = pNotify;
+            }
+    	}else
+    	{
+            synchronized(m_mxSyncNotifications)
+            {
+                m_mapSyncNotifications.put( new Integer(source_id), pNotify );
+            }
+        }
+    	
+    }
 
 	void setSearchNotification(String strUrl, String strParams )throws Exception
 	{
@@ -376,7 +401,17 @@ public class SyncNotify {
 	{
 	    if ( getSync().getState() == SyncEngine.esExit )
 			return;
-		
+
+		if( nErrCode != RhoAppAdapter.ERR_NONE)
+		{
+			if ( !getSync().isSearch() )
+			{
+				String strMessage = RhoAppAdapter.getMessageText("sync_failed_for") + "all.";
+				
+				reportSyncStatus(strMessage,nErrCode,strError);
+			}
+		}
+	    
 	    synchronized(m_mxSyncNotifications)
 	    {
 	        SyncNotification pSN = getSyncNotifyBySrc(null);    
@@ -430,15 +465,16 @@ public class SyncNotify {
 			return;
 		
 		try{
-		    String strBody = "", strUrl;
+			SyncNotification pSN = null;		
+			
+		    String strBody = "";
 		    boolean bRemoveAfterFire = bFinish;
 		    {
 		    	synchronized(m_mxSyncNotifications){
-			        SyncNotification sn = getSyncNotifyBySrc(src);
-			        if ( sn == null )
+		    		pSN = getSyncNotifyBySrc(src);
+			        if ( pSN == null )
 			            return;
 			
-			        strUrl = sn.m_strUrl;
 				    strBody = "";
 
 		            if ( src != null )
@@ -488,18 +524,18 @@ public class SyncNotify {
 			        	strBody += "in_progress";
 			        
 			        strBody += "&rho_callback=1";
-			        if ( sn.m_strParams.length() > 0 )
-			            strBody += "&" + sn.m_strParams;
+			        if ( pSN.m_strParams.length() > 0 )
+			            strBody += "&" + pSN.m_strParams;
 			        
-			        bRemoveAfterFire = bRemoveAfterFire && sn.m_bRemoveAfterFire;
+			        bRemoveAfterFire = bRemoveAfterFire && pSN.m_bRemoveAfterFire;
 		        }
 		    }
 		    if ( bRemoveAfterFire )
 		    	clearNotification(src);
 		    
-			LOG.INFO( "Fire notification. Source ID: " + (src != null ? src.getID().toString() : "") + "; Url :" + strUrl + "; Body: " + strBody );
-
-            if ( callNotify(strUrl, strBody) )
+		    LOG.INFO("Fire notification. Source : " + (src != null ? (src).getName():"") + "; " + pSN.toString());
+		    
+            if ( callNotify(pSN, strBody) )
                 clearNotification(src);
 		}catch(Exception exc)
 		{
@@ -507,7 +543,7 @@ public class SyncNotify {
 		}
 	}
 
-    boolean callNotify(String strUrl, String strBody )throws Exception
+    boolean callNotify(SyncNotification oNotify, String strBody )throws Exception
     {
         if ( getSync().isNoThreadedMode() )
         {
@@ -515,7 +551,10 @@ public class SyncNotify {
             return false;
         }
 
-        NetResponse resp = getNet().pushData( strUrl, strBody, null );
+        if ( oNotify.m_strUrl.length() == 0 )
+            return true;
+        
+        NetResponse resp = getNet().pushData( oNotify.m_strUrl, strBody, null );
         if ( !resp.isOK() )
             LOG.ERROR( "Fire object notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData() );
         else
@@ -590,7 +629,7 @@ public class SyncNotify {
 	    return nCount;
 	}
 
-	void callLoginCallback(String callback, int nErrCode, String strMessage)
+	void callLoginCallback(SyncNotification oNotify, int nErrCode, String strMessage)
 	{
 		try{
 			if ( getSync().isStoppedByUser() )
@@ -600,11 +639,9 @@ public class SyncNotify {
 	        strBody += "&error_message=" + URI.urlEncode(strMessage != null? strMessage : "");
 	        strBody += "&rho_callback=1";
 	        
-	        String strUrl = getNet().resolveUrl(callback);
-	        
-			LOG.INFO( "Login callback: " + callback + ". Body: "+ strBody );
+			LOG.INFO( "Login callback: " + oNotify.toString() + ". Body: "+ strBody );
 
-            callNotify(strUrl, strBody);	
+            callNotify(oNotify, strBody);	
 		}catch(Exception exc)
 		{
 			LOG.ERROR("Call Login callback failed.", exc);