rhodes 3.0.2 → 3.1.0.beta.1

data/platform/shared/curl/lib/hostip.c

@@ -82,6 +82,11 @@
 #define USE_ALARM_TIMEOUT
 #endif
 
+#include <logging/RhoLog.h>
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "Curl"
+
+
 /*
  * hostip.c explained
  * ==================
@@ -422,6 +427,8 @@ int Curl_resolv(struct connectdata *conn,
   if(!entry_id)
     return rc;
 
+  RAWTRACE1("Curl_resolv host: cache_id: %s", entry_id);
+
   entry_len = strlen(entry_id);
 
   if(data->share)

data/platform/shared/curl/lib/http.c

@@ -108,6 +108,10 @@
 /* Default proxy timeout in milliseconds */
 #define PROXY_TIMEOUT (3600*1000)
 
+#include <logging/RhoLog.h>
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "Curl"
+
 /*
  * Forward declarations.
  */
@@ -1755,6 +1759,8 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done)
   struct SessionHandle *data;
   CURLcode result;
 
+  RAWTRACE1("Curl_http_connect, host %s", conn->host.name);
+
   data=conn->data;
 
   /* We default to persistent connections. We set this already in this connect

data/platform/shared/curl/lib/setup_once.h

@@ -58,8 +58,12 @@
 #endif
 
 #ifdef HAVE_SYS_STAT_H
+#if defined(__SYMBIAN32__)
+#include <sys/stat.h>
+#else
 #include <common/stat.h>
 #endif
+#endif
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>

data/platform/shared/db/DBAdapter.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "DBAdapter.h"
 #include "sync/SyncThread.h"
 #include "sync/SyncEngine.h"
@@ -539,6 +565,9 @@ void CDBAdapter::updateAllAttribChanges()
             IDBResult res2 = executeSQL((String("SELECT * FROM ") + strTableName + " where object=?").c_str(), arObj.elementAt(i) );
             for( int j = 0; j < res2.getColCount(); j ++)
             {
+                if ( res2.isNullByIdx(j) )
+                    continue;
+
                 String strAttrib = res2.getColName(j);
                 String value = res2.getStringByIdx(j);
                 String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), strAttrib.c_str()) ? "blob.file" : "";
@@ -553,6 +582,9 @@ void CDBAdapter::updateAllAttribChanges()
 
             for( ; !res2.isEnd(); res2.next() )
             {
+                if ( res2.isNullByIdx(1) )
+                    continue;
+
                 String strAttrib = res2.getStringByIdx(0);
                 String value = res2.getStringByIdx(1);
                 String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), strAttrib.c_str()) ? "blob.file" : "";
@@ -652,7 +684,7 @@ void CDBAdapter::executeBatch(const char* szSql, CDBError& error)
 void CDBAdapter::createSchema()
 {
 #ifdef RHODES_EMULATOR
-    String strPath = CFilePath::join( RHODESAPP().getRhodesPath(), "platform/shared/db/res/db/syncdb.schema" );
+    String strPath = CFilePath::join( RHOSIMCONF().getRhodesPath(), "platform/shared/db/res/db/syncdb.schema" );
     CFilePath oPath(strPath);
 #else
     CFilePath oPath(m_strDbPath);
@@ -678,7 +710,7 @@ void CDBAdapter::createTriggers()
 {
     char* errmsg = 0;
 #ifdef RHODES_EMULATOR
-    String strPath = CFilePath::join( RHODESAPP().getRhodesPath(), "platform/shared/db/res/db/syncdb.triggers" );
+    String strPath = CFilePath::join( RHOSIMCONF().getRhodesPath(), "platform/shared/db/res/db/syncdb.triggers" );
     CFilePath oPath(strPath);
 #else
     CFilePath oPath(m_strDbPath);

data/platform/shared/db/DBAdapter.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #include "DBResult.h"

data/platform/shared/db/DBAttrManager.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "DBAttrManager.h"
 #include "DBAdapter.h"
 #include "common/StringConverter.h"

data/platform/shared/db/DBAttrManager.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #include "common/RhoStd.h"

data/platform/shared/db/DBResult.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "DBResult.h"
 #include "DBAdapter.h"
 

data/platform/shared/db/DBResult.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #include "common/RhoStd.h"

data/platform/shared/json/JSONIterator.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "JSONIterator.h"
 
 #include "json/json.h"

data/platform/shared/json/JSONIterator.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #include "common/RhoStd.h"

data/platform/shared/json/RJSONTokener.c

@@ -30,7 +30,7 @@
 #endif
 
 #include "bits.h"
-#include "debug.h"
+#include "json_debug.h"
 #include "printbuf.h"
 #include "arraylist.h"
 #include "json_object.h"
@@ -583,9 +583,9 @@ VALUE rho_json_parse(VALUE v,VALUE str)
     char* szError = 0;
     VALUE res;
 
-    rb_gc_disable();
+    VALUE oldGC = rho_ruby_disable_gc();
     res = rjson_tokener_parse(getStringFromValue(str), &szError);
-    rb_gc_enable();
+    rho_ruby_enable_gc(oldGC);
 
     if ( res != 0 )
         return res;

data/platform/shared/json/json.h

@@ -17,7 +17,7 @@ extern "C" {
 #endif
 
 #include "bits.h"
-#include "debug.h"
+#include "json_debug.h"
 #include "linkhash.h"
 #include "arraylist.h"
 #include "json_util.h"

data/platform/shared/json/{debug.c → json_debug.c}

@@ -1,5 +1,5 @@
 /*
- * $Id: debug.c,v 1.5 2006/01/26 02:16:28 mclark Exp $
+ * $Id: json_debug.c,v 1.5 2006/01/26 02:16:28 mclark Exp $
  *
  * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
  * Michael Clark <michael@metaparadigm.com>
@@ -28,7 +28,7 @@
 #include <sys/param.h>
 #endif /* HAVE_SYS_PARAM_H */
 
