rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/sync/SyncSource.cpp

@@ -1,12 +1,15 @@
 #include "SyncSource.h"
 #include "SyncEngine.h"
+#include "SyncThread.h"
 
-#include "common/RhoFilePath.h"
 #include "common/RhoTime.h"
 #include "common/StringConverter.h"
 #include "common/RhodesApp.h"
+#include "common/Tokenizer.h"
+#include "common/RhoFilePath.h"
+#include "common/RhoFile.h"
 #include "json/JSONIterator.h"
-#include "ruby/ext/rho/rhoruby.h"
+#include "rubyext/RhoRuby.h"
 #include "statistic/RhoProfiler.h"
 
 namespace rho {
@@ -17,106 +20,105 @@ using namespace rho::net;
 using namespace rho::db;
 using namespace rho::common;
 using namespace rho::json;
-
+/*
 CSyncSource::CSyncSource() : m_syncEngine( *new CSyncEngine(*new db::CDBAdapter()))
 {
     m_bTokenFromDB = true;
-    m_token = 0;
+
     m_nCurPageCount = 0;
     m_nInserted = 0;
     m_nDeleted = 0;
     m_nTotalCount = 0;
     m_bGetAtLeastOnePage = false;
-    m_eSyncServerDataPass = edpNone;
 
     m_nErrCode = RhoRuby.ERR_NONE;
-    m_bSearchSyncChanges = false;
-    m_nProgressStep = -1;
-    m_nRefreshTime = 0;
-}
 
-CSyncSource::CSyncSource(CSyncEngine& syncEngine ) : m_syncEngine(syncEngine)
+    m_bIsSearch = false;
+}
+*/
+CSyncSource::CSyncSource(CSyncEngine& syncEngine, db::CDBAdapter& db  ) : m_syncEngine(syncEngine), m_dbAdapter(db)
 {
     m_bTokenFromDB = true;
-    m_token = 0;
 
     m_nCurPageCount = 0;
     m_nInserted = 0;
     m_nDeleted = 0;
     m_nTotalCount = 0;
     m_bGetAtLeastOnePage = false;
-    m_eSyncServerDataPass = edpNone;
 
     m_nErrCode = RhoRuby.ERR_NONE;
-    m_bSearchSyncChanges = false;
-    m_nProgressStep = -1;
-    m_nRefreshTime = 0;
+    m_bIsSearch = false;
+    m_bSchemaSource = db.isTableExist(m_strName);
 }
 
-CSyncSource::CSyncSource(int id, const String& strUrl, const String& strName, uint64 token, CSyncEngine& syncEngine ) : m_syncEngine(syncEngine)
+CSyncSource::CSyncSource(int id, const String& strName, const String& strSyncType, db::CDBAdapter& db, CSyncEngine& syncEngine ) : m_syncEngine(syncEngine), m_dbAdapter(db)
 {
     m_nID = id;
-    m_strUrl = strUrl;
     m_strName = strName;
-    m_token = token;
-    m_bTokenFromDB = true;
+    m_strSyncType = strSyncType;
 
     m_nCurPageCount = 0;
     m_nInserted = 0;
     m_nDeleted = 0;
     m_nTotalCount = 0;
     m_bGetAtLeastOnePage = false;
-    m_eSyncServerDataPass = edpNone;
 
     m_nErrCode = RhoRuby.ERR_NONE;
-    m_bSearchSyncChanges = false;
-    m_nProgressStep = -1;
-    m_nRefreshTime = 0;
+    m_bIsSearch = false;
+
+    DBResult( res, db.executeSQL("SELECT token,links from sources WHERE source_id=?", m_nID) );
+    if ( !res.isEnd() )
+    {
+        m_token = res.getUInt64ByIdx(0);
+        m_bTokenFromDB = true;
+    }else
+    {
+        m_token = 0;
+        m_bTokenFromDB = true;
+    }
+
+    m_bSchemaSource = db.isTableExist(m_strName);
+    parseLinks(res.getStringByIdx(1));
+}
+
+void CSyncSource::parseLinks(const String& strLinks)
+{
+    if (strLinks.length() == 0 )
+        return;
+
+    CTokenizer oTokenizer( strLinks, "," );
+
+    String strSrcName = "";
+    while (oTokenizer.hasMoreTokens()) 
+    {
+	    String tok = oTokenizer.nextToken();
+	    if (tok.length() == 0)
+		    continue;
+        
+        if ( strSrcName.length() > 0 )
+        {
+            m_hashLinks.put(strSrcName, tok);
+            strSrcName = "";
+        }else
+            strSrcName = tok;
+    }
 }
 
-CDBAdapter& CSyncSource::getDB(){ return getSync().getDB(); }
 INetRequest& CSyncSource::getNet(){ return getSync().getNet(); }
 CSyncNotify& CSyncSource::getNotify(){ return getSync().getNotify(); }
+ISyncProtocol& CSyncSource::getProtocol(){ return getSync().getProtocol(); }
 
 void CSyncSource::sync()
 {
     getNotify().fireSyncNotification(null, false, RhoRuby.ERR_NONE, RhoRuby.getMessageText("syncronizing") + getName() + "...");
 
     CTimeInterval startTime = CTimeInterval::getCurrentTime();
+    m_bIsSearch = false;
 
-  	PROF_START("Pull");
     if ( isEmptyToken() )
         processToken(1);
 
-    boolean bSyncedServer = false;
-    if ( m_strParams.length() == 0 || m_bSearchSyncChanges )
-    {
-        if ( isPendingClientChanges() )
-        {
-            syncServerChanges();
-            bSyncedServer = true;
-        }
-
-        if ( bSyncedServer && isPendingClientChanges() )
-            getSync().setState(CSyncEngine::esStop);
-        else
-        {   
-            boolean bSyncClient = false;
-            {
-                DBResult( res, getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? LIMIT 1 OFFSET 0", getID()) );
-                bSyncClient = !res.isEnd();
-            }
-            if ( bSyncClient )
-            {
-                syncClientChanges();
-                getAndremoveAsk();
-                bSyncedServer = false;
-            }
-        }
-    }
-
-    PROF_STOP("Pull");
-
+    boolean bSyncedServer = syncClientChanges();
     if ( !bSyncedServer )
         syncServerChanges();
 
@@ -129,82 +131,114 @@ void CSyncSource::sync()
                          getID() );
 }
 
+boolean CSyncSource::syncClientChanges()
+{
+    boolean bSyncedServer = false;
+    if ( isPendingClientChanges() )
+    {
+        syncServerChanges();
+        bSyncedServer = true;
+    }
+
+    if ( bSyncedServer && isPendingClientChanges() )
+        getSync().setState(CSyncEngine::esStop);
+    else
+    {   
+      	PROF_START("Pull");
+
+        boolean bSyncClient = false;
+        {
+            DBResult( res, getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? LIMIT 1 OFFSET 0", getID()) );
+            bSyncClient = !res.isEnd();
+        }
+        if ( bSyncClient )
+        {
+            doSyncClientChanges();
+            bSyncedServer = false;
+        }
+
+        PROF_STOP("Pull");
+    }
+
+    return bSyncedServer;
+}
+
 boolean CSyncSource::isPendingClientChanges()
 {
     DBResult( res, getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and update_type='create' and sent>1  LIMIT 1 OFFSET 0", getID()) );
     return !res.isEnd();
 }
 
-void CSyncSource::syncClientBlobs(const String& strBaseQuery)
+void CSyncSource::doSyncClientChanges()
 {
-    String strQuery;
-    for( int i = 0; i < (int)m_arSyncBlobs.size(); i ++)
+    String arUpdateTypes[] = {"create", "update", "delete"};
+    boolean arUpdateSent[] = {false, false, false};
+
+    m_arMultipartItems.removeAllElements();
+    m_arBlobAttrs.removeAllElements();
+    String strBody = "{\"source_name\":\"" + getName() + "\",\"client_id\":\"" + getSync().getClientID() + "\"";
+    boolean bSend = false;
+    int i = 0;
+    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
     {
-        CSyncBlob& blob = *m_arSyncBlobs.elementAt(i);
+        String strBody1;
+        makePushBody_Ver3(strBody1, arUpdateTypes[i]);
+        if (strBody1.length() > 0)
+        {
+            strBody += "," + strBody1;
 
-        String strFilePath = RHODESAPP().getRhoRootPath() + "apps" + blob.getFilePath() ;
+            String strBlobAttrs = "";
+            for ( int j = 0; j < (int)m_arBlobAttrs.size(); j++)
+            {
+                if ( strBlobAttrs.length() > 0 )   
+                    strBlobAttrs += ",";
 
-        strQuery = strBaseQuery + "&" + blob.getBody();
-        NetResponse( resp, getNet().pushFile(strQuery, strFilePath, &getSync(), null) );
-        if ( !resp.isOK() )
-        {
-            getSync().setState(CSyncEngine::esStop);
-			if (resp.isResponseRecieved())
-				m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-			else
-				m_nErrCode = RhoRuby.ERR_NETWORK;
-            return;
-        }
+                strBlobAttrs += "\"" + m_arBlobAttrs.elementAt(j) + "\"";
+            }
 
-        getDB().startTransaction();
-        getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and attrib_type=? and value=?", getID(), "blob.file", blob.getFilePath() );
-        getDB().executeSQL("DELETE FROM object_values WHERE source_id=? and attrib_type=? and value=?", getID(), "blob.file", blob.getFilePath() );
-        getDB().endTransaction();
-    }
+            if ( strBlobAttrs.length() > 0 )
+                strBody += ",\"blob_fields\":[" + strBlobAttrs + "]";
 
-    m_arSyncBlobs.clear();
-}
+            arUpdateSent[i] = true;
+            bSend = true;
+        }
+    }
+    strBody += "}";
 
-void CSyncSource::syncClientChanges()
-{
-    const char* arUpdateTypes[] = {"create", "update", "delete"};
-    for( int i = 0; i < 3 && getSync().isContinueSync(); i++ )
+    if ( bSend )
     {
-        String strUrl = getUrl() + "/" + arUpdateTypes[i];
-        strUrl += "objects";
-        String strQuery = CSyncEngine::SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID();
+        LOG(INFO) + "Push client changes to server. Source: " + getName() + "Size :" + strBody.length();
+        LOG(TRACE) + "Push body: " + strBody;		
 
-        m_arSyncBlobs.removeAllElements();
-        String strBody;
-        makePushBody(strBody, arUpdateTypes[i]);
-        if ( strBody.length() > 0 )
+        if ( m_arMultipartItems.size() > 0 )
         {
-		    LOG(INFO) + "Push client changes to server. Source: " + getName() + "Size :" + strBody.length();
-		    LOG(TRACE) + "Push body: " + strBody;		
- 
-            NetResponse( resp, getNet().pushData(strUrl+strQuery,strBody, &getSync()) );
+            CMultipartItem* pItem = new CMultipartItem();
+            CMultipartItem& oItem = *pItem;
+            oItem.m_strBody = strBody;
+            //oItem.m_strContentType = getProtocol().getContentType();
+            oItem.m_strName = "cud";
+            m_arMultipartItems.addElement(pItem);
+
+            NetResponse( resp, getNet().pushMultipartData( getProtocol().getClientChangesUrl(), m_arMultipartItems, &getSync(), null) );
             if ( !resp.isOK() )
             {
                 getSync().setState(CSyncEngine::esStop);
                 m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-                continue;
             }
-        }
- 
-        if ( m_arSyncBlobs.size() > 0 )
+        }else
         {
-		    LOG(INFO) + "Push blobs to server. Source: " + getName() + "Count :" + m_arSyncBlobs.size();
-            //oo conflicts
-            if ( i < 1 ) //create
-                getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=?) and sent=1", 
-                    getID(), arUpdateTypes[i], "blob.file" );
-            else
-            //
-                getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=? and sent=1)", 
-                    getID(), arUpdateTypes[i], "blob.file" );
+            NetResponse( resp, getNet().pushData( getProtocol().getClientChangesUrl(), strBody, &getSync()) );
+            if ( !resp.isOK() )
+            {
+                getSync().setState(CSyncEngine::esStop);
+                m_nErrCode = RhoRuby.ERR_REMOTESERVER;
+            }
+        }
+    }
 
