rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/shared/rubyJVM/src/com/rho/net/NetRequest.java

@@ -110,6 +110,14 @@ public class NetRequest
 	    }
 	}
 	
+	private String getResponseEncoding() throws Exception
+	{
+		if ( m_OutHeaders != null )
+			return (String)m_OutHeaders.get("content-type");
+		
+		return "";
+	}
+	
 	public NetResponse doRequest(String strMethod, String strUrl, String strBody, IRhoSession oSession, Hashtable headers ) throws Exception
     {
 		String strRespBody = null;
@@ -159,6 +167,9 @@ public class NetRequest
 			
 			is = m_connection.openInputStream();
 			LOG.INFO("openInputStream done");
+
+			readHeaders(headers);
+			copyHashtable(m_OutHeaders, headers);
 			
 			if (code != IHttpConnection.HTTP_OK) 
 			{
@@ -168,7 +179,7 @@ public class NetRequest
 				
 				//if ( code != IHttpConnection.HTTP_INTERNAL_ERROR )
 				{
-					strRespBody = readFully(is);
+					strRespBody = readFully(is, getResponseEncoding());
 					
 					if ( code == IHttpConnection.HTTP_MOVED_TEMPORARILY ||
 						 code == IHttpConnection.HTTP_MOVED_PERMANENTLY )
@@ -181,13 +192,11 @@ public class NetRequest
 				long len = m_connection.getLength();
 				LOG.INFO("fetchRemoteData data size:" + len );
 		
-				strRespBody = readFully(is);
+				strRespBody = readFully(is, getResponseEncoding());
 				
 				LOG.INFO("fetchRemoteData data readFully.");
 			}
 
-			readHeaders(headers);
-			copyHashtable(m_OutHeaders, headers);
 		}finally
 		{
 			if ( is != null )
@@ -283,7 +292,7 @@ public class NetRequest
 	        if (oItem.m_strFileName.length()>0)
 	            oItem.m_strDataPrefix += "; filename=\"" + oItem.m_strFileName + "\"";
 	        oItem.m_strDataPrefix += "\r\n";
-	        if ( oItem.m_strContentType.length() > 0 )
+	        if ( oItem.m_strContentType != null && oItem.m_strContentType.length() > 0 )
 	            oItem.m_strDataPrefix += "Content-Type: " + oItem.m_strContentType + "\r\n";
 
 	        long nContentSize = 0;
@@ -306,7 +315,7 @@ public class NetRequest
 	        else
 	            nContentSize = oItem.m_strBody.length();
 
-	        if ( oItem.m_strContentType.length() > 0 )
+	        if ( oItem.m_strContentType != null && oItem.m_strContentType.length() > 0 )
 	            oItem.m_strDataPrefix += "Content-Length: " + nContentSize + "\r\n";
 
 	        oItem.m_strDataPrefix += "\r\n";
@@ -392,6 +401,9 @@ public class NetRequest
 			code = m_connection.getResponseCode();
 		
 			LOG.INFO("getResponseCode : " + code);
+
+			readHeaders(headers);
+			copyHashtable(m_OutHeaders, headers);
 			
 			if (code != IHttpConnection.HTTP_OK) 
 			{
@@ -400,19 +412,18 @@ public class NetRequest
 					oSession.logout();
 				
 				if ( code != IHttpConnection.HTTP_INTERNAL_ERROR )
-					strRespBody = readFully(is);
+					strRespBody = readFully(is, getResponseEncoding());
 				
 			}else
 			{
 				long len = m_connection.getLength();
 				LOG.INFO("fetchRemoteData data size:" + len );
 		
-				strRespBody = readFully(is);
+				strRespBody = readFully(is, getResponseEncoding());
 				
 				LOG.INFO("fetchRemoteData data readFully.");
 			}
 			
-			readHeaders(headers);			
 		}finally{
 			try{
 				if ( is != null )
@@ -425,7 +436,6 @@ public class NetRequest
 			}catch(IOException exc2){}
 		}
 		
-		copyHashtable(m_OutHeaders, headers);
 		return makeResponse(strRespBody, code );
     }
 	
