rhodes 2.4.1 → 3.0.0.beta.1

data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c

@@ -265,8 +265,10 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self)
                 case T_STRING:
                     sqlite3_bind_text(statement, i+1, RSTRING_PTR(arg), RSTRING_LEN(arg), SQLITE_TRANSIENT);
                     break;
-                case T_FIXNUM:
                 case T_FLOAT:
+                    sqlite3_bind_double(statement, i+1, NUM2DBL(arg));
+                    break;
+                case T_FIXNUM:
                 case T_BIGNUM:
                     sqlite3_bind_int64(statement, i+1, NUM2LL(arg));
                     break;
@@ -297,6 +299,12 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self)
 			    switch(nColType){
 				    case SQLITE_NULL:
 					    break;
+                    case SQLITE_FLOAT:
+                    {
+                        double dVal = sqlite3_column_double(statement, nCol);
+                        colValue = DBL2NUM(dVal);
+                        break;
+                    }
                     case SQLITE_INTEGER:
                     {
                         sqlite_int64 nVal = sqlite3_column_int64(statement, nCol);

data/platform/shared/ruby/vm_eval.c

@@ -831,6 +831,7 @@ eval_string(VALUE self, VALUE src, VALUE scope, const char *file, int line)
  *     eval "str + ' Fred'", getBinding("bye")   #=> "bye Fred"
  */
 
+int rho_ruby_is_enabled_eval();
 VALUE
 rb_f_eval(int argc, VALUE *argv, VALUE self)
 {
@@ -838,12 +839,12 @@ rb_f_eval(int argc, VALUE *argv, VALUE self)
     VALUE s = rb_gv_get("$_s");
     VALUE sString = rb_funcall(s, rb_intern("to_s"),0);
     char *sockStr = StringValuePtr(sString);
-
-    if( sockStr == NULL || strstr(sockStr,"TCPSocket") == NULL) {
+    if( rho_ruby_is_enabled_eval() == 0 && (sockStr == NULL || strstr(sockStr,"TCPSocket") == NULL)) {
 
       rb_raise(rb_eNotImpError,
           "Not implemented: eval is not supported.");
-    } else {
+    } else 
+    {
 
     VALUE src, scope, vfile, vline;
     const char *file = "(eval)";

data/platform/shared/sync/SyncEngine.cpp

@@ -771,7 +771,7 @@ String CSyncEngine::makeBulkDataFileName(String strDataUrl, String strDbPath, St
     CFilePath oFilePath(strDbPath);
     return oFilePath.changeBaseName(strNewName+strExt);
 }
-
+/*
 int CSyncEngine::getStartSource()
 {
     for( int i = 0; i < (int)m_sources.size(); i++ )
@@ -782,37 +782,36 @@ int CSyncEngine::getStartSource()
     }
 
     return -1;
-}
+}*/
 
-boolean CSyncEngine::syncOneSource(int i)
+void CSyncEngine::syncOneSource(int i)
 {
     CSyncSource& src = *m_sources.elementAt(i);
     if ( src.getSyncType().compare("bulk_sync_only")==0 )
-        return true;
+        return;
 
     if ( isSessionExist() && getState() != esStop )
         src.sync();
 
     getNotify().onSyncSourceEnd(i, m_sources);
 
-    return src.m_nErrCode == RhoAppAdapter.ERR_NONE;
+//    return src.m_nErrCode == RhoAppAdapter.ERR_NONE;
 }
 
 void CSyncEngine::syncAllSources()
 {
-    boolean bError = false;
+//    boolean bError = false;
 
-    int nStartSrc = getStartSource();
-    if ( nStartSrc >= 0 )
-        bError = !syncOneSource(nStartSrc);
+//    int nStartSrc = getStartSource();
+//    if ( nStartSrc >= 0 )
+//        bError = !syncOneSource(nStartSrc);
 
-    //TODO: do not stop on error source
     for( int i = 0; i < (int)m_sources.size() && isContinueSync(); i++ )
     {
-        bError = !syncOneSource(i);
+        /*bError = !*/syncOneSource(i);
     }
 
-    if ( !bError && !isSchemaChanged() )
+    if ( !isSchemaChanged() )
     	getNotify().fireSyncNotification(null, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
 }
 

data/platform/shared/sync/SyncEngine.h

@@ -104,7 +104,7 @@ public:
     void prepareSync(ESyncState eState, const CSourceID* oSrcID);
 
     VectorPtr<CSyncSource*>& getSources(){ return m_sources; }
-    int getStartSource();
+    //int getStartSource();
     String loadClientID();
     String readClientID();
     String requestClientIDByNet();
@@ -136,7 +136,7 @@ private:
     void processServerSources(String strSources);
     void checkSourceAssociations();
 
-    boolean syncOneSource(int i);
+    void syncOneSource(int i);
     void syncAllSources();
 
     friend class CSyncSource;

data/platform/shared/sync/SyncNotify.cpp

@@ -12,7 +12,7 @@ using namespace rho::net;
 using namespace rho::common;
 using namespace rho::db;
 
-String CSyncNotify::m_strObjectNotifyUrl;
+common::CAutoPtr<CObjectNotification> CSyncNotify::m_pObjectNotify;
 common::CMutex CSyncNotify::m_mxObjectNotify;
 
 void CSyncNotify::addObjectNotify(int nSrcID, const String& strObject)
@@ -77,16 +77,13 @@ void CSyncNotify::processSingleObject()
 void CSyncNotify::fireObjectsNotification()
 {
 	String strBody = "";
-    String strUrl = "";
 
     {
         synchronized(m_mxObjectNotify)
 
-        if ( m_strObjectNotifyUrl.length() == 0 )
+        if ( !m_pObjectNotify)
             return;
 
-        strUrl = getNet().resolveUrl(m_strObjectNotifyUrl);
-
         for (HashtablePtr<int, Hashtable<String,int>* >::iterator it = m_hashSrcIDAndObject.begin();  it != m_hashSrcIDAndObject.end(); ++it )
         {
             int nSrcID = it->first;
@@ -133,7 +130,16 @@ void CSyncNotify::fireObjectsNotification()
             return;
     }
 
-    callNotify( CSyncNotification(strUrl,"",false), strBody);
+    if ( m_pObjectNotify->m_strUrl.length() > 0 )
+    {
+        String strUrl = getNet().resolveUrl(m_pObjectNotify->m_strUrl);
+  
+        callNotify( CSyncNotification(strUrl,"",false), strBody);
+    }else if (m_pObjectNotify->m_cCallback)
+    {
+        (*m_pObjectNotify->m_cCallback)(strBody.c_str(), m_pObjectNotify->m_cCallbackData);
+        //callNotify( CSyncNotification(m_pObjectNotify->m_cCallback,m_pObjectNotify->m_cCallbackData,false), strBody);
+    }
 }
 
 void CSyncNotify::onObjectChanged(int nSrcID, const String& strObject, int nType)
@@ -191,19 +197,19 @@ String CSyncNotify::makeCreateObjectErrorBody(int nSrcID)
     return strBody;
 }
 
-void CSyncNotify::setObjectNotifyUrl(String strUrl)
+void CSyncNotify::setObjectNotification(CObjectNotification* pNotify)
 { 
     synchronized(m_mxObjectNotify)
     {
-        m_strObjectNotifyUrl = strUrl; 
+        m_pObjectNotify = pNotify; 
     }
 }
 
-String CSyncNotify::getObjectNotifyUrl()
+CObjectNotification* CSyncNotify::getObjectNotification()
 {
     synchronized(m_mxObjectNotify)
     {
-        return m_strObjectNotifyUrl;
+        return m_pObjectNotify;
     }
 }
 
@@ -211,7 +217,7 @@ void CSyncNotify::onSyncSourceEnd( int nSrc, VectorPtr<CSyncSource*>& sources )
 {
     CSyncSource& src = *sources.elementAt(nSrc);
 
-    if ( getSync().getState() == CSyncEngine::esStop && src.m_nErrCode != RhoAppAdapter.ERR_NONE )
+/*    if ( getSync().getState() == CSyncEngine::esStop && src.m_nErrCode != RhoAppAdapter.ERR_NONE )
     {
 		CSyncNotification* pSN = getSyncNotifyBySrc(&src);
 		if ( pSN != null )
@@ -219,7 +225,7 @@ void CSyncNotify::onSyncSourceEnd( int nSrc, VectorPtr<CSyncSource*>& sources )
 		else
 			fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError, "" );
     }
-    else
+    else*/
         fireSyncNotification(&src, true, src.m_nErrCode, "");
 
     cleanCreateObjectErrors();
@@ -269,7 +275,29 @@ String CSyncNotification::toString()const
 	strRes += m_strParams;
 	return strRes;
 }
-	
+    
+CObjectNotification::CObjectNotification(String strUrl) : 
+   m_cCallback(null), m_cCallbackData(null)
+{
+    m_strUrl = strUrl;
+}
+
+CObjectNotification::~CObjectNotification()
+{
+    if ( m_cCallbackData )
+        rho_free_callbackdata(m_cCallbackData);
+}
+
+String CObjectNotification::toString()const
+{
+    if ( m_cCallback )
+        return "C_Callback";
+    
+    String strRes = "Url :";
+    strRes += m_strUrl;
+    return strRes;
+}
+
 void CSyncNotify::setSearchNotification(CSyncNotification* pNotify )
 {
     LOG(INFO) + "Set search notification." + (pNotify ? pNotify->toString() : "");

data/platform/shared/sync/SyncNotify.h

@@ -35,6 +35,23 @@ struct CSyncNotification
 	~CSyncNotification();
 };
 
+struct CObjectNotification
+{
+    String m_strUrl;
+    RHOC_CALLBACK m_cCallback;
+    void*         m_cCallbackData;
+    
+    CObjectNotification(): m_cCallback(0), m_cCallbackData(0){}
+    
+    CObjectNotification(String strUrl);
+    CObjectNotification(RHOC_CALLBACK callback, void* callback_data) : 
+        m_cCallback(callback), m_cCallbackData(callback_data){}
+    
+    String toString()const;
+    
+    ~CObjectNotification();
+};
+    
 class CSyncNotify
 {
     DEFINE_LOGCLASS;
@@ -46,7 +63,7 @@ private:
 
     CSyncEngine& m_syncEngine;
 
-    static String m_strObjectNotifyUrl;
+    static common::CAutoPtr<CObjectNotification> m_pObjectNotify;
     HashtablePtr<int, Hashtable<String,int>* > m_hashSrcIDAndObject;
     HashtablePtr<int, Hashtable<String,String>* > m_hashCreateObjectErrors;
     String m_strSingleObjectSrcName, m_strSingleObjectID;
@@ -79,8 +96,8 @@ public:
 
     void addObjectNotify(int nSrcID, const String& strObject );
     void addObjectNotify(const String& strSrcName, const String& strObject );
-    static void setObjectNotifyUrl(String strUrl);
-    static String getObjectNotifyUrl();
+    static void setObjectNotification(CObjectNotification* pNotify);
+    static CObjectNotification* getObjectNotification();
     void cleanObjectNotifications();
     void cleanCreateObjectErrors();
 

data/platform/shared/sync/SyncSource.cpp

@@ -116,10 +116,10 @@ void CSyncSource::sync()
     CTimeInterval startTime = CTimeInterval::getCurrentTime();
     //m_bIsSearch = false;
 
-    if ( isTokenFromDB() && getToken() > 1 )
-        syncServerChanges();  //sync only server changes, which was paused before
-    else
-    {
+//    if ( isTokenFromDB() && getToken() > 1 )
+//        syncServerChanges();  //sync only server changes, which was paused before
+//    else
+//    {
         if ( isEmptyToken() )
             processToken(1);
 
@@ -130,7 +130,7 @@ void CSyncSource::sync()
         if ( !bSyncedServer )
             syncServerChanges();
 */
-    }
+//    }
 
     CTimeInterval endTime = CTimeInterval::getCurrentTime();
 
@@ -273,7 +273,7 @@ void CSyncSource::doSyncClientChanges()
     getDB().Lock();
     checkIgnorePushObjects();
 
-    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
+    for( i = 0; i < 3; i++ )
     {
         String strBody1;
         makePushBody_Ver3(strBody1, arUpdateTypes[i], true);
@@ -301,7 +301,7 @@ void CSyncSource::doSyncClientChanges()
 
     getDB().Unlock();
 
-    if ( bSend )
+    if ( bSend && getSync().isContinueSync())
     {
         LOG(INFO) + "Push client changes to server. Source: " + getName() + "Size :" + strBody.length();
         LOG(TRACE) + "Push body: " + strBody;		
@@ -318,7 +318,7 @@ void CSyncSource::doSyncClientChanges()
             NetResponse resp = getNet().pushMultipartData( getProtocol().getClientChangesUrl(), m_arMultipartItems, &getSync(), null);
             if ( !resp.isOK() )
             {
-                getSync().setState(CSyncEngine::esStop);
+                //getSync().stopSync();
                 m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
                 m_strError = resp.getCharData();
             }
@@ -327,19 +327,19 @@ void CSyncSource::doSyncClientChanges()
             NetResponse resp = getNet().pushData( getProtocol().getClientChangesUrl(), strBody, &getSync());
             if ( !resp.isOK() )
             {
-                getSync().setState(CSyncEngine::esStop);
+                //getSync().stopSync();
                 m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
                 m_strError = resp.getCharData();
             }
         }
     }
 
-    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
+    for( i = 0; i < 3 && m_nErrCode == RhoAppAdapter.ERR_NONE; i++ )
     {
         if ( arUpdateSent[i] )
         {
             //oo conflicts
-            if ( i < 1 ) //create
+            if ( i < 1 &&  !getSync().getSourceOptions().getBoolProperty(getID(), "pass_through") ) //create
                 getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
             else
             //
@@ -489,7 +489,8 @@ void CSyncSource::syncServerChanges()
 {
     LOG(INFO) + "Sync server changes source ID :" + getID();
 
-    while( getSync().isContinueSync() )
+    while( getSync().isContinueSync() && 
+           ( m_nErrCode == RhoAppAdapter.ERR_NONE || m_nErrCode == RhoAppAdapter.ERR_CUSTOMSYNCSERVER) )
     {
         setCurPageCount(0);
         String strUrl = getProtocol().getServerQueryUrl("");
@@ -505,7 +506,7 @@ void CSyncSource::syncServerChanges()
 
         if ( !resp.isOK() )
         {
-            getSync().stopSync();
+            //getSync().stopSync();
 		    m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
             m_strError = resp.getCharData();
             continue;
@@ -738,7 +739,7 @@ void CSyncSource::processSyncCommand(const String& strCmd, CJSONEntry oCmdEntry,
             processServerCmd_Ver3_Schema(strCmd,strObject,attrIter);
         else
         {
-            for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+            for( ; !attrIter.isEnd(); attrIter.next() )
             {
                 String strAttrib = attrIter.getCurKey();
                 String strValue = attrIter.getCurString();
@@ -800,11 +801,11 @@ void CSyncSource::processServerCmd_Ver3_Schema(const String& strCmd, const Strin
     {
         Vector<String> vecValues, vecAttrs;
         String strCols = "", strQuest = "", strSet = "";
-        for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+        for( ; !attrIter.isEnd(); attrIter.next() )
         {
             CAttrValue oAttrValue(attrIter.getCurKey(),attrIter.getCurString());
             if ( !processBlob(strCmd,strObject,oAttrValue) )
-                continue;
+                break;
 
             if ( strCols.length() > 0 )
                 strCols += ",";
@@ -876,7 +877,7 @@ void CSyncSource::processServerCmd_Ver3_Schema(const String& strCmd, const Strin
         String strSqlUpdate = "UPDATE ";
         strSqlUpdate += getName() + " SET " + strSet + " WHERE object=?";
 
-        if ( strSet.length() == 0 || !getSync().isContinueSync() )
+        if ( strSet.length() == 0 )
             return;
 
         getDB().executeSQL(strSqlUpdate.c_str(), strObject);
@@ -1095,13 +1096,14 @@ boolean CSyncSource::downloadBlob(CAttrValue& value)//throws Exception
     NetResponse resp = getNet().pullFile(url, fName, &getSync(), null);
     if ( !resp.isOK() )
     {
-        getSync().stopSync();
+        CRhoFile::deleteFile(fName.c_str());
+        //getSync().stopSync();
 		m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
         //m_strError = resp.getCharData();
         return false;
     }
 
-    value.m_strValue = CFilePath::getRelativePath( fName, RHODESAPPBASE().getRhoRootPath());
+    value.m_strValue = RHODESAPPBASE().getRelativeDBFilesPath( fName );
     
     return true;
 }

data/platform/shared/sync/SyncThread.cpp

@@ -372,9 +372,19 @@ unsigned long rho_sync_is_blob_attr(const char* szPartition, int nSrcID, const c
 
 void rho_sync_setobjectnotify_url(const char* szUrl)
 {
-    CSyncNotify::setObjectNotifyUrl(szUrl);
+    CSyncNotify::setObjectNotification(new CObjectNotification(szUrl));
 }
 
+void rho_sync_setobjectnotify_url_c(/*RHOC_CALLBACK*/void* callback, void* callback_data)
+{
+    CSyncNotify::setObjectNotification( new CObjectNotification((RHOC_CALLBACK)callback, callback_data));
+}
+
+void rho_sync_clear_object_notification()
+{
+    CSyncNotify::setObjectNotification(0);   
+}
+    
 void rho_sync_addobjectnotify(int nSrcID, const char* szObject)
 {
     CSyncThread::getSyncEngine().getNotify().addObjectNotify(nSrcID, szObject);

data/platform/shared/sync/SyncThread.h

@@ -147,6 +147,7 @@ void rho_sync_clear_notification(int source_id);
 int rho_sync_set_pollinterval(int nInterval);
 void rho_sync_set_syncserver(const char* syncserver);
 void rho_sync_setobjectnotify_url(const char* szUrl);
+void rho_sync_clear_object_notification();    
 void rho_sync_addobjectnotify(int nSrcID, const char* szObject);
 void rho_sync_cleanobjectnotify();
 int rho_sync_get_pagesize();
@@ -164,6 +165,8 @@ unsigned long rho_sync_login_c(const char *name, const char *password, /*RHOC_CA
 unsigned long rho_sync_doSearchByNames(unsigned long ar_sources, const char *from, const char *params, bool sync_changes, int nProgressStep, /*RHOC_CALLBACK*/void* callback, void* callback_data);
 void rho_sync_set_notification_c(int source_id, /*RHOC_CALLBACK*/void* callback, void* callback_data);
 
+void rho_sync_setobjectnotify_url_c(/*RHOC_CALLBACK*/void* callback, void* callback_data);
+    
 void rho_sync_stop();
 
 #ifdef __cplusplus