rhodes 2.2.3 → 2.2.4.beta.1

data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java

@@ -29,6 +29,8 @@ public class DBAdapter extends RubyBasic
 	
     static String USER_PARTITION_NAME(){return "user";}
     static Hashtable/*Ptr<String,CDBAdapter*>&*/ getDBPartitions(){ return  m_mapDBPartitions; }
+    String m_strClientInfoInsert = "";
+    Object[] m_dataClientInfo = null;
     
 	DBAdapter(RubyClass c) {
 		super(c);
@@ -98,6 +100,11 @@ public class DBAdapter extends RubyBasic
 		Object[] values = { new Integer(arg1)};
 		return executeSQL(strStatement,values);
 	}
+	public IDBResult executeSQL(String strStatement, int arg1, int arg2)throws DBException{
+		Object[] values = { new Integer(arg1), new Integer(arg2)};
+		return executeSQL(strStatement,values);
+	}
+	
 	public IDBResult executeSQL(String strStatement, long arg1)throws DBException{
 		Object[] values = { new Long(arg1)};
 		return executeSQL(strStatement,values);
@@ -453,6 +460,32 @@ public class DBAdapter extends RubyBasic
 
 		if ( bRhoReset || bAppReset )
 		{
+			IDBStorage db = null;
+			try
+			{
+			    db = RhoClassFactory.createDBStorage();
+				if ( db.isDbFileExists(m_strDBPath) )
+				{
+					db.open( m_strDBPath, "" );
+			    	IDBResult res = db.executeSQL("SELECT * FROM client_info", null, false);
+			    	if ( !res.isEnd() )
+			    	{
+			    		m_strClientInfoInsert = createInsertStatement(res, "client_info");
+			    		m_dataClientInfo = res.getCurData();
+			    	}
+				}
+			}catch(Exception exc)
+			{
+				LOG.ERROR("Copy client_info table failed.", exc);
+			}catch(Throwable e)
+			{
+				LOG.ERROR("Copy client_info table crashed.", e);
+			}finally
+			{
+				if (db != null )
+					try{ db.close(); }catch(Exception e){}
+			}
+		
 			m_dbStorage.deleteAllFiles(m_strDBPath);
 			
 			String fName = makeBlobFolderName();
@@ -497,13 +530,15 @@ public class DBAdapter extends RubyBasic
 		}
 	}
 	
-    private void openDB(String strDBName)throws Exception
+    private void openDB(String strDBName, boolean bTemp)throws Exception
     {
     	if ( m_bIsOpen )
     		return;
     	
 		initFilePaths(strDBName);
-		checkDBVersion();
+	    if ( !bTemp )
+	    	checkDBVersion();
+	    
 		m_dbStorage.open(m_strDBPath, getSqlScript() );
 		
 		//executeSQL("CREATE INDEX by_src ON object_values (source_id)", null);
@@ -514,6 +549,24 @@ public class DBAdapter extends RubyBasic
 		m_dbStorage.setDbCallback(new DBCallback(this));
 		
 		m_dbAdapters.addElement(this);
+
+	    //copy client_info table
+        if ( !bTemp && m_strClientInfoInsert != null && m_strClientInfoInsert.length() > 0 &&
+        	 m_dataClientInfo != null )
+        {
+            LOG.INFO("Copy client_info table from old database");
+    		
+        	m_dbStorage.executeSQL(m_strClientInfoInsert, m_dataClientInfo, false );
+        	
+            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");
+                executeSQL( "UPDATE client_info SET reset=1" );
+            }
+        	
+        }
+		
     }
     
 	private String createInsertStatement(IDBResult res, String tableName)
@@ -693,34 +746,77 @@ public class DBAdapter extends RubyBasic
 	    }
     }
     