@@ -452,7 +462,7 @@ public class NetRequest
                 }              	
 	        }
 			
-			file = RhoClassFactory.createRAFile();
+			file = RhoClassFactory.createFSRAFile();
 			file.open(strFileName, "rw");
 			file.seek(file.size());
 			
@@ -508,6 +518,7 @@ public class NetRequest
 			LOG.INFO("getResponseCode : " + code);
 			
 			m_nCurDownloadSize = 0;
+			readHeaders(headers);
 			
 			if ( code == IHttpConnection.HTTP_RANGENOTSATISFY )
 				code = IHttpConnection.HTTP_PARTIAL_CONTENT;
@@ -522,7 +533,7 @@ public class NetRequest
 					if ( code != IHttpConnection.HTTP_INTERNAL_ERROR )
 					{
 						is = m_connection.openInputStream();
-						strRespBody = readFully(is);
+						strRespBody = readFully(is, getResponseEncoding());
 					}
 				}else
 				{
@@ -549,8 +560,6 @@ public class NetRequest
 				}
 				
 			}
-
-			readHeaders(headers);
 		}finally
 		{
 			if ( is != null )
@@ -644,17 +653,22 @@ public class NetRequest
 		return strRes;
 	}
 
-	private final String readFully(InputStream in) throws Exception 
+	private final String readFully(InputStream in, String strContType) throws Exception 
 	{
 		String strRes = "";
 		byte[]  byteBuffer = new byte[1024*4];
-		
+		boolean bUTF8 = strContType != null && strContType.indexOf("UTF-8")>=0;
+
 		int nRead = 0;
 		do{
 			nRead = in.read(byteBuffer);
 			if (nRead>0)
 			{
-				String strTemp = new String(byteBuffer,0,nRead);
+				String strTemp;
+				if (bUTF8)
+					strTemp = new String(byteBuffer,0,nRead, "UTF-8");
+				else	
+					strTemp = new String(byteBuffer,0,nRead);
 				strRes += strTemp;
 			}
 		}while( nRead > 0 );

data/platform/shared/rubyJVM/src/com/rho/net/RhoConnection.java

@@ -635,6 +635,8 @@ public class RhoConnection implements IHttpConnection {
 				String url = uri.getPath();// + (nPos == 0 ? ".iseq" : "");
 				RubyValue res = RhoRuby.processIndexRequest(url);//erb-compiled should load from class
 				processResponse(res);
+				
+				RhodesApp.getInstance().keepLastVisitedUrl(url_external);
 				return true;
 			}
 			
@@ -762,6 +764,7 @@ public class RhoConnection implements IHttpConnection {
 			 actionid.charAt(0)=='{' && actionid.charAt(actionid.length()-1)=='}' )
 			SyncThread.getInstance().addobjectnotify_bysrcname( model, actionid);
 
+		RhodesApp.getInstance().keepLastVisitedUrl(url_external);
 		LOG.INFO("dispatch end");
 		return true;
 	}

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

@@ -20,6 +20,12 @@ class JSONArrayIterator
 	    m_array = (JSONArray)oEntry.m_object.get(strName);
 	    m_nCurItem = 0;
 	}
+
+	private JSONArrayIterator()
+	{
+		m_array = null;
+		m_nCurItem = 0;
+	}
 	
 	boolean isEnd()
 	{
@@ -42,4 +48,15 @@ class JSONArrayIterator
 	{
 	    return new JSONEntry( isEnd() ? null : (JSONObject) m_array.get(m_nCurItem) );
 	}
+	
+	JSONArrayIterator getCurArrayIter()throws JSONException
+	{
+		JSONArrayIterator res = new JSONArrayIterator();
+		if ( isEnd() )
+			return res;
+		
+		res.m_array = (JSONArray)m_array.get(m_nCurItem);
+	    return res;
+	}
+	
 }

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

@@ -25,6 +25,7 @@ import com.rho.RhoEmptyProfiler;
 import com.rho.RhoLogger;
 import com.rho.RhoProfiler;
 import com.rho.RhoRuby;
+import com.rho.TimeInterval;
 import com.rho.db.*;
 import com.rho.net.*;
 import com.rho.*;