-            syncClientBlobs(strUrl+strQuery);
-        }else if ( strBody.length() > 0 )
+    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
+    {
+        if ( arUpdateSent[i] )
         {
             //oo conflicts
             if ( i < 1 ) //create
@@ -214,21 +248,20 @@ void CSyncSource::syncClientChanges()
                 getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
         }
     }
+
+    m_arMultipartItems.removeAllElements();
+    m_arBlobAttrs.removeAllElements();
 }
 
-/*
- * Construct the body of the request by filtering 
- * the attr_filter string. The body format should
- * look like the following:
- * create: attrvals[][attrib]=<name|industry>&attrvals[][object]=<locallygeneratedid>&attrvals[][value]=<some value>
- * update: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid>&attrvals[][value]=<some new value>
- * delete: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid>
- */
-void CSyncSource::makePushBody(String& strBody, const char* szUpdateType)
+//{"source_name":"SampleAdapter","client_id":1,"create":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
+//{"source_name":"SampleAdapter","client_id":1,"update":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
+//{"source_name":"SampleAdapter","client_id":1,"delete":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
+//{"source_name":"SampleAdapter","client_id":1,"delete":{"3":{"brand":"HTC","name":"Fuze","price":"299.99"}},"create":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}},"update":{"2":{"brand":"Android","name":"G2","price":"99.99"}}}
+void CSyncSource::makePushBody_Ver3(String& strBody, const String& strUpdateType)
 {
     getDB().Lock();
-    DBResult( res , getDB().executeSQL("SELECT attrib, object, value, attrib_type, main_id "
-					 "FROM changed_values where source_id=? and update_type =? and sent<=1 ORDER BY sent DESC", getID(), szUpdateType ) );
+    DBResult( res , getDB().executeSQL("SELECT attrib, object, value, attrib_type "
+        "FROM changed_values where source_id=? and update_type =? and sent<=1 ORDER BY object", getID(), strUpdateType.c_str() ) );
 
     if ( res.isEnd() )
     {
@@ -236,64 +269,67 @@ void CSyncSource::makePushBody(String& strBody, const char* szUpdateType)
         return;
     }
 
+    String strCurObject = "";
+    boolean bFirst = true;
     for( ; !res.isEnd(); res.next() )
     {
-        String strSrcBody = "attrvals[][attrib]=" + res.getStringByIdx(0);
-
-        if ( res.getStringByIdx(1).length() > 0 ) 
-            strSrcBody += "&attrvals[][object]=" + res.getStringByIdx(1);
-
-        uint64 main_id = res.getUInt64ByIdx(4);
-        if ( main_id != 0 )
-            strSrcBody += "&attrvals[][id]=" + convertToStringA(main_id);
-
+        String strAttrib = res.getStringByIdx(0);
+        String strObject = res.getStringByIdx(1);
         String value = res.getStringByIdx(2);
         String attribType = res.getStringByIdx(3);
 
-        //if ( value.length() > 0 )
+        if ( attribType.compare("blob.file") == 0 )
         {
-            if ( attribType == "blob.file" )
-            {
-                common::CFilePath oBlobPath(value);
-                strSrcBody += "&attrvals[][value]=";
-                strSrcBody += oBlobPath.getBaseName();
-                strSrcBody += "&attrvals[][attrib_type]=blob";
-
-				if ( value.length() > 0 )
-                    m_arSyncBlobs.addElement(new CSyncBlob(strSrcBody,value));
-                continue;
-            }else
-                strSrcBody += "&attrvals[][value]=" + value;
+            CMultipartItem* pItem = new CMultipartItem();
+            CMultipartItem& oItem = *pItem;
+            oItem.m_strFilePath = RHODESAPP().resolveDBFilesPath(value);
+            oItem.m_strContentType = "application/octet-stream";
+            oItem.m_strName = strAttrib + "-" + strObject;
+
+            m_arBlobAttrs.addElement(strAttrib);
+            m_arMultipartItems.addElement(pItem);
         }
 
-        if ( strBody.length() > 0 )
-            strBody += "&";
+        if ( strBody.length() == 0 )
+            strBody += "\"" + strUpdateType + "\":{";
 
-        strBody += strSrcBody;
-    }
+        if ( strObject.compare(strCurObject) != 0 )
+        {
+            if ( strCurObject.length() > 0 )
+            {
+                if ( !bFirst )
+                    strBody += "}";
+                strBody += ",";
+            }
 
-    getDB().executeSQL("UPDATE changed_values SET sent=1 WHERE source_id=? and update_type=? and sent=0", getID(), szUpdateType );
-    getDB().Unlock();
-}
+            bFirst = true;
+            strBody += "\"" + strObject + "\"";
+            strCurObject = strObject;
+        }
+            
+        if (!bFirst)
+            strBody += ",";
 