+    void copyChangedValues(DBAdapter db)throws DBException
+    {
+        copyTable("changed_values", m_dbStorage, db.m_dbStorage );
+        {
+            Vector/*<int>*/ arOldSrcs = new Vector();
+            {
+                IDBResult resSrc = db.executeSQL( "SELECT DISTINCT(source_id) FROM changed_values" );
+                for ( ; !resSrc.isEnd(); resSrc.next() )
+                    arOldSrcs.addElement( new Integer(resSrc.getIntByIdx(0)) );
+            }
+            for( int i = 0; i < arOldSrcs.size(); i++)
+            {
+                int nOldSrcID = ((Integer)arOldSrcs.elementAt(i)).intValue();
+
+                IDBResult res = executeSQL("SELECT name from sources WHERE source_id=?", nOldSrcID);
+                if ( !res.isEnd() )
+                {
+                    String strSrcName = res.getStringByIdx(0);
+                    IDBResult res2 = db.executeSQL("SELECT source_id from sources WHERE name=?", strSrcName );
+                    if ( !res2.isEnd() )
+                    {
+                        if ( nOldSrcID != res2.getIntByIdx(0) )
+                        {
+                            db.executeSQL("UPDATE changed_values SET source_id=? WHERE source_id=?", res2.getIntByIdx(0), nOldSrcID);
+                        }
+                        continue;
+                    }
+                }
+
+                //source not exist in new partition, remove this changes
+                db.executeSQL("DELETE FROM changed_values WHERE source_id=?", nOldSrcID);
+            }
+        }
+    }
+    
     public void setBulkSyncDB(String fDbName, String fScriptName)
     {
-		IDBStorage db = null;
+		DBAdapter db = null;
 		try{
-		    db = RhoClassFactory.createDBStorage();	    
-			db.open( fDbName, "" );
-
+			db = (DBAdapter)alloc(null); 
+    		db.openDB(fDbName, true);
+    		db.setDbPartition(m_strDbPartition);
+			
 		    db.startTransaction();
 			
-		    copyTable("client_info", this.m_dbStorage, db );
+		    copyTable("client_info", m_dbStorage, db.m_dbStorage );
+		    copyChangedValues(db);
 		    
 		    //update User partition
 		    if ( m_strDbPartition.compareTo(USER_PARTITION_NAME()) == 0 )
 		    {
 		        //copy all NOT user sources from current db to bulk db
+		    	startTransaction();
 		        executeSQL("DELETE FROM sources WHERE partition=?", m_strDbPartition);
-		        copyTable("sources", this.m_dbStorage, db );
+		        copyTable("sources", m_dbStorage, db.m_dbStorage );
+		        rollback();
 		    }else
 		    {
 		        //remove all m_strDbPartition sources from user db
 		        //copy all sources from bulk db to user db
 		        DBAdapter dbUser  = getDB(USER_PARTITION_NAME());
+		        dbUser.startTransaction();
 		        dbUser.executeSQL("DELETE FROM sources WHERE partition=?", m_strDbPartition);
-
-		        copyTable("sources", db, dbUser.m_dbStorage );
+		        copyTable("sources", db.m_dbStorage, dbUser.m_dbStorage );
+		        dbUser.endTransaction();
 		    }
-			
-		    db.commit();
+		    getDBPartitions().put(m_strDbPartition, db);
+		    com.rho.sync.SyncThread.getSyncEngine().applyChangedValues(db);
+		    getDBPartitions().put(m_strDbPartition, this);
+		    
+		    db.endTransaction();
 		    db.close();
 
 		    m_dbStorage.close();
@@ -769,12 +865,8 @@ public class DBAdapter extends RubyBasic
 				}
 			}
 			
-			try {
-				if ( db != null)
-					db.close();
-			} catch (DBException e1) {
-				LOG.ERROR("closing of DB caused exception: " + e1.getMessage());
-			}
+			if ( db != null)
+				db.close();
     		
 			throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 		}