@@ -195,143 +196,160 @@ public class SyncEngine implements NetRequest.IRhoSession
 
     void doSearch(Vector/*<rho::String>*/ arSources, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep)
     {
-/*        prepareSync(esSearch);
-        if ( !isContinueSync() )
-        {
-            if ( getState() != esExit )
-                setState(esNone);
-
-            return;
-        }
-
-        CTimeInterval startTime = CTimeInterval::getCurrentTime();
-
-        if ( bSearchSyncChanges )
-        {
-            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 )
-                {
-                    strQuery += "&sources[][name]=" + pSrc->getName();
-
-                    if ( !pSrc->isTokenFromDB() && pSrc->getToken() > 1 )
-                        strQuery += "&sources[][token]=" + convertToStringA(pSrc->getToken());
-                }
-            }
-
-    		LOG(INFO) + "Call search on server. Url: " + (strUrl+strQuery);
-            NetResponse(resp,getNet().pullData(strUrl+strQuery, this));
-
-            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, "");
-        }
+	    try
+	    {
+		    prepareSync(esSearch);
+		    if ( !isContinueSync() )
+		    {
+		        if ( getState() != esExit )
+		            setState(esNone);
+		
+		        return;
+		    }
+		
+		    TimeInterval startTime = TimeInterval.getCurrentTime();
+		
+		    if ( bSearchSyncChanges )
+		    {
+		        for ( int i = 0; i < (int)arSources.size(); i++ )
+		        {
+		            SyncSource pSrc = findSourceByName((String)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++ )
+		        {
+		            SyncSource pSrc = findSourceByName((String)arSources.elementAt(i));
+		            if ( pSrc != null )
+		            {
+		                strQuery += "&source[][name]=" + pSrc.getName();
+		
+		                if ( !pSrc.isTokenFromDB() && pSrc.getToken() > 1 )
+		                    strQuery += "&source[][token]=" + pSrc.getToken();
+		            }
+		        }
+		
+				LOG.INFO("Call search on server. Url: " + (strUrl+strQuery) );
+		        NetResponse resp = getNet().pullData(strUrl+strQuery, this);
+		
+		        if ( !resp.isOK() )
+		        {
+		            stopSync();
+		            nErrCode = RhoRuby.getErrorFromResponse(resp);
+		            continue;
+		        }
+		
+		        String szData = resp.getCharData();
+		
+		        JSONArrayIterator oJsonArr = new JSONArrayIterator(szData);
+		
+		        for( ; !oJsonArr.isEnd() && isContinueSync(); oJsonArr.next() )
+		        {
+		            JSONArrayIterator oSrcArr = oJsonArr.getCurArrayIter();//new JSONArrayIterator(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: " + getProtocol().getVersion() +
+		                    "; Server response version: " + 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");
+		            SyncSource 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() )
+		    {
+		        SyncSource src = (SyncSource)m_sources.elementAt(getStartSource());
+		        src.m_bIsSearch = true;
+		
+		    	getNotify().fireSyncNotification(src, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
+		    }
+		    else if ( nErrCode != 0 )
+		    {
+		        SyncSource src = (SyncSource)m_sources.elementAt(getStartSource());
+		        src.m_nErrCode = nErrCode;
+		        src.m_bIsSearch = true;
+		        getNotify().fireSyncNotification(src, true, src.m_nErrCode, "");
+		    }
+		
+		    //update db info
+		    TimeInterval endTime = TimeInterval.getCurrentTime();
+		    //unsigned long timeUpdated = CLocalTime().toULong();
+		    for ( int i = 0; i < (int)arSources.size(); i++ )
+		    {
+		        SyncSource oSrc = findSourceByName((String)arSources.elementAt(i));
+		        if ( oSrc == null )
+		            continue;
+		        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=?", 
+					 new Long(endTime.toULong()/1000), new Integer(oSrc.getInsertedCount()), new Integer(oSrc.getDeletedCount()), 
+					 new Long((endTime.minus(startTime)).toULong()), new Integer(oSrc.getGetAtLeastOnePage()?1:0), 
+					 new Integer(oSrc.getRefreshTime()),  oSrc.getID() );
+		    }
+		    //
+		
+		    getNotify().cleanCreateObjectErrors();
+		    if ( getState() != esExit )
+		        setState(esNone);
 
-        //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() );
-        }
-        //
+	    } catch(Exception exc) {
+    		LOG.ERROR("Search failed.", exc);
 
-        getNotify().cleanCreateObjectErrors();
-        if ( getState() != esExit )
-            setState(esNone);*/
+	        SyncSource src = (SyncSource)m_sources.elementAt(getStartSource());
+	        src.m_bIsSearch = true;
+    		src.m_nErrCode = RhoRuby.ERR_RUNTIME;
+	    	
+	    	getNotify().fireSyncNotification(src, true, src.m_nErrCode, "" ); 
+	    }
+		    
     }
 
     void doSyncSource(SourceID oSrcID)