-void CSyncSource::getAndremoveAsk()
-{
-    String askParams = "";
-    {
-        DBResult( res , getDB().executeSQL("SELECT object, attrib, value "
-			     "FROM changed_values WHERE source_id=? and update_type =?", getID(), "ask" ) );
-        if ( !res.isEnd() )
+        if ( strAttrib.length() > 0  )
         {
-            askParams = res.getStringByIdx(2);
+            if ( bFirst )
+                strBody += ":{";
 
-            getDB().executeSQL("DELETE FROM object_values WHERE object=? and attrib=? and source_id=?", 
-                res.getStringByIdx(0), res.getStringByIdx(1), getID() );
+            strBody += "\"" + strAttrib + "\":\"" + value + "\"";
+            bFirst = false;
         }
     }
 
-    getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=?", getID(), "ask" );
+    if ( strBody.length() > 0 )
+    {
+        if ( !bFirst )
+            strBody += "}";
+
+        strBody += "}";
+    }
 
-    setAskParams(askParams);
+    getDB().executeSQL("UPDATE changed_values SET sent=1 WHERE source_id=? and update_type=? and sent=0", getID(), strUpdateType.c_str() );
+    getDB().Unlock();
 }
 
 void CSyncSource::syncServerChanges()
@@ -303,25 +339,11 @@ void CSyncSource::syncServerChanges()
     while( getSync().isContinueSync() )
     {
         setCurPageCount(0);
-        String strUrl = getUrl();
-        if ( m_strAction.length() > 0 )
-            strUrl = CFilePath::join( strUrl, m_strAction);
-
-        String strQuery = getSync().SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID() + 
-                "&p_size=" + getSync().SYNC_PAGE_SIZE() + "&version=" + convertToStringA(getSync().SYNC_VERSION());
-        if ( m_strParams.length() > 0 )
-            strQuery += m_strParams;
-        if( m_strUrlParams.length() > 0 )
-	        strQuery += "&" + m_strUrlParams;
-
-        if ( getAskParams().length() > 0 )
-        {
-            strUrl +=  getSync().SYNC_ASK_ACTION();
-            strQuery += "&question=" + getAskParams();
-        }
+        String strUrl = getProtocol().getServerQueryUrl("");
+        String strQuery = getProtocol().getServerQueryBody(getName(), getSync().getClientID(), getSync().getSyncPageSize());
 
         if ( !m_bTokenFromDB && getToken() > 1 )
-            strQuery += "&ack_token=" + convertToStringA(getToken());
+            strQuery += "&token=" + convertToStringA(getToken());
 
 		LOG(INFO) + "Pull changes from server. Url: " + (strUrl+strQuery);
         PROF_START("Net");	    
@@ -331,61 +353,29 @@ void CSyncSource::syncServerChanges()
         if ( !resp.isOK() )
         {
             getSync().stopSync();
-			if (resp.isResponseRecieved())
-				m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-			else
-				m_nErrCode = RhoRuby.ERR_NETWORK;
+			m_nErrCode = RhoRuby.getErrorFromResponse(resp);
             continue;
         }
 
-        processServerData(resp.getCharData());
-
-		//String strData =
-        //"[{count:10},{version:1},{total_count: 5425},{token: 123},{s:\"RhoDeleteSource\",ol:[{o:\"rho_del_obj\",av:[{i:55550425},{i:75665819},{i:338165272},{i:402396629},{i:521753981},{i:664143530},{i:678116186},{i:831092394},{i:956041217},{i:970452458}]}]}]";
-		/*"[{count: 124},{version: 1},{total_count: 5425},{token: 123},"
-        "{s:\"Product\",ol:["
-		"{oo:\"123\",o:\"2ed2e0c7-8c4c-99c6-1b37-498d250bb8e7\",av:["
-		"{a:\"first_name\",i:47354289,v:\"Lars. \n\n Burgess\", t:\"blob\"},"
-        "{a:\"second_name\",i:55555,v:\"Burgess\"}]},"
-        "{oo:\"456\", e:\"Something went wrong creating this record on the backend: code 7\"}"
-        "]}]"; */
-		/*"[{count: 1},{version: 1},{total_count: 1},{token: 123},"
-        "{s:\"Product\",ol:["
-        "{oo:\"94\", e:\"Something went wrong creating this record on the backend: code 7\"}"
-        "]}]";*/
-		/*"[{count: 1},{version: 1},{total_count: 1},{token: 123},"
-        "{s:\"Product\",ol:["
-        "{o:\"94\", av:["
-        "{a:\"TEST\",i:55555,v:\"Geny\"}]},"
-        "]}]";
-
-		//u:\"query\",  
-		processServerData(strData.c_str()); */
-
-        if ( getAskParams().length() > 0 || getCurPageCount() == 0 )
+        const char* szData = resp.getCharData();
+        
+        //const char* szData = "[{\"version\":3},{\"token\":\"35639160294387\"},{\"count\":3},{\"progress_count\":0},{\"total_count\":3},{\"metadata\":\"{\\\"foo\\\":\\\"bar\\\"}\",\"insert\":{\"1\":{\"price\":\"199.99\",\"brand\":\"Apple\",\"name\":\"iPhone\"}}}]";
+
+        PROF_START("Parse");
+        CJSONArrayIterator oJsonArr(szData);
+        PROF_STOP("Parse");
+
+        processServerResponse_ver3(oJsonArr);
+
+        if ( getToken() == 0 )
             break;
     }
 }
 