-#include "debug.h"
+#include "json_debug.h"
 
 static int _syslog = 0;
 static int _debug = 0;

data/platform/shared/json/{debug.h → json_debug.h}

@@ -1,5 +1,5 @@
 /*
- * $Id: debug.h,v 1.5 2006/01/30 23:07:57 mclark Exp $
+ * $Id: json_debug.h,v 1.5 2006/01/30 23:07:57 mclark Exp $
  *
  * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
  * Michael Clark <michael@metaparadigm.com>

data/platform/shared/json/json_object.c

@@ -20,7 +20,7 @@
 //#define strdup _strdup
 //#endif
 
-#include "debug.h"
+#include "json_debug.h"
 #include "printbuf.h"
 #include "linkhash.h"
 #include "arraylist.h"

data/platform/shared/json/json_tokener.c

@@ -30,7 +30,7 @@
 #endif
 
 #include "bits.h"
-#include "debug.h"
+#include "json_debug.h"
 #include "printbuf.h"
 #include "arraylist.h"
 #include "json_object.h"

data/platform/shared/json/json_util.c

@@ -56,7 +56,7 @@ extern char *strerror(int errno);
 #endif
 
 #include "bits.h"
-#include "debug.h"
+#include "json_debug.h"
 #include "printbuf.h"
 #include "json_object.h"
 #include "json_tokener.h"

data/platform/shared/json/printbuf.c

@@ -22,7 +22,7 @@
 #endif /* HAVE_STDARG_H */
 
 #include "bits.h"
-#include "debug.h"
+#include "json_debug.h"
 #include "printbuf.h"
 
 struct printbuf* printbuf_new()

data/platform/shared/logging/RhoATLTrace.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #ifndef _RHOATLLOG_H_
 #define _RHOATLLOG_H_