rhodes 2.3.0 → 2.3.1.beta.1

data/platform/shared/common/map/ESRIMapEngine.h

@@ -4,6 +4,7 @@
 #include "common/map/MapEngine.h"
 #include "common/RhoThread.h"
 #include "common/ThreadQueue.h"
+#include "net/INetRequest.h"
 
 #include <list>
 
@@ -101,13 +102,19 @@ private:
 
         void fetchTile(String const &baseUrl, int zoom, uint64 latitude, uint64 longitude);
 
+        virtual void cancel()
+        {
+            m_NetRequest.cancel();
+        }
+
     private:
         void processCommand(IQueueCommand *cmd);
         bool fetchData(String const &url, void **data, size_t *datasize);
+        net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
 
     private:
         ESRIMapView *m_mapview;
-        std::auto_ptr<net::INetRequest> m_net_request;
+        NetRequest   m_NetRequest;
     };
 
     friend class CacheUpdate;
@@ -179,6 +186,8 @@ public:
     void setPinImage(IDrawingImage *pin, PIN_INFO pin_info);
     void setPinCalloutImage(IDrawingImage *pinCallout, PIN_INFO pin_callout_info);
     void setPinCalloutLinkImage(IDrawingImage *pinCallout, PIN_INFO pin_callout_info);
+    void setESRILogoImage(IDrawingImage *esriLogoImg);
+
 
 private:
     String const &getMapUrl();
@@ -239,6 +248,7 @@ private:
 	PIN_INFO m_pin_callout_info;
     IDrawingImage *m_pinCalloutLink;
 	PIN_INFO m_pin_calloutlink_info;
+    IDrawingImage *m_esriLogo;
 };
 
 class ESRIMapEngine : public IMapEngine

data/platform/shared/common/map/GoogleMapEngine.cpp

@@ -23,8 +23,6 @@ String GoogleGeoCoding::Command::toString()
 
 IMPLEMENT_LOGCLASS(GoogleGeoCoding,"GGeoCoding");
 GoogleGeoCoding::GoogleGeoCoding()