@@ -932,7 +1024,7 @@ public class DBAdapter extends RubyBasic
 		    	{
 		    		String szDbName = arg1.toStr();
 		    		String szDbPartition = arg2.toStr();
-		    		((DBAdapter)receiver).openDB(szDbName);
+		    		((DBAdapter)receiver).openDB(szDbName, false);
 		    		((DBAdapter)receiver).setDbPartition(szDbPartition);
 		    		
 		    		DBAdapter.getDBPartitions().put(szDbPartition, receiver);

data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java

@@ -19,4 +19,6 @@ public interface IDBStorage {
 	public abstract void setDbCallback(IDBCallback callback);
 	
 	public abstract String[] getAllTableNames()throws DBException;
+	
+	public boolean isDbFileExists(String strPath);
 }

data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java

@@ -162,7 +162,8 @@ public class NetRequest
 
 				writeHeaders(headers);
 				LOG.INFO("writeHeaders done");
-				m_connection.setRequestMethod(IHttpConnection.POST);
+				//m_connection.setRequestMethod(IHttpConnection.POST);
+				m_connection.setRequestMethod(strMethod);
 				
 				os = m_connection.openOutputStream();
 				os.write(strBody.getBytes(), 0, strBody.length());

data/platform/bb/RubyVM/src/com/rho/net/URI.java

@@ -836,6 +836,21 @@ import com.rho.Tokenizer;
 	return schemespec.toString();	    
   }
   
+  public String getLastNamePart()
+  {
+	int nSlash = m_path.lastIndexOf('/');
+	if ( nSlash < 0 )
+	    nSlash = m_path.lastIndexOf('\\');
+	
+	String strRes;
+	if ( nSlash >= 0 )
+	    strRes = m_path.substring(nSlash+1);
+	else
+		strRes = m_path;
+	
+	return strRes;
+  }
+  
   public String getUserinfo() {
     return m_userinfo;
   }
@@ -1199,6 +1214,71 @@ import com.rho.Tokenizer;
 	  return sb.toString();
   }
 