@@ -399,7 +417,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	{
 	    m_sources.removeAllElements();
 	    
-	    IDBResult res = getUserDB().executeSQL("SELECT source_id,sync_type,name, partition from sources ORDER BY priority");
+	    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);
@@ -473,7 +491,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 
 	    NetResponse resp = getNet().pullData(getProtocol().getClientResetUrl(strClientID), this);
 /*	    
-	    processServerSources("{\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"priority\":\"0\","+
+	    processServerSources("{\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"sync_priority\":\"0\","+
 	    	    "\"schema_version\":\"7.0\",\"schema\":{"+
 	    	    "\"columns\":[\'brand\',\'created_at\',\'name\',\'price\',\'quantity\',\'sku\',\'updated_at\']"+
 	    	    "}}]}"); 
@@ -521,6 +539,8 @@ public class SyncEngine implements NetRequest.IRhoSession
 
 	void doBulkSync()throws Exception
 	{
+//	    processServerSources("{\"partition\":\"" + "application" + "\"}");
+
 	    if ( !RhoConf.getInstance().isExist("bulksync_state") )
 	        return;
 		
@@ -628,6 +648,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoRuby.ERR_NONE);
 		
 	    dbPartition.setBulkSyncDB(fDataName, fScriptName);
+	    processServerSources("{\"partition\":\"" + strPartition + "\"}");
 	    
 		LOG.INFO("Bulk sync: end change db");
 		getNotify().fireBulkSyncNotification(false, "", strPartition, RhoRuby.ERR_NONE);

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

@@ -85,7 +85,7 @@ class SyncSource
     int m_nRefreshTime = 0;
     int m_nProgressStep = -1;
     boolean m_bSchemaSource;
-    Hashtable/*<String,String>*/ m_hashLinks = new Hashtable();
+    Hashtable/*<String,String>*/ m_hashAssociations = new Hashtable();
     Vector/*Ptr<net::CMultipartItem*>*/ m_arMultipartItems = new Vector();
     Vector/*<String>*/                  m_arBlobAttrs = new Vector();
     
@@ -160,7 +160,7 @@ class SyncSource
         m_nErrCode = RhoRuby.ERR_NONE;
         m_bIsSearch = false;
 
-        IDBResult res = db.executeSQL("SELECT token,links from sources WHERE source_id=?", m_nID);
+        IDBResult res = db.executeSQL("SELECT token,associations from sources WHERE source_id=?", m_nID);
         if ( !res.isEnd() )
         {
         	m_token = res.getLongByIdx(0);
@@ -172,15 +172,15 @@ class SyncSource
         }
         
         m_bSchemaSource = db.isTableExist(m_strName);
-        parseLinks(res.getStringByIdx(1));
+        parseAssociations(res.getStringByIdx(1));
     }
 	