-void CSyncSource::processServerData(const char* szData)
+void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
 {
-    PROF_START("Parse");
-    CJSONArrayIterator oJsonArr(szData);
-    PROF_STOP("Parse");
     PROF_START("Data1");
-    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("error") )
-    {
-        m_strError = oJsonArr.getCurItem().getString("error");
-        m_nErrCode = RhoRuby.ERR_CUSTOMSYNCSERVER;
-        getSync().stopSync();
-        return;
-    }
 
-    if ( !oJsonArr.isEnd() )
-    {
-        setCurPageCount(oJsonArr.getCurItem().getInt("count"));
-        oJsonArr.next();
-    }
     int nVersion = 0;
     if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("version") )
     {
@@ -393,18 +383,43 @@ void CSyncSource::processServerData(const char* szData)
         oJsonArr.next();
     }
 
-    if ( nVersion != getSync().SYNC_VERSION() )
+    if ( nVersion != getProtocol().getVersion() )
     {
-        LOG(ERROR) + "Sync server send data with incompatible version. Client version: " + convertToStringA(getSync().SYNC_VERSION()) +
+        LOG(ERROR) + "Sync server send data with incompatible version. Client version: " + convertToStringA(getProtocol().getVersion()) +
             "; Server response version: " + convertToStringA(nVersion) + ". Source name: " + getName();
         getSync().stopSync();
         m_nErrCode = RhoRuby.ERR_SYNCVERSION;
         return;
     }
 