-    :CThreadQueue(rho_impl_createClassFactory()),
-    m_net_request(getFactory()->createNetRequest())
 {
     CThreadQueue::setLogCategory(getLogCategory());
     RHO_MAP_TRACE("GoogleGeoCoding: ctor start");
@@ -35,6 +33,8 @@ GoogleGeoCoding::GoogleGeoCoding()
 GoogleGeoCoding::~GoogleGeoCoding()
 {
     RHO_MAP_TRACE("GoogleGeoCoding: dtor");
+
+    m_NetRequest.cancel();
     CThreadQueue::stop(200);
 }
 /*
@@ -47,7 +47,7 @@ void GoogleGeoCoding::stop()
 bool GoogleGeoCoding::fetchData(String const &url, void **data, size_t *datasize)
 {
     RHO_MAP_TRACE1("GoogleGeoCoding: fetchData: url=%s", url.c_str());
-    NetResponse(resp, m_net_request->doRequest("GET", url, "", 0, 0));
+    NetResponse resp = getNet().doRequest("GET", url, "", 0, 0);
     if (!resp.isOK())
         return false;
     *datasize = resp.getDataSize();

data/platform/shared/common/map/GoogleMapEngine.h

@@ -40,9 +40,9 @@ private:
     bool fetchData(String const &url, void **data, size_t *datasize);
 
     void processCommand(IQueueCommand* cmd);
-
+    net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
 private:
-    std::auto_ptr<net::INetRequest> m_net_request;
+    NetRequest              m_NetRequest;
 };
 
 } // namespace map

data/platform/shared/common/map/MapEngine.cpp

@@ -45,6 +45,14 @@ void MapProvider::unregisterMapEngine(String const &id)
     m_engines.remove(id);
 }
 
+bool MapProvider::isRegisteredMapEngine(String const &id) {
+    IMapEngine *engine = m_engines.get(id);
+    if (!engine)
+        return false;
+    return true;
+}
+
+
 IMapView *MapProvider::createMapView(String const &id, IDrawingDevice *device)
 {
     IMapEngine *engine = m_engines.get(id);
@@ -81,6 +89,35 @@ String Annotation::make_address(double latitude, double longitude)
 
 namespace rhomap = rho::common::map;
 
+
+bool rho_map_check_param(rho_param *p) {
+    if (!p || p->type != RHO_PARAM_HASH)
+        rho_ruby_raise_argerror("Wrong input parameter (expect Hash)");
+
+    rho_param *provider = NULL;
+    for (int i = 0, lim = p->v.hash->size; i < lim; ++i)
+    {
+        char *name = p->v.hash->name[i];
+        rho_param *value = p->v.hash->value[i];
+        if (!name || !value)
+            continue;
+
+        if (strcasecmp(name, "provider") == 0)
+            provider = value;
+    }
+
+    std::string providerId = "google";
+    if (provider)
+    {
+        if (provider->type != RHO_PARAM_STRING)
+            rho_ruby_raise_argerror("Wrong 'provider' value (expect String)");
+        providerId = provider->v.string;
+    }
+    std::transform(providerId.begin(), providerId.end(), providerId.begin(), &::tolower);
+	return RHOMAPPROVIDER().isRegisteredMapEngine(providerId);
+}
+
+
 rhomap::IMapView *rho_map_create(rho_param *p, rhomap::IDrawingDevice *device, int width, int height)
 {
     if (!p || p->type != RHO_PARAM_HASH)

data/platform/shared/common/map/MapEngine.h

@@ -155,6 +155,7 @@ public:
     virtual void setPinImage(IDrawingImage *pin, PIN_INFO pin_info) = 0;
     virtual void setPinCalloutImage(IDrawingImage *pinCallout, PIN_INFO pin_callout_info) = 0;
     virtual void setPinCalloutLinkImage(IDrawingImage *pinCallout, PIN_INFO pin_callout_info) = 0;
+    virtual void setESRILogoImage(IDrawingImage *esriLogoImg) = 0;
 
 };
 
@@ -193,6 +194,8 @@ public:
     void registerMapEngine(String const &id, IMapEngine *engine);
     void unregisterMapEngine(String const &id);
 
+	bool isRegisteredMapEngine(String const &id);
+
     IMapView *createMapView(String const &id, IDrawingDevice *device);
     void destroyMapView(IMapView *view);
 
@@ -209,6 +212,8 @@ inline rho::common::map::MapProvider &RHOMAPPROVIDER() {return rho::common::map:
 
 rho::common::map::IMapView *rho_map_create(rho_param *p, rho::common::map::IDrawingDevice *device, int width, int height);
 void rho_map_destroy(rho::common::map::IMapView *mapview);
+// check param for valid - now check only :provider (must be supported)
+bool rho_map_check_param(rho_param *p);
 
 #endif
 

data/platform/shared/db/DBAdapter.cpp

@@ -7,6 +7,7 @@
 #include "common/RhoConf.h"
 #include "common/RhodesApp.h"
 #include "common/RhoAppAdapter.h"
+#include "common/Tokenizer.h"
 #ifndef RHO_NO_RUBY 
 #include "ruby/ext/rho/rhoruby.h"
 #endif //RHO_NO_RUBY
@@ -131,8 +132,7 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
     const char* szEncrypt = get_app_build_config_item("encrypt_database");
     if ( szEncrypt && strcmp(szEncrypt, "1") == 0 )
     {
-        common::CAutoPtr<common::IRhoClassFactory> factory = rho_impl_createClassFactory();
-        m_ptrCrypt = factory->createRhoCrypt();
+        m_ptrCrypt = rho_get_RhoClassFactory()->createRhoCrypt();
         if ( m_strCryptKey.length() > 0 )
             m_ptrCrypt->set_db_CryptKey( m_strDbPartition.c_str(), m_strCryptKey.c_str(), !bTemp );
 
@@ -168,7 +168,7 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
         db.open( strDbPath+"_oldver", m_strDbVer, true );
         copyTable( "client_info", db, *this );
         {
-            DBResult( res, executeSQL( "SELECT client_id FROM client_info" ));
+            IDBResult res = executeSQL( "SELECT client_id FROM client_info" );
             if ( !res.isEnd() &&  res.getStringByIdx(0).length() > 0 )
             {
                 LOG(INFO) + "Set reset=1 in client_info";
@@ -183,26 +183,68 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
 
 }
 
-boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer, const String& strAppDBVer )
+void CDBAdapter::CDBVersion::fromFile(const String& strFilePath)//throws Exception
 {
-    LOG(INFO) + "Try migrate database from " + dbVer.m_strRhoVer + " to " + strRhoDBVer;
-    if ( (dbVer.m_strRhoVer.find("1.4") == 0)&& (strRhoDBVer.find("1.5")==0||strRhoDBVer.find("1.4")==0) )
+    String strData;
+    CRhoFile::readStringFromFile(strFilePath.c_str(), strData);
+    
+    CTokenizer oTokenizer( strData, ";" );
+    int nPos = 0;
+	while (oTokenizer.hasMoreTokens()) 
+    {
+		String tok = oTokenizer.nextToken();
+		tok = String_trim(tok);
+		
+		switch(nPos)
+		{
+		case 0:
+			m_strRhoVer = tok;
+			break;
+		case 1:
+			m_strAppVer = tok;
+			break;
+		case 2:
+			m_bEncrypted = tok.compare("encrypted") == 0;
+			break;
+		}
+		nPos++;
+    }
+}
+
+void CDBAdapter::CDBVersion::toFile(const String& strFilePath)const//throws Exception
+{
+	String strFullVer = m_strRhoVer + ";" + m_strAppVer + 
+		";" + (m_bEncrypted ? "encrypted":"");
+	
+	//try{
+        CRhoFile::deleteFile( strFilePath.c_str() );
+        CRhoFile::writeStringToFile(strFilePath.c_str(), strFullVer);
+	//}catch (Exception e) {
+   // 	LOG.ERROR("writeDBVersion failed.", e);
+    //	throw e;
+    //}
+}
+
+boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const CDBVersion& dbNewVer )
+{
+    LOG(INFO) + "Try migrate database from " + dbVer.m_strRhoVer + " to " + dbNewVer.m_strRhoVer;
+    if ( (dbVer.m_strRhoVer.find("1.4") == 0)&& (dbNewVer.m_strRhoVer.find("1.5")==0||dbNewVer.m_strRhoVer.find("1.4")==0) )
     {
-        LOG(INFO) + "No migration required from " + dbVer.m_strRhoVer + " to " + strRhoDBVer;
-        writeDBVersion( CDBVersion(strRhoDBVer, strAppDBVer) );
+        LOG(INFO) + "No migration required from " + dbVer.m_strRhoVer + " to " + dbNewVer.m_strRhoVer;
+        dbNewVer.toFile(m_strDbVerPath);
         return true;
     }
 
     if ( (dbVer.m_strRhoVer.find("2.0") == 0||dbVer.m_strRhoVer.find("2.1") == 0||dbVer.m_strRhoVer.find("2.2") == 0)&& 
-         (strRhoDBVer.find("2.0")==0||strRhoDBVer.find("2.1")==0||strRhoDBVer.find("2.2")==0) )
+         (dbNewVer.m_strRhoVer.find("2.0")==0||dbNewVer.m_strRhoVer.find("2.1")==0||dbNewVer.m_strRhoVer.find("2.2")==0) )
     {
-        LOG(INFO) + "No migration required from " + dbVer.m_strRhoVer + " to " + strRhoDBVer;
-        writeDBVersion( CDBVersion(strRhoDBVer, strAppDBVer) );
+        LOG(INFO) + "No migration required from " + dbVer.m_strRhoVer + " to " + dbNewVer.m_strRhoVer;
+        dbNewVer.toFile(m_strDbVerPath);
         return true;
     }
 
     //1.2.x -> 1.5.x,1.4.x
-    if ( (dbVer.m_strRhoVer.find("1.2") == 0)&& (strRhoDBVer.find("1.5")==0||strRhoDBVer.find("1.4")==0) )
+    if ( (dbVer.m_strRhoVer.find("1.2") == 0)&& (dbNewVer.m_strRhoVer.find("1.5")==0||dbNewVer.m_strRhoVer.find("1.4")==0) )
     {
     //sources
     //priority INTEGER, ADD
@@ -211,28 +253,28 @@ boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer
 
     //changed_values
     //id INTEGER PRIMARY KEY, REMOVE
-        LOG(INFO) + "Migrate database from " + dbVer.m_strRhoVer + " to " + strRhoDBVer;
+        LOG(INFO) + "Migrate database from " + dbVer.m_strRhoVer + " to " + dbNewVer.m_strRhoVer;
 
         CDBAdapter db(m_strDbPartition.c_str(), true);
         db.open( m_strDbPath, m_strDbVer, true );
-        DBResult( res, db.executeSQL( "ALTER TABLE sources ADD priority INTEGER" ));
-        DBResult( res1, db.executeSQL( "ALTER TABLE sources ADD backend_refresh_time int default 0" ));
+        IDBResult res = db.executeSQL( "ALTER TABLE sources ADD priority INTEGER" );
+        IDBResult res1 = db.executeSQL( "ALTER TABLE sources ADD backend_refresh_time int default 0" );
 
         {
             Vector<int> vecSrcIds;
-            DBResult( res2, db.executeSQL( "SELECT source_id FROM sources" ));
+            IDBResult res2 = db.executeSQL( "SELECT source_id FROM sources" );
             for ( ; !res2.isEnd(); res2.next() )
                 vecSrcIds.addElement(res2.getIntByIdx(0));
 
             for( size_t i = 0; i < vecSrcIds.size(); i++)
             {
-                DBResult( res3, db.executeSQL( "UPDATE sources SET priority=? where source_id=?", 
-                    vecSrcIds.elementAt(i), vecSrcIds.elementAt(i) ));
+                IDBResult res3 = db.executeSQL( "UPDATE sources SET priority=? where source_id=?", 
+                    vecSrcIds.elementAt(i), vecSrcIds.elementAt(i) );
             }
         }
         db.close();
 
-        writeDBVersion( CDBVersion(strRhoDBVer, strAppDBVer) );
+        dbNewVer.toFile(m_strDbVerPath);
 
         return true;
     }
@@ -242,76 +284,66 @@ boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer
 
 void CDBAdapter::checkDBVersion(String& strRhoDBVer)
 {
-	String strAppDBVer = RHOCONF().getString("app_db_version");
-	
-	CDBVersion dbVer = readDBVersion();
+    CDBVersion dbNewVer;
+	dbNewVer.m_strRhoVer = strRhoDBVer; 
+	dbNewVer.m_strAppVer = RHOCONF().getString("app_db_version");
 
-	boolean bRhoReset = false;
-    boolean bAppReset = false;
+    const char* szEncrypt = get_app_build_config_item("encrypt_database");
+	dbNewVer.m_bEncrypted = szEncrypt && strcmp(szEncrypt, "1") == 0;
+		
+	CDBVersion dbVer;  
+	dbVer.fromFile(m_strDbVerPath);
 
-	if ( strRhoDBVer.length() > 0 )
+	if (dbVer.m_strRhoVer.length() == 0 )
 	{
-		if ( dbVer.m_strRhoVer.compare(strRhoDBVer) != 0 )
-			bRhoReset = true;
+		dbNewVer.toFile(m_strDbVerPath);
+		return;
 	}
-	if ( strAppDBVer.length() > 0 )
+	
+	boolean bRhoReset = dbVer.isRhoVerChanged(dbNewVer);
+    boolean bAppReset = dbVer.isAppVerChanged(dbNewVer);
+	
+	boolean bDbFormatChanged = dbVer.isDbFormatChanged(dbNewVer);
+	if ( !bDbFormatChanged && dbVer.m_bEncrypted )
 	{
-		if ( dbVer.m_strAppVer.compare(strAppDBVer) != 0 )
-			bAppReset = true;
+		//if (!com.rho.RhoCrypto.isKeyExist(strEncryptionInfo) )
+		//	bDbFormatChanged = true;
 	}
+	
+	if ( bDbFormatChanged )
+		LOG(INFO) + "Reset Database( format changed ):" + m_strDbPath;
+	
+    if ( bRhoReset && !bAppReset && !bDbFormatChanged )
+        bRhoReset = !migrateDB(dbVer, dbNewVer);
 
-    if ( bRhoReset && !bAppReset )
-        bRhoReset = !migrateDB(dbVer, strRhoDBVer, strAppDBVer);
-
-	if ( bRhoReset || bAppReset )
+    if ( bRhoReset || bAppReset || bDbFormatChanged)
 	{
         LOG(INFO) + "Reset database because version is changed.";
 
         CRhoFile::deleteFile( (m_strDbPath+"_oldver").c_str());
         CRhoFile::deleteFile( (m_strDbPath+"_oldver-journal").c_str());
 
-        CRhoFile::renameFile( m_strDbPath.c_str(), (m_strDbPath+"_oldver").c_str());
-        CRhoFile::renameFile((m_strDbPath+"-journal").c_str(), (m_strDbPath+"_oldver-journal").c_str());
+        if ( bDbFormatChanged )
+        {
+            CRhoFile::deleteFile( m_strDbPath.c_str() );
+            CRhoFile::deleteFile((m_strDbPath+"-journal").c_str());
+        }else
+        {
+            CRhoFile::renameFile( m_strDbPath.c_str(), (m_strDbPath+"_oldver").c_str());
+            CRhoFile::renameFile((m_strDbPath+"-journal").c_str(), (m_strDbPath+"_oldver-journal").c_str());
+        }
 
-        CRhoFile::deleteFilesInFolder(RHODESAPPBASE().getBlobsDirPath().c_str());
+        if ( m_strDbPartition.compare("user") == 0 ) //do it only once
+            CRhoFile::deleteFilesInFolder(RHODESAPPBASE().getBlobsDirPath().c_str());
 
-        writeDBVersion( CDBVersion(strRhoDBVer, strAppDBVer) );
+        dbNewVer.toFile(m_strDbVerPath);
 
         if ( RHOCONF().isExist("bulksync_state") && RHOCONF().getInt("bulksync_state") != 0)
             RHOCONF().setInt("bulksync_state", 0, true);
-	}
-}
-
-CDBAdapter::CDBVersion CDBAdapter::readDBVersion()//throws Exception
-{
-    String strFullVer;
-    CRhoFile oFile;
-    if ( !oFile.open(m_strDbVerPath.c_str(),CRhoFile::OpenReadOnly) )
-        return CDBVersion();
-
-    oFile.readString(strFullVer);
-	
-	if ( strFullVer.length() == 0 )
-		return CDBVersion();
-	
-	int nSep = strFullVer.find(';');
-	if ( nSep == -1 )
-		return CDBVersion(strFullVer, "");
-	
-	return CDBVersion(strFullVer.substr(0,nSep), strFullVer.substr(nSep+1) );
-}
-
-void CDBAdapter::writeDBVersion(const CDBVersion& ver)//throws Exception
-{
-    String strFullVer = ver.m_strRhoVer + ";" + ver.m_strAppVer;
-    CRhoFile oFile;
-    if ( !oFile.open(m_strDbVerPath.c_str(),CRhoFile::OpenForWrite) )
-        return;
-
-    oFile.write(strFullVer.c_str(), strFullVer.length() );
+    }
 }
 
-sqlite3_stmt* CDBAdapter::createInsertStatement(rho::db::CDBResult& res, const String& tableName, CDBAdapter& db, String& strInsert)
+sqlite3_stmt* CDBAdapter::createInsertStatement(IDBResult& res, const String& tableName, CDBAdapter& db, String& strInsert)
 {
     sqlite3_stmt* stInsert = 0;
     int nColCount = sqlite3_data_count(res.getStatement());
@@ -399,7 +431,7 @@ boolean CDBAdapter::isTableExist(String strTableName)
 {
     Vector<String> vecTables;
 
-    DBResult( res , executeSQL( "SELECT name FROM sqlite_master WHERE type='table' AND name=?", strTableName.c_str() ) );
+    IDBResult res = executeSQL( "SELECT name FROM sqlite_master WHERE type='table' AND name=?", strTableName.c_str() );
     return !res.isEnd();
 }
 
@@ -419,7 +451,7 @@ void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables,
     //Copy all tables
 
     Vector<String> vecTables;
-    DBResult( res , executeSQL( "SELECT name FROM sqlite_master WHERE type='table' " ) );
+    IDBResult res = executeSQL( "SELECT name FROM sqlite_master WHERE type='table' " );
     for ( ; !res.isEnd(); res.next() )
         vecTables.addElement(res.getStringByIdx(0));
 
@@ -449,7 +481,7 @@ void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables,
 void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbTo)
 {
     String strSelect = "SELECT * from " + tableName;
-    DBResult( res , dbFrom.executeSQL( strSelect.c_str() ) );
+    IDBResult res = dbFrom.executeSQL( strSelect.c_str() );
 	String strInsert = "";
     int rc = 0;
     for ( ; !res.isEnd(); res.next() )
@@ -468,8 +500,8 @@ void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbT
 void CDBAdapter::updateAllAttribChanges()
 {
     //Check for attrib = object
-    DBResult( res , executeSQL("SELECT object, source_id, update_type "
-        "FROM changed_values where attrib = 'object' and sent=0") );
+    IDBResult res = executeSQL("SELECT object, source_id, update_type "
+        "FROM changed_values where attrib = 'object' and sent=0");
 
     if ( res.isEnd() )
         return;
@@ -487,7 +519,7 @@ void CDBAdapter::updateAllAttribChanges()
 
     for( int i = 0; i < (int)arObj.size(); i++ )
     {
-        DBResult( resSrc , executeSQL("SELECT name, schema FROM sources where source_id=?", arSrcID.elementAt(i) ) );
+        IDBResult resSrc = executeSQL("SELECT name, schema FROM sources where source_id=?", arSrcID.elementAt(i) );
         boolean bSchemaSource = false;
         String strTableName = "object_values";
         if ( !resSrc.isEnd() )
@@ -499,7 +531,7 @@ void CDBAdapter::updateAllAttribChanges()
 
         if (bSchemaSource)
         {
-            DBResult( res2 , executeSQL((String("SELECT * FROM ") + strTableName + " where object=?").c_str(), arObj.elementAt(i) ) );
+            IDBResult res2 = executeSQL((String("SELECT * FROM ") + strTableName + " where object=?").c_str(), arObj.elementAt(i) );
             for( int j = 0; j < res2.getColCount(); j ++)
             {
                 String strAttrib = res2.getColName(j);
@@ -511,8 +543,8 @@ void CDBAdapter::updateAllAttribChanges()
             }
         }else
         {
-            DBResult( res2 , executeSQL((String("SELECT attrib, value FROM ") + strTableName + " where object=? and source_id=?").c_str(), 
-                arObj.elementAt(i), arSrcID.elementAt(i) ) );
+            IDBResult res2 = executeSQL((String("SELECT attrib, value FROM ") + strTableName + " where object=? and source_id=?").c_str(), 
+                arObj.elementAt(i), arSrcID.elementAt(i) );
 
             for( ; !res2.isEnd(); res2.next() )
             {
@@ -539,7 +571,7 @@ void CDBAdapter::copyChangedValues(CDBAdapter& db)
     {
         Vector<int> arOldSrcs;
         {
-            DBResult( resSrc , db.executeSQL( "SELECT DISTINCT(source_id) FROM changed_values" ) );
+            IDBResult resSrc = db.executeSQL( "SELECT DISTINCT(source_id) FROM changed_values" );
             for ( ; !resSrc.isEnd(); resSrc.next() )
                 arOldSrcs.addElement( resSrc.getIntByIdx(0) );
         }
@@ -547,12 +579,12 @@ void CDBAdapter::copyChangedValues(CDBAdapter& db)
         {
             int nOldSrcID = arOldSrcs.elementAt(i);
 
-            DBResult( res, executeSQL("SELECT name from sources WHERE source_id=?", nOldSrcID) );
+            IDBResult res = executeSQL("SELECT name from sources WHERE source_id=?", nOldSrcID);
             if ( !res.isEnd() )
             {
                 String strSrcName = res.getStringByIdx(0);
 
-                DBResult( res2, db.executeSQL("SELECT source_id from sources WHERE name=?", strSrcName) );
+                IDBResult res2 = db.executeSQL("SELECT source_id from sources WHERE name=?", strSrcName);
                 if ( !res2.isEnd() )
                 {
                     if ( nOldSrcID != res2.getIntByIdx(0) )

data/platform/shared/db/DBAdapter.h

@@ -44,8 +44,26 @@ class CDBAdapter
     {
     	String m_strRhoVer;
     	String m_strAppVer;
+        boolean m_bEncrypted;
+
+        boolean isRhoVerChanged(CDBVersion& dbNewVer)
+    	{
+    		return m_strRhoVer.compare(dbNewVer.m_strRhoVer) != 0;
+    	}
+    	boolean isAppVerChanged(CDBVersion& dbNewVer)
+    	{
+    		return m_strAppVer.compare(dbNewVer.m_strAppVer) != 0;
+    	}
     	
-        CDBVersion(){}
+    	boolean isDbFormatChanged(CDBVersion& dbNewVer)
+    	{
+    		return m_bEncrypted != dbNewVer.m_bEncrypted;// || 
+    			//m_bSqlite != dbNewVer.m_bSqlite;
+    	}
+        void fromFile(const String& strFilePath);//throws Exception
+        void toFile(const String& strFilePath)const;//throws Exception
+
+        CDBVersion() : m_bEncrypted(false){}
     	CDBVersion( String strRhoVer, String strAppVer )
     	{
     		m_strRhoVer = strRhoVer;
@@ -287,15 +305,13 @@ public:
 private:
 
     void checkDBVersion(String& strVer);
-    CDBVersion readDBVersion();//throws Exception
-    void       writeDBVersion(const CDBVersion& ver);//throws Exception
     void createSchema();
     void createTriggers();
     boolean checkDbError(int rc);
     boolean checkDbErrorEx(int rc, rho::db::CDBResult& res);
-    sqlite3_stmt* createInsertStatement(rho::db::CDBResult& res, const String& tableName, CDBAdapter& db, String& strInsert);
+    sqlite3_stmt* createInsertStatement(IDBResult& res, const String& tableName, CDBAdapter& db, String& strInsert);
 
-    boolean migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer, const String& strAppDBVer);
+    boolean migrateDB(const CDBVersion& dbVer, const CDBVersion& dbNewVer);
     void copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbTo);
     void copyChangedValues(CDBAdapter& db);
 };

data/platform/shared/db/DBAttrManager.cpp

@@ -149,7 +149,7 @@ void CDBAttrManager::loadBlobAttrs(CDBAdapter& db)
     {
         int nSrcID = it->first;
 
-        DBResult( res, db.executeSQL("SELECT name FROM sources WHERE source_id=?", nSrcID) );
+        IDBResult res = db.executeSQL("SELECT name FROM sources WHERE source_id=?", nSrcID);
         if ( res.isEnd() )
             continue;
 
@@ -167,7 +167,7 @@ void CDBAttrManager::loadBlobAttrs(CDBAdapter& db)
     String strSql = "SELECT source_id,";
     strSql += strDBAttr + " from sources";
 
-    DBResult( res, db.executeSQL(strSql.c_str()) );
+    IDBResult res = db.executeSQL(strSql.c_str());
     for ( ; !res.isEnd(); res.next() )
     { 
         int nSrcID = res.getIntByIdx(0);

data/platform/shared/db/DBResult.h

@@ -50,6 +50,7 @@ public:
 //    void    setErrorCode(int nError){ m_nErrorCode=nError; }
 
     virtual bool isEnd(){ return m_dbStatement == null; }
+    virtual bool isOneEnd(){ return m_dbStatement == null; }
     void next()
     {
         if ( sqlite3_step(m_dbStatement) != SQLITE_ROW )
@@ -90,9 +91,36 @@ public:
 };
 
 typedef rho::common::CAutoPtr<rho::db::CDBResult> DBResultPtr;
+/*
 #define DBResult(name, call)\
     rho::db::DBResultPtr p##name = call;\
     rho::db::CDBResult& name = *p##name;
+*/
+
+class CDBResultWrapper
+{
+    DBResultPtr m_dbRes;
+public:
+    CDBResultWrapper(const DBResultPtr& dbRes) : m_dbRes(dbRes){}
+    void operator=( const DBResultPtr& dbRes){ m_dbRes = dbRes; }
+
+    sqlite3_stmt* getStatement(){ return m_dbRes->getStatement(); }
+    boolean isNonUnique(){ return m_dbRes->isNonUnique(); }
+    bool isEnd(){ return m_dbRes->isEnd(); }
+    bool isOneEnd(){ return m_dbRes->isOneEnd(); }
+    void next(){ m_dbRes->next(); }
+    String getStringByIdx(int nCol){ return m_dbRes->getStringByIdx(nCol); }
+    int getIntByIdx(int nCol){ return m_dbRes->getIntByIdx(nCol); }
+    uint64 getUInt64ByIdx(int nCol){ return m_dbRes->getUInt64ByIdx(nCol); }
+    int getColCount(){ return m_dbRes->getColCount(); }
+    boolean isNullByIdx(int nCol){ return m_dbRes->isNullByIdx(nCol); }
+    String getColName(int nCol){ return m_dbRes->getColName(nCol); }
+
+};
 
 }
 }
+
+typedef rho::db::CDBResultWrapper IDBResult;
+
+