-    void parseLinks(String strLinks)
+    void parseAssociations(String strAssociations)
     {
-        if (strLinks.length() == 0 )
+        if (strAssociations.length() == 0 )
             return;
 
-        Tokenizer oTokenizer = new Tokenizer( strLinks, "," );
+        Tokenizer oTokenizer = new Tokenizer( strAssociations, "," );
 
         String strSrcName = "";
         while (oTokenizer.hasMoreTokens()) 
@@ -191,7 +191,7 @@ class SyncSource
             
             if ( strSrcName.length() > 0 )
             {
-                m_hashLinks.put(strSrcName, tok);
+                m_hashAssociations.put(strSrcName, tok);
                 strSrcName = "";
             }else
                 strSrcName = tok;
@@ -220,9 +220,10 @@ class SyncSource
 	    }finally{
 		   TimeInterval endTime = TimeInterval.getCurrentTime();
 		   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=?", 
-		                         new Long(endTime.toULong()/1000), new Integer(getInsertedCount()), new Integer(getDeletedCount()), new Long((endTime.minus(startTime)).toULong()), 
-		                         new Integer(m_bGetAtLeastOnePage?1:0), new Integer(m_nRefreshTime), getID() );
+			 "last_sync_duration=?,last_sync_success=?, backend_refresh_time=? WHERE source_id=?", 
+             new Long(endTime.toULong()/1000), new Integer(getInsertedCount()), new Integer(getDeletedCount()), 
+             new Long((endTime.minus(startTime)).toULong()), 
+             new Integer(m_bGetAtLeastOnePage?1:0), new Integer(m_nRefreshTime), getID() );
 	    }
 	}
 
@@ -622,19 +623,19 @@ class SyncSource
 	    }
 	}
 	
-	void processLinks(String strOldObject, String strNewObject)throws Exception
+	void processAssociations(String strOldObject, String strNewObject)throws Exception
 	{
-    	Enumeration vals = m_hashLinks.elements();
-    	Enumeration keys = m_hashLinks.keys();
+    	Enumeration vals = m_hashAssociations.elements();
+    	Enumeration keys = m_hashAssociations.keys();
 		while (vals.hasMoreElements()) 
 		{
 	        SyncSource pSrc = getSync().findSourceByName((String)keys.nextElement());
 	        if ( pSrc != null )
-	            pSrc.updateLink(strOldObject, strNewObject, (String)vals.nextElement());
+	            pSrc.updateAssociation(strOldObject, strNewObject, (String)vals.nextElement());
 	    }
 	}
 
-	void updateLink(String strOldObject, String strNewObject, String strAttrib)throws Exception
+	void updateAssociation(String strOldObject, String strNewObject, String strAttrib)throws Exception
 	{
 	    if ( m_bSchemaSource )
 	    {
@@ -767,7 +768,7 @@ class SyncSource
 	    }else if ( strCmd.compareTo("links") == 0 )
 	    {
 	        String strValue = attrIter.getCurString();
-	        processLinks(strObject, strValue);
+	        processAssociations(strObject, strValue);
 	        
 	        String strSqlUpdate = "UPDATE ";
 	        strSqlUpdate += getName() + " SET object=? WHERE object=?";
@@ -871,7 +872,7 @@ class SyncSource
 	        m_nDeleted++;
 	    }else if ( strCmd.compareTo("links") == 0 )
 	    {
-	        processLinks(strObject, oAttrValue.m_strValue);
+	        processAssociations(strObject, oAttrValue.m_strValue);
 
 	        getDB().executeSQL("UPDATE object_values SET object=? where object=? and source_id=?", oAttrValue.m_strValue, strObject, getID() );
 	        getDB().executeSQL("UPDATE changed_values SET object=?,sent=3 where object=? and source_id=?", oAttrValue.m_strValue, strObject, getID() );

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

@@ -664,8 +664,16 @@ public class SyncThread extends RhoThread
 				new RubyOneArgMethod() {
 					protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) {
 						try{
-							String url = arg1.toStr();
-							getSyncEngine().setSyncServer(url);
+							String syncserver = arg1.toStr();
+							
+							stopSync();							
+							getSyncEngine().setSyncServer(syncserver);
+							
+						    if ( syncserver != null && syncserver.length() > 0 )
+						        SyncThread.getInstance().start(SyncThread.epLow);
+						    else
+						        SyncThread.getInstance().stop(SYNC_WAIT_BEFOREKILL_SECONDS);
+							
 						}catch(Exception e)
 						{
 							LOG.ERROR("set_syncserver failed", e);