+  static public String urlDecode(String fullPath )
+  {
+	  StringBuffer sb = new StringBuffer();
+	  int len = fullPath.length();
+	  
+	  for  (int index=0; index < len ; index++)
+	  {
+    	char c1 = fullPath.charAt(index);
+		if (c1 != '%') 
+		{
+			sb.append(c1);
+			continue;
+		}
+		index++;
+		c1 = fullPath.charAt(index);
+		
+		if (c1 >= '0' && c1 <= '9')
+			c1 = (char)(c1 - '0');
+		else if (c1 >= 'a' && c1 <= 'f')
+			c1 = (char)(c1 - 'a' + 10);
+		else if (c1 >= 'A' && c1 <= 'F')
+			c1 = (char)(c1 - 'A' + 10);
+		else
+			break;
+		
+		index++;
+		char c2 = fullPath.charAt(index);
+		if (c2 >= '0' && c2 <= '9')
+			c2 = (char)(c2 - '0');
+		else if (c2 >= 'a' && c2 <= 'f')
+			c2 = (char)(c2 - 'a' + 10);
+		else if (c2 >= 'A' && c2 <= 'F')
+			c2 = (char)(c2 - 'A' + 10);
+		else
+			break;
+			
+		char c = (char)((c1 << 4) | c2);
+		sb.append(c);
+	}
+	  
+	return sb.toString();
+  }
+  
+  static public String urlEscapeSymbols(String fullPath)
+  {
+	  StringBuffer sb = new StringBuffer();
+	  int len = fullPath.length();
+	  
+	  char c;
+      for  (int index=0; index < len ; index++)
+      {
+          c = fullPath.charAt(index);
+          if ( (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') ||
+               c == '_' || c == '.') 
+          {
+              sb.append(c);
+          }else 
+          {
+        	  sb.append('_');;
+          }
+      }
+
+      return sb.toString();
+  }
+  
   static public String ampEncode(String fullPath)
   {
 	  StringBuffer sb = new StringBuffer();

data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java

@@ -80,7 +80,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     boolean m_bNoThreaded = false;
     int m_nErrCode = RhoAppAdapter.ERR_NONE;
     String m_strError = "";
-    boolean m_bIsSearch;
+    boolean m_bIsSearch, m_bIsSchemaChanged;
     
     void setState(int eState){ m_syncState = eState; }
     int getState(){ return m_syncState; }
@@ -96,6 +96,9 @@ public class SyncEngine implements NetRequest.IRhoSession
     void setSession(String strSession){m_strSession=strSession;}
     boolean isSessionExist(){ return m_strSession != null && m_strSession.length() > 0; }
     
+    void setSchemaChanged(boolean bChanged){ m_bIsSchemaChanged = bChanged; }
+    boolean isSchemaChanged(){ return m_bIsSchemaChanged; }
+    
     DBAdapter getUserDB(){ return DBAdapter.getUserDB(); }
     DBAdapter getDB(String strPartition){ return DBAdapter.getDB(strPartition); }
     
@@ -136,6 +139,7 @@ public class SyncEngine implements NetRequest.IRhoSession
         m_bStopByUser = false;
         m_nErrCode = RhoAppAdapter.ERR_NONE;
         m_strError = "";
+        m_bIsSchemaChanged = false;
         
         loadAllSources();
 
@@ -418,6 +422,22 @@ public class SyncEngine implements NetRequest.IRhoSession
 		return findSource(new SourceID(strSrcName));		
 	}
 	
+	public void applyChangedValues(DBAdapter db)throws Exception
+	{
+	    IDBResult resSrc = db.executeSQL( "SELECT DISTINCT(source_id) FROM changed_values" );
+	    for ( ; !resSrc.isEnd(); resSrc.next() )
+	    {
+	        int nSrcID = resSrc.getIntByIdx(0);
+	        IDBResult res = db.executeSQL("SELECT source_id,sync_type,name, partition from sources WHERE source_id=?", nSrcID);
+	        if ( res.isEnd() )
+	            continue;
+
+	        SyncSource src = new SyncSource( res.getIntByIdx(0), res.getStringByIdx(2), "none", db, this );
+
+	        src.applyChangedValues();
+	    }
+	}
+	
 	void loadAllSources()throws DBException
 	{
 	    m_sources.removeAllElements();

data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java

@@ -450,7 +450,12 @@ public class SyncNotify {
 			        if ( bFinish )
 			        {
 				        if ( nErrCode == RhoAppAdapter.ERR_NONE )
-				        	strBody += (src == null && strParams.length() == 0) ? "complete" : "ok";				        	
+				        {
+				        	if ( getSync().isSchemaChanged() )
+				        		strBody += "schema_changed";
+				        	else				        	
+				        		strBody += (src == null && strParams.length() == 0) ? "complete" : "ok";
+				        }
 				        else
 				        {
 				        	if ( getSync().isStoppedByUser() )

data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java

@@ -286,7 +286,7 @@ class SyncSource
 	    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
 	    {
 	        String strBody1;
-	        strBody1 = makePushBody_Ver3(arUpdateTypes[i]);
+	        strBody1 = makePushBody_Ver3(arUpdateTypes[i], true);
 	        if (strBody1.length() > 0)
 	        {
 	            strBody += "," + strBody1;
@@ -360,7 +360,7 @@ class SyncSource
 	//{"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"}}}
-	String makePushBody_Ver3( String strUpdateType)throws DBException
+	String makePushBody_Ver3( String strUpdateType, boolean isSync)throws DBException
 	{
 		String strBody = "";
 	    getDB().Lock();
@@ -394,7 +394,12 @@ class SyncSource
 	        }
 
 	        if ( strBody.length() == 0 )
-	            strBody += "\"" + strUpdateType + "\":{";
+	        {
+	            if ( !isSync )
+	                strBody += "{";
+	            else
+	                strBody += "\"" + strUpdateType + "\":{";
+	        }
 
 	        if ( strObject.compareTo(strCurObject) != 0 )
 	        {
@@ -431,12 +436,38 @@ class SyncSource
 	        strBody += "}";
 	    }
 
-	    getDB().executeSQL("UPDATE changed_values SET sent=1 WHERE source_id=? and update_type=? and sent=0", getID(), strUpdateType );
+	    if ( isSync )	    
+	    	getDB().executeSQL("UPDATE changed_values SET sent=1 WHERE source_id=? and update_type=? and sent=0", getID(), strUpdateType );
+	    
 	    getDB().Unlock();
 	    
 	    return strBody;
 	}
 
+	void applyChangedValues()throws Exception
+	{
+	    String strBody = makePushBody_Ver3("create", false);
+	    if ( strBody != null && strBody.length() > 0 )
+	    {
+	        JSONEntry oEntry = new JSONEntry(strBody);
+	        processSyncCommand("insert", oEntry );
+	    }
+
+	    strBody = makePushBody_Ver3("delete", false);
+	    if ( strBody != null && strBody.length() > 0 )
+	    {
+	        JSONEntry oEntry = new JSONEntry(strBody);
+	        processSyncCommand("delete", oEntry );
+	    }
+
+	    strBody = makePushBody_Ver3("update", false);
+	    if ( strBody != null && strBody.length() > 0 )
+	    {
+	        JSONEntry oEntry = new JSONEntry(strBody);
+	        processSyncCommand("insert", oEntry );
+	    }
+	}
+	
 	void syncServerChanges()throws Exception
 	{
 		LOG.INFO("Sync server changes source ID :" + getID() );
@@ -569,26 +600,33 @@ class SyncSource
 	        JSONEntry oCmds = oJsonArr.getCurItem();
 	        PROF.START("Data");
 
-	        getDB().startTransaction();
-	        if ( oCmds.hasName("metadata") && getSync().isContinueSync() )
+	        if ( oCmds.hasName("schema-changed") )
 	        {
-	            String strMetadata = oCmds.getString("metadata");
-	            getDB().executeSQL("UPDATE sources SET metadata=? WHERE source_id=?", strMetadata, getID() );
+	            getSync().stopSync();    
+	            getSync().setSchemaChanged(true);
+	        }else
+	        {
+		        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") );
+	
+		        PROF.STOP("Data");
+	
+			    PROF.START("DB");
+		        getDB().endTransaction();
+		        PROF.STOP("DB");
+	
+		        getNotify().fireObjectsNotification();
 	        }
-	        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") );
-
-	        PROF.STOP("Data");
-
-		    PROF.START("DB");
-	        getDB().endTransaction();
-	        PROF.STOP("DB");
-
-	        getNotify().fireObjectsNotification();
 	    }
 
 		PROF.START("Data1");
@@ -618,6 +656,9 @@ class SyncSource
 	            }
 	        }
 
+	        if ( getSyncType().compareTo("none") == 0 )
+	        	continue;
+	        
 	        int nSyncObjectCount  = getNotify().incLastSyncObjectCount(getID());
 	        if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
 	            getNotify().fireSyncNotification(this, false, RhoAppAdapter.ERR_NONE, "");
@@ -707,16 +748,21 @@ class SyncSource
 	            strSqlUpdate += getName() + " SET " + strSet + " WHERE object=?";
 	            getDB().executeSQLEx(strSqlUpdate, vecValues);
 
-	            // oo conflicts
-	            for( int i = 0; i < (int)vecAttrs.size(); i++ )
+	            if ( getSyncType().compareTo("none") != 0 )
 	            {
-	                getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", 
-	                    strObject, vecAttrs.elementAt(i), getID() );
+		            // oo conflicts
+		            for( int i = 0; i < (int)vecAttrs.size(); i++ )
+		            {
+		                getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", 
+		                    strObject, vecAttrs.elementAt(i), getID() );
+		            }
+		            //
 	            }
-	            //
 	        }
 
-	        getNotify().onObjectChanged(getID(),strObject, SyncNotify.enUpdate);
+	        if ( getSyncType().compareTo("none") != 0 )	        
+	        	getNotify().onObjectChanged(getID(),strObject, SyncNotify.enUpdate);
+	        
 	        m_nInserted++;
 	    }else if (strCmd.compareTo("delete") == 0)
 	    {
@@ -762,15 +808,18 @@ class SyncSource
 	            }
 	        }
 	        