-    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("rt") )
+    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("source") )
+    {
+        //skip it. it uses in search only
+        oJsonArr.next();
+    }
+
+    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("token"))
+    {
+        processToken(oJsonArr.getCurItem().getUInt64("token"));
+        oJsonArr.next();
+    }
+
+    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("count") )
     {
-        setRefreshTime(oJsonArr.getCurItem().getInt("rt"));
+        setCurPageCount(oJsonArr.getCurItem().getInt("count"));
+        oJsonArr.next();
+    }
+
+    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("refresh_time") )
+    {
+        setRefreshTime(oJsonArr.getCurItem().getInt("refresh_time"));
+        oJsonArr.next();
+    }
+
+    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("progress_count") )
+    {
+        //TODO: progress_count
+        //setTotalCount(oJsonArr.getCurItem().getInt("progress_count"));
         oJsonArr.next();
     }
 
@@ -413,19 +428,25 @@ void CSyncSource::processServerData(const char* szData)
         setTotalCount(oJsonArr.getCurItem().getInt("total_count"));
         oJsonArr.next();
     }
+
+   /* if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("source-error") )
+    {
+        CJSONEntry oJsonErr = oJsonArr.getCurItem().getEntry("source-error");
+        m_strError = oJsonErr.getString("message");
+        m_nErrCode = RhoRuby.ERR_CUSTOMSYNCSERVER;
+        getSync().stopSync();
+        return;
+    }*/
+
     //if ( getServerObjectsCount() == 0 )
     //    getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "");
 
-    if ( !oJsonArr.isEnd() )
-    {
-        processToken(oJsonArr.getCurItem().getUInt64("token"));
-        oJsonArr.next();
-    }else if ( getCurPageCount() == 0 )
+    if ( getToken() == 0 )
     {
         //oo conflicts
         getDB().executeSQL("DELETE FROM changed_values where source_id=? and sent>=3", getID() );
         //
-        processToken(0);
+
     }
 
 	LOG(INFO) + "Got " + getCurPageCount() + "(Processed: " +  getServerObjectsCount() + ") records of " + getTotalCount() + " from server. Source: " + getName()
@@ -434,22 +455,34 @@ void CSyncSource::processServerData(const char* szData)
     PROF_STOP("Data1");
     if ( !oJsonArr.isEnd() && getSync().isContinueSync() )
     {
+        CJSONEntry oCmds = oJsonArr.getCurItem();
         PROF_START("Data");
-        //TODO: support DBExceptions
-        getDB().startTransaction();
+        //TODO: use isUIWaitDB inside processSyncCommand
+        //    if ( getDB().isUIWaitDB() )
+        //    {
+		//        LOG(INFO) + "Commit transaction because of UI request.";
+        //        getDB().endTransaction();
+        //        getDB().startTransaction();
+        //    }
 
-        int nSavedPos = oJsonArr.getCurPos();
-        setSyncServerDataPass(edpNone);
-        processServerData_Ver1(oJsonArr);
+        getDB().startTransaction();
+        if ( oCmds.hasName("metadata") && getSync().isContinueSync() )
+        {
+            String strMetadata = oCmds.getString("metadata");
+            getDB().executeSQL("UPDATE sources SET metadata=? WHERE source_id=?", strMetadata, getID() );
+        }
+        if ( oCmds.hasName("links") && getSync().isContinueSync() )
+            processSyncCommand("links", oCmds.getEntry("links") );
+        if ( oCmds.hasName("delete") && getSync().isContinueSync() )
+            processSyncCommand("delete", oCmds.getEntry("delete") );
+        if ( oCmds.hasName("insert") && getSync().isContinueSync() )
+            processSyncCommand("insert", oCmds.getEntry("insert") );
 
-        setSyncServerDataPass(edpDeleteObjects);
-        oJsonArr.reset(nSavedPos);
-        processServerData_Ver1(oJsonArr);
+        PROF_STOP("Data");
 
-	    PROF_STOP("Data");		    
-    	PROF_START("DB");
+	    PROF_START("DB");
         getDB().endTransaction();
-	    PROF_STOP("DB");
+        PROF_STOP("DB");
 
         getNotify().fireObjectsNotification();
     }
@@ -460,162 +493,290 @@ void CSyncSource::processServerData(const char* szData)
 	PROF_STOP("Data1");
 }
 
-boolean CSyncSource::processSyncObject_ver1(CJSONEntry oJsonObject, int nSrcID)//throws Exception
+void CSyncSource::processSyncCommand(const String& strCmd, CJSONEntry oCmdEntry)
 {
-    const char* strOldObject = oJsonObject.getString("oo");
-    if ( isDeleteObjectsPass() != (nSrcID < 0) )
-        return true;
+    CJSONStructIterator objIter(oCmdEntry);
 
-    if ( oJsonObject.hasName("e") )
+    for( ; !objIter.isEnd() && getSync().isContinueSync(); objIter.next() )
     {
-        const char* strError = oJsonObject.getString("e");
-        getNotify().addCreateObjectError(nSrcID,strOldObject,strError);
-        return true;
-    }
+        String strObject = objIter.getCurKey();
+        CJSONStructIterator attrIter( objIter.getCurValue() );
+        if ( m_bSchemaSource )
+            processServerCmd_Ver3_Schema(strCmd,strObject,attrIter);
+        else
+        {
+            for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+            {
+                String strAttrib = attrIter.getCurKey();
+                String strValue = attrIter.getCurString();
 
-	const char* strObject = oJsonObject.getString("o");
-	CJSONArrayIterator oJsonArr(oJsonObject, "av");
-    //oo conflicts
-    boolean bUpdatedOO = false;
-    //
-    for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() )
-	{
-		CJSONEntry oJsonEntry = oJsonArr.getCurItem();
-        if ( oJsonEntry.isEmpty() )
-        	continue;
+                processServerCmd_Ver3(strCmd,strObject,strAttrib,strValue);
+            }
+        }
 
-        if ( nSrcID >= 0 ) //insert
+        int nSyncObjectCount  = getNotify().incLastSyncObjectCount(getID());
+        if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
+            getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "");
+
+        if ( getDB().isUIWaitDB() )
         {
-    	    CValue value(oJsonEntry,1);
-    	    if ( !downloadBlob(value) )
-    		    return false;
+	        LOG(INFO) + "Commit transaction because of UI request.";
+            getDB().endTransaction();
+            CSyncThread::getInstance()->sleep(1000);
+            getDB().startTransaction();
+        }
 
