rhodes 3.2.3 → 3.3.0.beta.1

data/platform/shared/db/DBAdapter.h

@@ -150,6 +150,10 @@ public:
     {
         sqlite3_bind_int64(st, nPos, val);
     }
+    void bind(sqlite3_stmt* st, int nPos, sqlite_int64 val)
+    {
+        sqlite3_bind_int64(st, nPos, val);
+    }
     void bind(sqlite3_stmt* st, int nPos, unsigned long val)
     {
         sqlite3_bind_int(st, nPos, static_cast<int>(val));
@@ -345,7 +349,8 @@ public:
     void destroy_tables(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables);
     void setBulkSyncDB(String fDataName, String strCryptKey);
 
-    void createDeleteTrigger(const String& strTable);
+    void createTrigger(const String& strSQL);
+    void dropTrigger(const String& strName);
 	
     virtual DBResultPtr prepareStatement( const char* szSt );
     DBResultPtr executeStatement(common::CAutoPtr<CDBResult>& res, const char* szSt);

data/platform/shared/db/DBAttrManager.cpp

@@ -171,6 +171,18 @@ void CDBAttrManager::loadBlobAttrs(CDBAdapter& db)
 {
     loadAttrs(db, m_mapBlobAttrs, "blob_attribs");
 
+    String strTriggerPrefix = "rhoSchemaTrigger_";
+    IDBResult res = db.executeSQL( "SELECT name FROM sqlite_master WHERE type='trigger'" );
+    Hashtable<String,int> mapTriggers;
+    for ( ; !res.isEnd(); res.next() )
+    {
+        String strName = res.getStringByIdx(0);
+        if ( !String_startsWith(strName, strTriggerPrefix) )
+            continue;
+
+        mapTriggers[strName.substr(strTriggerPrefix.length())] = 0;
+    }
+
     for ( HashtablePtr< int, Hashtable<String,int>* >::iterator it = m_mapBlobAttrs.begin();  it != m_mapBlobAttrs.end(); ++it )
     {
         int nSrcID = it->first;
@@ -183,7 +195,44 @@ void CDBAttrManager::loadBlobAttrs(CDBAdapter& db)
         if ( !db.isTableExist(strName) )
             continue;
 
-        db.createDeleteTrigger(strName);
+        Hashtable<String,int>& hashAttribs = *it->second;
+        for ( Hashtable<String,int>::iterator itAttr = hashAttribs.begin();  itAttr != hashAttribs.end(); ++itAttr )
+        {
+            String strTriggerName = strName + "_" + itAttr->first;
+            if ( !mapTriggers.containsKey(strTriggerName + "_delete") )
+            {
+                String strTrigger = String("CREATE TRIGGER ") + strTriggerPrefix + strTriggerName + "_delete BEFORE DELETE ON \"" + strName + "\" FOR EACH ROW \r\n"
+                "   BEGIN \r\n"
+                "       SELECT rhoOnDeleteSchemaRecord( OLD." + itAttr->first + ");\r\n"
+                "   END;\r\n"
+                ";";
+
+                db.createTrigger(strTrigger);
+            }else
+                mapTriggers[strTriggerName + "_delete"] = 1;
+
+            if ( !mapTriggers.containsKey(strTriggerName + "_update") )
+            {
+                String strTrigger = String("CREATE TRIGGER ") + strTriggerPrefix + strTriggerName + "_update BEFORE UPDATE ON \"" + strName + "\" FOR EACH ROW\r\n"
+                "   BEGIN \r\n"
+                "       SELECT rhoOnUpdateSchemaRecord( OLD." + itAttr->first + ", NEW." + itAttr->first + ");\r\n"
+                "   END;\r\n"
+                ";";
+
+                db.createTrigger(strTrigger);
+            }else
+                mapTriggers[strTriggerName + "_update"] = 1;
+
+        }
+    }
+
+    //Remove outdated triggers
+    for ( Hashtable<String,int>::iterator itTriggers = mapTriggers.begin();  itTriggers != mapTriggers.end(); ++itTriggers )
+    {
+        if ( !itTriggers->second )
+        {
+            db.dropTrigger(strTriggerPrefix+itTriggers->first);
+        }
     }
 }
 

data/platform/shared/logging/RhoLog.h

@@ -358,6 +358,9 @@ int rhoPlainLogData(const char* file, int line, LogSeverity severity, const char
 #define RAWTRACE_IF(exp,msg) RAWLOG_NONE
 #define RAWTRACE_IF1(exp,msg,arg1) RAWLOG_NONE
 
+#define RAWTRACEC_DATA(category,data,len)
+#define RAWTRACE_DATA(data,len)
+
 #endif
 
 #define RHO_ASSERT(exp) (void) ((exp) || rhoPlainLog(__FILE__, __LINE__, L_FATAL, "", #exp ))

data/platform/shared/logging/RhoLogSink.cpp

@@ -145,18 +145,22 @@ void CLogOutputSink::writeLogMessage( String& strMsg )
 
     const char* szMsg = strMsg.c_str(); 
 
-#if defined( OS_WINDOWS ) //|| defined( OS_WINCE )
+#if defined( OS_WINDOWS )
 		::OutputDebugStringA(szMsg);
+#elif defined( OS_PLATFORM_MOTCE )
+		::OutputDebugStringW(common::convertToStringW(strMsg).c_str());
 #elif defined( OS_SYMBIAN )
         TPtrC8 des((const TUint8*)szMsg);
       	RDebug::RawPrint(des);
         return;
 #endif
 
+#if !defined( OS_PLATFORM_MOTCE )
     for( int n = 0; n < (int)strMsg.length(); n+= 100 )
         fwrite(szMsg+n, 1, min(100,strMsg.length()-n) , stdout );
 
     fflush(stdout);
+#endif
 }
 
 CLogSocketSink::CLogSocketSink(const LogSettings& oSettings) 

data/platform/shared/net/CURLNetRequest.cpp

@@ -417,7 +417,9 @@ int CURLNetRequest::getResponseCode(CURLcode err, char const *body, size_t bodys
         RAWTRACE1("RESPONSE----- (%d bytes)", bodysize);
         if ( !rho_conf_getBool("log_skip_post") )
         {
+#ifndef OS_SYMBIAN
             RAWTRACE_DATA(body, bodysize);
+#endif
         }
         RAWTRACE("END RESPONSE-----");
     }

data/platform/shared/qt/rhodes/QtMainWindow.cpp

@@ -737,7 +737,16 @@ void QtMainWindow::alertShowPopup(CAlertParams * params)
                 QString::fromWCharArray(rho::common::convertToStringW(params->m_message).c_str()));
             m_alertDialog->setStandardButtons(0);
             for (int i = 0; i < (int)params->m_buttons.size(); i++) {
-                m_alertDialog->addButton(QString::fromWCharArray(rho::common::convertToStringW(params->m_buttons[i].m_strCaption).c_str()), QMessageBox::ActionRole);
+#ifdef OS_SYMBIAN
+                if(i == 0)
+#endif
+                    m_alertDialog->addButton(QString::fromWCharArray(rho::common::convertToStringW(params->m_buttons[i].m_strCaption).c_str()), QMessageBox::ActionRole);
+#ifdef OS_SYMBIAN
+                else if( i == 1)
+                    m_alertDialog->addButton(QString::fromWCharArray(rho::common::convertToStringW(params->m_buttons[i].m_strCaption).c_str()), QMessageBox::RejectRole);
+                else if(i == 2)
+                    break;
+#endif
             }
             m_alertDialog->exec();
             if (m_alertDialog) {
@@ -745,7 +754,11 @@ void QtMainWindow::alertShowPopup(CAlertParams * params)
                 if (btn) {
                     for (int i = 0; i < m_alertDialog->buttons().count(); ++i) {
                         if (btn == m_alertDialog->buttons().at(i)) {
+#ifdef OS_SYMBIAN
+                            RHODESAPP().callPopupCallback(params->m_callback, params->m_buttons[m_alertDialog->buttons().count() - i - 1].m_strID, params->m_buttons[m_alertDialog->buttons().count() - i - 1].m_strCaption);
+#else
                             RHODESAPP().callPopupCallback(params->m_callback, params->m_buttons[i].m_strID, params->m_buttons[i].m_strCaption);
+#endif
                             break;
                         }
                     }

data/platform/shared/qt/rhodes/impl/PhonebookImpl.cpp

@@ -46,13 +46,13 @@ VALUE getallPhonebookRecords(void* pb)
     return rho_ruby_get_NIL();    
 }
 
-int getPhonebookRecordCount(void* pb)
+int getPhonebookRecordCount(void* pb, rho_param* params)
 {
     //TODO: getPhonebookRecordCount
     return 0;
 }
 
-VALUE getPhonebookRecords(void* pb, int offset, int max_results, rho_param* select_param)
+VALUE getPhonebookRecords(void* pb, rho_param* params)
 {
     //TODO: getPhonebookRecords
 	return rho_ruby_get_NIL();	

data/platform/shared/qt/rhodes/impl/RhoFileImpl.cpp

@@ -54,7 +54,7 @@ bool RemoveDirectory(QString &path, bool deleteDir)
 
 extern "C" {
 
-void delete_files_in_folder(const char *szFolderPath)
+void rho_file_impl_delete_files_in_folder(const char *szFolderPath)
 {
     QString path = QString::fromUtf8(szFolderPath);
     RemoveDirectory(path, false);

data/platform/shared/qt/rhodes/impl/SignatureImpl.cpp

@@ -31,13 +31,25 @@
 
 extern "C" {
 
-void rho_signature_take_signature(char* callback_url, char* image_format)
+void rho_signature_take(char* callback_url, rho_param* p)
 {
     //TODO: rho_signature_take_signature
     //String callback = callback_url;
     //String format = image_format ? image_format : "png"; // default PNG
     //Signature::Params* params = new Signature::Params(callback, format);
-    CMainWindow::getInstance()->takeSignature(0);
+    //CMainWindow::getInstance()->takeSignature(0);
+}
+
+void rho_signature_visible(bool b, rho_param* p)
+{
+}
+
+void rho_signature_capture(const char* callback_url) 
+{
+}
+
+void rho_signature_clear() 
+{
 }
 
 } //extern "C"

data/platform/shared/qt/rhodes/impl/SystemImpl.cpp

@@ -34,6 +34,7 @@
 #include <QWebPage>
 #include <QLocale>
 #include <QDesktopServices>
+#include <QMessageBox>
 #include "MainWindowImpl.h"
 
 using namespace rho;
@@ -248,8 +249,21 @@ int rho_sys_set_sleeping(int sleeping)
 }
 #endif
 
-void rho_sys_set_application_icon_badge(int badge_number) {
-    //unsupported on WM
+void rho_sys_set_application_icon_badge(int badge_number)
+{
+    //TODO: rho_sys_set_application_icon_badge
+    RAWLOGC_INFO1("SystemImpl", "rho_sys_set_application_icon_badge(%d) was called", badge_number);
+}
+
+void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg)
+{
+    QMessageBox::critical(0, QString(szTitle), QString(szMsg));
+}
+
+RHO_GLOBAL void rho_platform_restart_application()
+{
+    //TODO: rho_platform_restart_application
+    RAWLOGC_INFO("SystemImpl", "rho_platform_restart_application() has no implementation in RhoSimulator.");
 }
 
 } //extern "C"

data/platform/shared/qt/rhodes/main.cpp

@@ -152,6 +152,7 @@ int main(int argc, char *argv[])
     RHOSIMCONF().setString( "ext_path", RHOSIMCONF().getString( "ext_path") + CFilePath::join( m_strRhodesPath, "/lib/extensions/debugger;"), false);
     RHOSIMCONF().setString( "ext_path", RHOSIMCONF().getString( "ext_path") + CFilePath::join( m_strRhodesPath, "/lib/extensions/uri;"), false);
     RHOSIMCONF().setString( "ext_path", RHOSIMCONF().getString( "ext_path") + CFilePath::join( m_strRhodesPath, "/lib/extensions/timeout;"), false);
+    RHOSIMCONF().setString( "ext_path", RHOSIMCONF().getString( "ext_path") + CFilePath::join( m_strRhodesPath, "/lib/extensions/digest;"), false);
 #endif
 
     if ( !rho_rhodesapp_canstartapp(g_strCmdLine.c_str(), " /-,") )
@@ -209,3 +210,30 @@ int main(int argc, char *argv[])
 
     return 0;
 }
+
+#ifdef OS_SYMBIAN
+extern "C"
+{
+    void rho_sys_replace_current_bundle(const char* path)
+    {
+    }
+
+    int rho_sys_delete_folder(const char* path)
+    {
+        return 0;
+    }
+}
+#endif
+
+#if defined(OS_MACOSX) && defined(RHODES_EMULATOR)
+extern "C"
+{
+    void rho_file_impl_delete_folder(const char* szFolderPath)
+    {
+    }
+
+    void rho_file_impl_copy_folders_content_to_another_folder(const char* szSrcFolderPath, const char* szDstFolderPath)
+    {
+    }
+}
+#endif // OS_MACOSX && RHODES_EMULATOR

data/platform/shared/qt/rhodes/rhodes.pro

@@ -29,6 +29,9 @@ macx {
 ../../../osx/bin/rholib/librholib.a\
 ../../../osx/bin/sqlite3/libsqlite3.a\
 ../../../osx/bin/syncengine/libsyncengine.a
+  exists("../../../osx/bin/extensions/extensions.pri") {
+    include("../../../osx/bin/extensions/extensions.pri")
+  }
 }
 
 win32 {

data/platform/shared/qt/rholib/rholib.pro

@@ -130,4 +130,5 @@ SOURCES += ../../common/RhoTime.cpp\
 ../../common/RhoMath.cpp\
 ../../common/map/ESRIMapEngine.cpp\
 ../../common/map/GoogleMapEngine.cpp\
-../../common/map/MapEngine.cpp
+../../common/map/MapEngine.cpp\
+../../common/BundleManager.cpp

data/platform/shared/qt/rubylib/rubylib.pro

@@ -183,4 +183,5 @@ SOURCES += ../../ruby/ext/datetimepicker/datetimepicker_wrap.c\
 ../../ruby/ext/mapview/mapview_wrap.c\
 ../../ruby/ext/signature/signature_wrap.c\
 ../../ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c\
-../../ruby/ext/bluetooth/bluetooth_wrap.c
+../../ruby/ext/bluetooth/bluetooth_wrap.c\
+../../ruby/enc/encdb.c

data/platform/shared/ruby/Android.mk

@@ -21,6 +21,9 @@ LOCAL_SRC_FILES := \
     enc/unicode.c \
     enc/us_ascii.c \
     enc/utf_8.c \
+    enc/encdb.c \
+    enc/iso_8859_1.c \
+    enc/iso_8859_9.c \
     enum.c \
     enumerator.c \
     error.c \

data/platform/shared/ruby/class.c

@@ -342,6 +342,13 @@ Init_class_hierarchy(void)
 {
     id_attached = rb_intern("__attached__");
 
+    //RHO 
+    rb_cBasicObject = 0;
+    rb_cObject = 0;
+    rb_cModule = 0;
+    rb_cClass =  0;
+    //RHO
+
     rb_cBasicObject = boot_defclass("BasicObject", 0);
     rb_cObject = boot_defclass("Object", rb_cBasicObject);
     rb_cModule = boot_defclass("Module", rb_cObject);

data/platform/shared/ruby/compile.c

@@ -5155,15 +5155,19 @@ get_exception_sym2type(VALUE sym)
     VALUE sym_inspect;
     static VALUE symRescue, symEnsure, symRetry;
     static VALUE symBreak, symRedo, symNext;
-
-    if (symRescue == 0) {
-	symRescue = ID2SYM(rb_intern("rescue"));
-	symEnsure = ID2SYM(rb_intern("ensure"));
-	symRetry  = ID2SYM(rb_intern("retry"));
-	symBreak  = ID2SYM(rb_intern("break"));
-	symRedo   = ID2SYM(rb_intern("redo"));
-	symNext   = ID2SYM(rb_intern("next"));
+    //RHO
+    static int cache_version;
+    
+    if ((symRescue == 0) || (const_cache_version != cache_version)) {
+        symRescue = ID2SYM(rb_intern("rescue"));
+        symEnsure = ID2SYM(rb_intern("ensure"));
+        symRetry  = ID2SYM(rb_intern("retry"));
+        symBreak  = ID2SYM(rb_intern("break"));
+        symRedo   = ID2SYM(rb_intern("redo"));
+        symNext   = ID2SYM(rb_intern("next"));
+        cache_version = const_cache_version;
     }
+    //RHO
 
     if (sym == symRescue) return CATCH_TYPE_RESCUE;
     if (sym == symEnsure) return CATCH_TYPE_ENSURE;
@@ -5239,10 +5243,14 @@ iseq_build_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
      * index -> LABEL *label
      */
     static struct st_table *insn_table;
+    //RHO
+    static int cache_version;
 
-    if (insn_table == 0) {
-	insn_table = insn_make_insn_table();
+    if ((insn_table == 0) || (cache_version != const_cache_version)) {
+        insn_table = insn_make_insn_table();
+        cache_version = const_cache_version;
     }
+    //RHO
 
     for (i=0; i<len; i++) {
 	VALUE obj = ptr[i];

data/platform/shared/ruby/encdb.h

@@ -1,5 +1,5 @@
 ENC_DEFINE("ASCII-8BIT");
-ENC_DEFINE("Big5");
+/*ENC_DEFINE("Big5");
 ENC_DEFINE("Big5-HKSCS");
 ENC_DEFINE("Big5-UAO");
 ENC_DEFINE("CP949");
@@ -9,7 +9,9 @@ ENC_DEFINE("EUC-KR");
 ENC_DEFINE("EUC-TW");
 ENC_DEFINE("GB18030");
 ENC_DEFINE("GBK");
+*/
 ENC_DEFINE("ISO-8859-1");
+/*
 ENC_DEFINE("ISO-8859-2");
 ENC_DEFINE("ISO-8859-3");
 ENC_DEFINE("ISO-8859-4");
@@ -17,7 +19,9 @@ ENC_DEFINE("ISO-8859-5");
 ENC_DEFINE("ISO-8859-6");
 ENC_DEFINE("ISO-8859-7");
 ENC_DEFINE("ISO-8859-8");
+*/
 ENC_DEFINE("ISO-8859-9");
+/*
 ENC_DEFINE("ISO-8859-10");
 ENC_DEFINE("ISO-8859-11");
 ENC_DEFINE("ISO-8859-13");
@@ -27,13 +31,16 @@ ENC_DEFINE("ISO-8859-16");
 ENC_DEFINE("KOI8-R");
 ENC_DEFINE("KOI8-U");
 ENC_DEFINE("Shift_JIS");
+*/
 ENC_DEFINE("US-ASCII");
 ENC_DEFINE("UTF-8");
+/*
 ENC_DEFINE("UTF-16BE");
 ENC_DEFINE("UTF-16LE");
 ENC_DEFINE("UTF-32BE");
 ENC_DEFINE("UTF-32LE");
 ENC_DEFINE("Windows-1251");
+*/
 ENC_ALIAS("BINARY", "ASCII-8BIT");
 ENC_REPLICATE("IBM437", "ASCII-8BIT");
 ENC_ALIAS("CP437", "IBM437");
@@ -78,13 +85,13 @@ ENC_REPLICATE("macRomania", "ASCII-8BIT");
 ENC_REPLICATE("macThai", "ASCII-8BIT");
 ENC_REPLICATE("macTurkish", "ASCII-8BIT");
 ENC_REPLICATE("macUkraine", "ASCII-8BIT");
-ENC_ALIAS("CP950", "Big5");
+/*ENC_ALIAS("CP950", "Big5");
 ENC_SET_BASE("Big5-HKSCS", "Big5");
 ENC_ALIAS("CP951", "Big5-HKSCS");
 ENC_SET_BASE("Big5-UAO", "Big5");
 ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule");
-ENC_ALIAS("eucJP", "EUC-JP") /* UI-OSF Application Platform Profile for Japanese Environment Version 1.1 */;
-ENC_REPLICATE("eucJP-ms", "EUC-JP") /* TOG/JVC CDE/Motif Technical WG */;
+ENC_ALIAS("eucJP", "EUC-JP") // UI-OSF Application Platform Profile for Japanese Environment Version 1.1
+ENC_REPLICATE("eucJP-ms", "EUC-JP") // TOG/JVC CDE/Motif Technical WG
 ENC_ALIAS("euc-jp-ms", "eucJP-ms");
 ENC_REPLICATE("CP51932", "EUC-JP");
 ENC_ALIAS("eucKR", "EUC-KR");
@@ -135,19 +142,22 @@ ENC_ALIAS("CP878", "KOI8-R");
 ENC_ALIAS("SJIS", "Shift_JIS");
 ENC_REPLICATE("Windows-31J", "Shift_JIS");
 ENC_ALIAS("CP932", "Windows-31J");
-ENC_ALIAS("csWindows31J", "Windows-31J") /* IANA.  IE6 don't accept Windows-31J but csWindows31J. */;
+ENC_ALIAS("csWindows31J", "Windows-31J") // IANA.  IE6 don't accept Windows-31J but csWindows31J.
 ENC_REPLICATE("MacJapanese", "Shift_JIS");
 ENC_ALIAS("MacJapan", "MacJapanese");
+*/
 ENC_ALIAS("ASCII", "US-ASCII");
 ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII");
 ENC_ALIAS("646", "US-ASCII");
+/*
 ENC_DUMMY("UTF-7");
 ENC_ALIAS("CP65000", "UTF-7");
+*/
 ENC_ALIAS("CP65001", "UTF-8");
 ENC_REPLICATE("UTF8-MAC", "UTF-8");
 ENC_ALIAS("UTF-8-MAC", "UTF8-MAC");
-ENC_ALIAS("UTF-8-HFS", "UTF8-MAC") /* Emacs 23.2 */;
-ENC_ALIAS("UCS-2BE", "UTF-16BE");
+ENC_ALIAS("UTF-8-HFS", "UTF8-MAC"); // Emacs 23.2
+/*ENC_ALIAS("UCS-2BE", "UTF-16BE");
 ENC_ALIAS("UCS-4BE", "UTF-32BE");
 ENC_ALIAS("UCS-4LE", "UTF-32LE");
 ENC_ALIAS("CP1251", "Windows-1251");
@@ -159,5 +169,5 @@ ENC_REPLICATE("ISO-2022-JP-KDDI", "ISO-2022-JP");
 ENC_REPLICATE("stateless-ISO-2022-JP-KDDI", "stateless-ISO-2022-JP");
 ENC_REPLICATE("UTF8-SoftBank", "UTF-8");
 ENC_REPLICATE("SJIS-SoftBank", "Windows-31J");
-
+*/
 #define ENCODING_COUNT 95