-	        getNotify().onObjectChanged(getID(), strObject, SyncNotify.enDelete);
-	        // oo conflicts
-	        for( int i = 0; i < (int)vecAttrs.size(); i++ )
+	        if ( getSyncType().compareTo("none") != 0 )
 	        {
-	            getDB().executeSQL("UPDATE changed_values SET sent=3 where object=? and attrib=? and source_id=?", 
-	                strObject, vecAttrs.elementAt(i), getID() );
+		        getNotify().onObjectChanged(getID(), strObject, SyncNotify.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.compareTo("links") == 0 )
 	    {
@@ -860,22 +909,30 @@ class SyncSource
                     "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() );
-	            //
+	            if ( getSyncType().compareTo("none") != 0 )
+	            {
+		            // 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, SyncNotify.enUpdate);
+	        if ( getSyncType().compareTo("none") != 0 )	        
+	        	getNotify().onObjectChanged(getID(),strObject, SyncNotify.enUpdate);
+	        
 	        m_nInserted++;
 	    }else if (strCmd.compareTo("delete") == 0)
 	    {
 	        getDB().executeSQL("DELETE FROM object_values where object=? and attrib=? and source_id=?", strObject, oAttrValue.m_strAttrib, getID() );
-	        getNotify().onObjectChanged(getID(), strObject, SyncNotify.enDelete);
-	        // oo conflicts
-	        getDB().executeSQL("UPDATE changed_values SET sent=3 where object=? and attrib=? and source_id=?", strObject, oAttrValue.m_strAttrib, getID() );
-	        //
-
+	        
+	        if ( getSyncType().compareTo("none") != 0 )
+	        {
+		        getNotify().onObjectChanged(getID(), strObject, SyncNotify.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.compareTo("links") == 0 )
 	    {
@@ -891,6 +948,42 @@ class SyncSource
 	
 	private String makeFileName(CAttrValue value)throws Exception
 	{
+		String strExt = "";
+
+	    URI uri = new URI(value.m_strValue);    
+	    String strQuest = uri.getQueryString();
+
+	    if (strQuest != null && strQuest.length() > 0)
+	    {
+			int nExt = strQuest.indexOf("extension=");
+			if ( nExt >= 0 )
+	        {
+				int nExtEnd = strQuest.indexOf("&", nExt);
+				if (nExtEnd < 0 )
+					nExtEnd = strQuest.length();
+				
+				strExt = strQuest.substring(nExt+10, nExtEnd);
+			}
+	    }
+
+	    if ( strExt.length() == 0 )
+	    {
+	        String strFileName = uri.getLastNamePart();
+	        int nExt = strFileName != null ? strFileName.lastIndexOf('.') : -1;
+			if ( nExt >= 0 )
+	            strExt = strFileName.substring(nExt);
+	    }
+
+	    if ( strExt.length() == 0 )
+	        strExt = ".bin";
+	    else if ( strExt.charAt(0) != '.' )    
+	        strExt = "." + strExt;
+
+		String fName = RhodesApp.getInstance().getBlobsDirPath() + "/id_" + TimeInterval.getCurrentTime().toULong() + strExt;
+		
+		return  fName;
+		
+/*		
 		String strExt = ".bin";
 		URI uri = new URI(value.m_strValue);
 		int nDot = uri.getPath().lastIndexOf('.');
@@ -909,7 +1002,7 @@ class SyncSource
 		
 		String fName = RhodesApp.getInstance().getBlobsDirPath() + "/id_" + TimeInterval.getCurrentTime().toULong() + strExt;
 		
-		return fName;
+		return fName;*/
 	}
 	
 	boolean downloadBlob(CAttrValue value)throws Exception