-            String strAttrib = oJsonEntry.getString("a");
-            //oo conflicts
-            if ( strOldObject != null && !bUpdatedOO )
-            {
-                getDB().executeSQL("UPDATE object_values SET object=? where object=? and source_id=?", strObject, strOldObject, nSrcID );
-                getDB().executeSQL("UPDATE changed_values SET object=? where object=? and source_id=?", strObject, strOldObject, nSrcID );
+    }
+}
 
-                getNotify().onObjectChanged(nSrcID,strOldObject, CSyncNotify::enCreate);
+void CSyncSource::processLinks(const String& strOldObject, const String& strNewObject)
+{
+    for ( Hashtable<String,String>::iterator it = m_hashLinks.begin();  it != m_hashLinks.end(); ++it )
+    {
+        CSyncSource* pSrc = getSync().findSourceByName(it->first);
+        if ( pSrc != null )
+            pSrc->updateLink(strOldObject, strNewObject, it->second);
+    }
+}
 
-                bUpdatedOO = true;
-            }
+void CSyncSource::updateLink(const String& strOldObject, const String& strNewObject, const String& strAttrib)
+{
+    if ( m_bSchemaSource )
+    {
+        String strSqlUpdate = "UPDATE ";
+        strSqlUpdate += getName() + " SET " + strAttrib + "=? where " + strAttrib + "=?";
 
-            DBResult(resInsert, getDB().executeSQLReportNonUnique("INSERT INTO object_values \
-                (id, attrib, source_id, object, value, attrib_type) VALUES(?,?,?,?,?,?)", 
-                value.m_nID, strAttrib, nSrcID, strObject,
-                value.m_strValue, value.m_strAttrType ) );
-            if ( resInsert.isNonUnique() )
-            {
-                getDB().executeSQL("UPDATE object_values \
-                    SET id=?, value=?, attrib_type=? WHERE object=? and attrib=? and source_id=?", 
-                    value.m_nID, value.m_strValue, value.m_strAttrType,
-                    strObject, strAttrib, nSrcID );
-
-                // oo conflicts
-                getDB().executeSQL("UPDATE changed_values SET main_id=? where object=? and attrib=? and source_id=? and sent<=1", value.m_nID, strObject, strAttrib, nSrcID );
-                getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", strObject, strAttrib, nSrcID );
-                //
-            }
+        getDB().executeSQL(strSqlUpdate.c_str(), strNewObject, strOldObject );
+    }
+    else
+        getDB().executeSQL("UPDATE object_values SET value=? where attrib=? and source_id=? and value=?", 
+            strNewObject, strAttrib, getID(), strOldObject );
 
-            getNotify().onObjectChanged(nSrcID,strObject, CSyncNotify::enUpdate);
+    getDB().executeSQL("UPDATE changed_values SET value=? where attrib=? and source_id=? and value=?", 
+        strNewObject, strAttrib, getID(), strOldObject );
+}
 
-            m_nInserted++;
-        }else
+void CSyncSource::processServerCmd_Ver3_Schema(const String& strCmd, const String& strObject, CJSONStructIterator& attrIter)//throws Exception
+{
+    if ( strCmd.compare("insert") == 0 )
+    {
+        Vector<String> vecValues, vecAttrs;
+        String strCols = "", strQuest = "", strSet = "";
+        for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
         {
-            uint64 id = oJsonEntry.getUInt64("i");
-            DBResult( res , getDB().executeSQL("SELECT source_id, object FROM object_values where id=?", id ));
-            if ( !res.isEnd() )
-            {
-                int nDelSrcID = res.getIntByIdx(0);
-                String strDelObject = res.getStringByIdx(1);
-                getDB().executeSQL("DELETE FROM object_values where id=?", id );
-                getNotify().onObjectChanged(nDelSrcID, strDelObject, CSyncNotify::enDelete);
-            }
-            // oo conflicts
-            getDB().executeSQL("UPDATE changed_values SET sent=3 where main_id=?", id );
-            //
+            CAttrValue oAttrValue(attrIter.getCurKey(),attrIter.getCurString());
+            if ( !processBlob(strCmd,strObject,oAttrValue) )
+                continue;
 
-            m_nDeleted++;
+            if ( strCols.length() > 0 )
+                strCols += ",";
+            if ( strQuest.length() > 0)
+                strQuest += ",";
+            if ( strSet.length() > 0)
+                strSet += ",";
+
+            strCols += oAttrValue.m_strAttrib;
+            strQuest += "?";
+            strSet += oAttrValue.m_strAttrib + "=?";
+            vecAttrs.addElement(oAttrValue.m_strAttrib);
+            vecValues.addElement(oAttrValue.m_strValue);
         }
-	}
-	
-	return true;
-}
+        vecValues.addElement(strObject);
+        if ( strCols.length() > 0 )
+            strCols += ",";
+        if ( strQuest.length() > 0)
+            strQuest += ",";
 
-void CSyncSource::processServerData_Ver1(CJSONArrayIterator& oJsonArr)
-{
-    for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() )
-    {
-        CJSONEntry oJsonSource = oJsonArr.getCurItem();
-        String strSrcName = oJsonSource.getString("s");
-        int nSrcID = getID();
-        if ( strSrcName.compare("RhoDeleteSource") == 0 )
-            nSrcID = -1;
-        else if ( strSrcName.compare(getName()) != 0 )
+        strCols += "object";
+        strQuest += "?";
+
+        String strSqlInsert = "INSERT INTO ";
+        strSqlInsert += getName() + " (";
+        strSqlInsert += strCols + ") VALUES(" + strQuest + ")";
+
+        if ( !getSync().isContinueSync() )
+            return;
+
+        DBResult(resInsert, getDB().executeSQLReportNonUniqueEx(strSqlInsert.c_str(), vecValues ) );
+        if ( resInsert.isNonUnique() )
         {
-            CSyncSource* pSrc = getSync().findSourceByName(strSrcName);
-            if ( pSrc == null )
+            String strSqlUpdate = "UPDATE ";
+            strSqlUpdate += getName() + " SET " + strSet + " WHERE object=?";
+            getDB().executeSQLEx(strSqlUpdate.c_str(), vecValues);
+
+            // oo conflicts
+            for( int i = 0; i < (int)vecAttrs.size(); i++ )
             {
-                LOG(ERROR) + "Sync server send data for unknown source name:" + strSrcName;
-                getSync().stopSync();
-                m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
-                break;
+                getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", 
+                    strObject, vecAttrs.elementAt(i), getID() );
             }
-            nSrcID = pSrc->getID();
+            //
         }
 
-        CJSONArrayIterator oJsonObjList(oJsonSource, "ol");
-        for( ; !oJsonObjList.isEnd() && getSync().isContinueSync(); oJsonObjList.next() )
+        getNotify().onObjectChanged(getID(),strObject, CSyncNotify::enUpdate);
+        m_nInserted++;
+    }else if (strCmd.compare("delete") == 0)
+    {
+        Vector<String> vecAttrs;
+        String strSet = "";
+        for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
         {
-            if ( getDB().isUIWaitDB() )
-            {
-		        LOG(INFO) + "Commit transaction because of UI request.";
-                getDB().endTransaction();
-                getDB().startTransaction();
-            }
+            CAttrValue oAttrValue(attrIter.getCurKey(),attrIter.getCurString());
+
+            if ( strSet.length() > 0 )
+                strSet += ",";
+
+            vecAttrs.addElement(oAttrValue.m_strAttrib);
+            strSet += oAttrValue.m_strAttrib + "=NULL";
+        }
+
+        String strSqlUpdate = "UPDATE ";
+        strSqlUpdate += getName() + " SET " + strSet + " WHERE object=?";
 
-            CJSONEntry oJsonObject = oJsonObjList.getCurItem();
-            if( !processSyncObject_ver1(oJsonObject,nSrcID))
+        if ( strSet.length() == 0 || !getSync().isContinueSync() )
+            return;
+
+        getDB().executeSQL(strSqlUpdate.c_str(), strObject);
+        //Remove item if all nulls
+        String strSelect = String("SELECT * FROM ") + getName() + " WHERE object=?";
+        DBResult(res, getDB().executeSQL( strSelect.c_str(), strObject ) );
+        if ( !res.isEnd() )
+        {
+            boolean bAllNulls = true;
+            for( int i = 0; i < res.getColCount(); i ++)
             {
-                getSync().stopSync();
-                break;
+                if ( !res.isNullByIdx(i) && res.getColName(i).compare("object")!=0 )
+                {
+                    bAllNulls = false;
+                    break;
+                }
             }
 
-            if ( !isDeleteObjectsPass() && nSrcID >=0 )
+            if (bAllNulls)
             {
-                int nSyncObjectCount  = getNotify().incLastSyncObjectCount(nSrcID);
-
-                if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
-                    getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "");
+                String strDelete = String("DELETE FROM ") + getName() + " WHERE object=?";
+                getDB().executeSQL( strDelete.c_str(), strObject);
             }
+        }
 
-            m_bGetAtLeastOnePage = true;
+        getNotify().onObjectChanged(getID(), strObject, CSyncNotify::enDelete);
+        // oo conflicts
+        for( int i = 0; i < (int)vecAttrs.size(); i++ )
+        {
+            getDB().executeSQL("UPDATE changed_values SET sent=3 where object=? and attrib=? and source_id=?", 
+                strObject, vecAttrs.elementAt(i), getID() );
         }
+        //
+
+        m_nDeleted++;
+    }else if ( strCmd.compare("links") == 0 )
+    {
+        String strValue = attrIter.getCurString();
+        processLinks(strObject, strValue);
+
+        String strSqlUpdate = "UPDATE ";
+        strSqlUpdate += getName() + " SET object=? WHERE object=?";
+        getDB().executeSQL(strSqlUpdate.c_str(), strValue, strObject);
+
+        getDB().executeSQL("UPDATE changed_values SET object=?,sent=3 where object=? and source_id=?", strValue, strObject, getID() );
+        getNotify().onObjectChanged(getID(), strObject, CSyncNotify::enCreate);
     }
+
 }
 
-CValue::CValue(json::CJSONEntry& oJsonEntry)//throws JSONException
+boolean CSyncSource::processBlob( const String& strCmd, const String& strObject, CAttrValue& oAttrValue )
 {
-	m_strValue = oJsonEntry.getString("value");
-	const char* szAttribType = oJsonEntry.getString("attrib_type");
-    m_strAttrType = szAttribType ? szAttribType : "";
-	m_nID = oJsonEntry.getUInt64("id");
+    //TODO: when server return delete with rhoblob postfix - delete isBlobAttr
+    if ( !(oAttrValue.m_strBlobSuffix.length() > 0 || getDB().getAttrMgr().isBlobAttr(getID(), oAttrValue.m_strAttrib.c_str())) )
+        return true;
+
+    boolean bDownload = true;
+    String strDbValue = "";
+    if ( !getDB().getAttrMgr().isOverwriteBlobFromServer(getID(), oAttrValue.m_strAttrib) )
+    {
+        if ( m_bSchemaSource )
+        {
+            String strSelect = String("SELECT ") + oAttrValue.m_strAttrib + " FROM " + getName() + " WHERE object=?";
+            DBResult(res, getDB().executeSQL( strSelect.c_str(), strObject));
+            if (!res.isEnd())
+            {
+                strDbValue = res.getStringByIdx(0);
+                bDownload = strDbValue.length() == 0;
+            }
+        }else
+        {
+            DBResult(res, getDB().executeSQL(
+                "SELECT value FROM object_values WHERE object=? and attrib=? and source_id=?",
+                strObject, oAttrValue.m_strAttrib, getID() ) );
+            if (!res.isEnd())
+            {
+                strDbValue = res.getStringByIdx(0);
+                bDownload = strDbValue.length() == 0;
+            }
+        }
+    }
+
+    if ( bDownload )
+    {
+        getDB().endTransaction();
+        boolean bRes = downloadBlob(oAttrValue);
+        getDB().startTransaction();
+
+        return bRes;
+    }
+
+    oAttrValue.m_strValue = strDbValue;
+    return true;
 }
 
-CValue::CValue(json::CJSONEntry& oJsonEntry, int nVer)//throws JSONException
+void CSyncSource::processServerCmd_Ver3(const String& strCmd, const String& strObject, const String& strAttriba, const String& strValuea)//throws Exception
 {
-    if ( nVer == 1 )
+    CAttrValue oAttrValue(strAttriba,strValuea);
+
+    if ( strCmd.compare("insert") == 0 )
+    {
+        if ( !processBlob(strCmd,strObject,oAttrValue) )
+            return;
+
+        DBResult(resInsert, getDB().executeSQLReportNonUnique("INSERT INTO object_values \
+            (attrib, source_id, object, value) VALUES(?,?,?,?)", 
+            oAttrValue.m_strAttrib, getID(), strObject, oAttrValue.m_strValue ) );
+        if ( resInsert.isNonUnique() )
+        {
+            getDB().executeSQL("UPDATE object_values \
+                SET value=? WHERE object=? and attrib=? and source_id=?", 
+                oAttrValue.m_strValue, strObject, oAttrValue.m_strAttrib, getID() );
+
+            // oo conflicts
+            getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", 
+                strObject, oAttrValue.m_strAttrib, getID() );
+            //
+        }
+
+        getNotify().onObjectChanged(getID(),strObject, CSyncNotify::enUpdate);
+        m_nInserted++;
+    }else if (strCmd.compare("delete") == 0)
     {
-	    m_strValue = oJsonEntry.getString("v");
-	    const char* szAttribType = oJsonEntry.getString("t");
-        m_strAttrType = szAttribType ? szAttribType : "";
-	    m_nID = oJsonEntry.getUInt64("i");
+        getDB().executeSQL("DELETE FROM object_values where object=? and attrib=? and source_id=?", strObject, oAttrValue.m_strAttrib, getID() );
+        getNotify().onObjectChanged(getID(), strObject, CSyncNotify::enDelete);
+        // oo conflicts
+        getDB().executeSQL("UPDATE changed_values SET sent=3 where object=? and attrib=? and source_id=?", strObject, oAttrValue.m_strAttrib, getID() );
+        //
+
+        m_nDeleted++;
+    }else if ( strCmd.compare("links") == 0 )
+    {
+        processLinks(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() );
+
+        getNotify().onObjectChanged(getID(), strObject, CSyncNotify::enCreate);
     }
+
 }
 
-String CSyncSource::makeFileName(const CValue& value)//throws Exception
+String CSyncSource::makeFileName(const CAttrValue& value)//throws Exception
 {
 	String strExt = ".bin";
 
@@ -655,16 +816,25 @@ String CSyncSource::makeFileName(const CValue& value)//throws Exception
     if ( szExt[0] )
         strExt = szExt;
 
-	String fName = RHODESAPP().getBlobsDirPath() + "/id_" + convertToStringA(value.m_nID) + strExt;
+    String fName = RHODESAPP().getBlobsDirPath() + "/id_" + CLocalTime().toString(true,true) + strExt;
 	
 	return  fName;
 }
 
-boolean CSyncSource::downloadBlob(CValue& value)//throws Exception
+CAttrValue::CAttrValue(const String& strAttrib, const String& strValue)
+{
+    m_strAttrib = strAttrib;
+    m_strValue = strValue;
+
+	if ( String_endsWith(m_strAttrib,"-rhoblob")  )
+    {
+		m_strBlobSuffix = "-rhoblob";
+        m_strAttrib = m_strAttrib.substr(0,m_strAttrib.length()-m_strBlobSuffix.length());
+    }
+}
+
+boolean CSyncSource::downloadBlob(CAttrValue& value)//throws Exception
 {
-	if ( value.m_strAttrType != "blob.url"  )
-		return true;
-	
 	String fName = makeFileName( value );
 	String url = value.m_strValue;
 	const char* nQuest = strchr(url.c_str(),'?');
@@ -677,19 +847,13 @@ boolean CSyncSource::downloadBlob(CValue& value)//throws Exception
     NetResponse(resp, getNet().pullFile(url, fName, &getSync(), null));
     if ( !resp.isOK() )
     {
-		if (resp.isResponseRecieved())
-			m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-		else
-			m_nErrCode = RhoRuby.ERR_NETWORK;
+        getSync().stopSync();
+		m_nErrCode = RhoRuby.getErrorFromResponse(resp);
         //m_strError = resp.getCharData();
-
         return false;
     }
 
-    value.m_strAttrType = "blob.file";
-
-    String strAppsPath = RHODESAPP().getRhoRootPath() + "apps";
-    value.m_strValue = fName.substr(strAppsPath.length());
+    value.m_strValue = CFilePath::getRelativePath( fName, RHODESAPP().getRhoRootPath());
     
     return true;
 }