rhodes 2.0.0.beta9 → 2.0.0.beta10

data/lib/extensions/rhoxml/rexml/document.rb

@@ -492,13 +492,16 @@ module REXML
 
     def value
       #TODO: 
-      #return @unnormalized if @unnormalized
-      #@unnormalized = Text::unnormalize( @string, doctype )
+      return @unnormalized if @unnormalized
+      @unnormalized = Text::unnormalize( @string, doctype )
       
-      @string
+      @unnormalized
     end
 
     #TODO optimize it - regular expressions is slow on BB
+    def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
+        string.to_s.gsub(/\&amp;/, "&").gsub(/\&quot;/, "\"").gsub(/\&gt;/, ">").gsub(/\&lt;/, "<")
+    end
 =begin    
     def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
       string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) {

data/lib/extensions/rhoxml/rexml/element.rb

@@ -77,8 +77,8 @@ module REXML
       rv = "<#@expanded_name"
 
       @attributes.each_attribute do |attr|
-        rv << " "
-        attr.write( rv, 0 )
+        rv << " " << attr
+        #attr.write( rv, 0 )
       end
 
       if children.size > 0
@@ -913,8 +913,7 @@ module REXML
     #  XPath.each(doc.root, 'child::node()', &block)
     #  #-> Yields <b/>, <c/>, <d/>, sean, <b/>, <c/>, <d/>
     def each( xpath=nil, &block)
-      puts "each : #{xpath}"
-      XPath::each( @element, xpath ) {|e| yield e if e.kind_of? Element }
+      XPath::each( @element, xpath ) {|e| yield e if e.kind_of?( Element) }
     end
 
     def collect( xpath=nil, &block )
@@ -983,5 +982,23 @@ module REXML
     def initialize element
       @element = element
     end
+    
+    # Iterates over the attributes of an Element.  Yields actual Attribute
+    # nodes, not String values.
+    # 
+    #  doc = Document.new '<a x="1" y="2"/>'
+    #  doc.root.attributes.each_attribute {|attr|
+    #    p attr.expanded_name+" => "+attr.value
+    #  }
+    def each_attribute # :yields: attribute
+      each_value do |val|
+        #if val.kind_of? Attribute
+          yield val
+        #else
+        #  val.each_value { |atr| yield atr }
+        #end
+      end
+    end
+    
   end
 end

data/lib/extensions/rhoxml/rexml/parsers/xpathparser.rb

@@ -17,6 +17,7 @@ module REXML
       end
 
       def parse path
+        return [:child, :any] if path == '*'
         path.gsub!(/([\(\[])\s+/, '\1') # Strip ignorable spaces
         path.gsub!( /\s+([\]\)])/, '\1' )
         parsed = []

data/lib/framework/rho/rho.rb

@@ -39,6 +39,7 @@ module Rho
       
       # Initialize application and sources
       @@rho_framework = self
+      @db_partitions = {}
       init_sources()
     end
 
@@ -154,6 +155,21 @@ module Rho
       end
     end
 
+    def check_source_migration(app)
+	  uniq_sources = Rho::RhoConfig::sources.values
+      uniq_sources.each do |source|
+          next unless source['migrate_version']
+          
+          db = ::Rho::RHO.get_src_db(source['name'])	  
+          
+          if !app.on_migrate_source(source['migrate_version'], source)
+            db.execute_batch_sql(source['schema']['sql'])
+          end  
+          
+          db.update_into_table('sources', {"schema_version"=>source['schema_version']},{"name"=>source['name']})
+      end
+    end
+    
     def load_server_sources(data)
         puts "load_server_sources : #{data}"
         
@@ -183,23 +199,32 @@ module Rho
 
             hashSrcs = Rhom::RhomSource::find_all_ashash
             puts "hashSrcs : #{hashSrcs}"
+            Rho::RhoConfig::reset_max_config_srcid()
             arSrc.each do |name, src|
                 oldSrc = hashSrcs[name]
                 puts "oldSrc: #{oldSrc}"
                 #update schema_version
                 src['schema_version'] = src['schema']['version'] if src['schema'] && src['schema']['version']
-                if oldSrc
-                    oldVer = oldSrc.schema_version
-                    newVer = src['schema_version']
-                    if ( oldVer != newVer )    
-                        get_app(APPNAME).on_migrate_source(oldSrc.schema_version, src)
-                    end
+                src['sync_type'] ||= 'incremental'
+                #if oldSrc
+                #    oldVer = oldSrc.schema_version
+                #    newVer = src['schema_version']
+                #    if ( oldVer != newVer )    
+                #        get_app(APPNAME).on_migrate_source(oldSrc.schema_version, src)
+                #    end
+                #end
+                
+                Rho::RhoConfig::sources[name] = nil
+                @db_partitions.each_value do |db_part|
+                  db_part.delete_from_table('sources', {"name"=>name})
                 end
                 
                 Rho::RhoConfig::add_source(name, src)
             end
             
             init_sources()
+            
+            check_source_migration(get_app(APPNAME))
         rescue Exception => e
             puts "Error load_server_sources: #{e}"
             puts "Trace: #{e.backtrace}"
@@ -219,7 +244,6 @@ module Rho
     def init_sources()
         return unless defined? Rho::RhoConfig::sources
     
-        @db_partitions = {}
         uniq_sources = Rho::RhoConfig::sources.values
         puts 'init_sources: ' + uniq_sources.inspect
 
@@ -229,7 +253,7 @@ module Rho
         
         uniq_sources.each do |source|
           partition = source['partition']
-          @db_partitions[partition] = nil
+          @db_partitions[partition] = nil unless @db_partitions[partition]
           
           if source['belongs_to']
             source['belongs_to'].each do |attrib, src_name|    
@@ -250,10 +274,11 @@ module Rho
         end
         
         #user partition should alwayse exist
-        @db_partitions['user'] = nil
+        @db_partitions['user'] = nil unless @db_partitions['user']
         hash_migrate = {}
-        @db_partitions.each_key do |partition|
-            db = Rhom::RhomDbAdapter.new(Rho::RhoFSConnector::get_db_fullpathname(partition), partition)
+        puts "@db_partitions : #{@db_partitions}"
+        @db_partitions.each do |partition, db|
+            db = Rhom::RhomDbAdapter.new(Rho::RhoFSConnector::get_db_fullpathname(partition), partition) unless db
             db.start_transaction
             begin
                 init_db_sources(db, uniq_sources, partition,hash_migrate)
@@ -269,35 +294,32 @@ module Rho
         ::Rho::RHO.init_schema_sources(hash_migrate)
     end
 
-    def self.processIndexes(index_ar, src_name, is_unique)
+    def self.processIndexes(index_param, src_name, is_unique)
 
-        return "" unless index_ar
+        return "" unless index_param
         
         strUnique = 'UNIQUE' if is_unique
         strRes = ""
-        index_ar.each do |index_param|            
-        
-            if index_param.is_a?( String )
-                strRes = index_param
-            else
-                nInd = 0
+        if index_param.is_a?( String )
+            strRes = index_param
+        else
+            nInd = 0
+            
+            index_param.each do |index_name, index_cols|
+                strCols = ""
+                if index_cols.is_a?(String)
+                    index_cols = index_cols.split(',')    
+                end
                 
-                index_param.each do |index_name, index_cols|
-                    strCols = ""
-                    if index_cols.is_a?(String)
-                        index_cols = index_cols.split(',')    
-                    end
-                    
-                    index_cols.each do |col|
-                        strCols += ',' if strCols.length() > 0
-                        strCols += "\"#{col}\""
-                    end
-
-                    #strIndName = "rhoIndex" + (is_unique ? "U" : "" ) + "_#{nInd}"
-                    strIndex = "CREATE #{strUnique} INDEX \"#{index_name}\" on #{src_name} (#{strCols});\r\n"
-                    strRes += strIndex
-                    nInd += 1
+                index_cols.each do |col|
+                    strCols += ',' if strCols.length() > 0
+                    strCols += "\"#{col}\""
                 end
+
+                #strIndName = "rhoIndex" + (is_unique ? "U" : "" ) + "_#{nInd}"
+                strIndex = "CREATE #{strUnique} INDEX \"#{index_name}\" on #{src_name} (#{strCols});\r\n"
+                strRes += strIndex
+                nInd += 1
             end
         end
         strRes
@@ -310,7 +332,7 @@ module Rho
         uniq_sources.each do |source|
           db = get_src_db(source['name'])
           
-          next unless source['schema'] && source['model_type'] == 'fixed_schema'
+          next unless source['schema']
           
           call_migrate = false
           if db.table_exist?(source['name'])
@@ -354,9 +376,15 @@ module Rho
       return source['str_blob_attribs'] if source['str_blob_attribs']
       source['str_blob_attribs'] = ""
       
-      if source['schema'] && source['schema']['property']
+      if source['schema']
+        props = source['schema']['property']
+      else
+        props = source['property']
+      end
+      
+      if props    
         str = ""
-        source['schema']['property'].each do |name, ar_type|
+        props.each do |name, ar_type|
             if ar_type && ar_type.is_a?(String)
                 ar_type = ar_type.split(',')    
             end
@@ -389,11 +417,10 @@ module Rho
           partition = source['partition']
           sync_type = source['sync_type']
           schema_version = source['schema_version']
-          model_type = source['model_type']
           associations = source['str_associations']
           blob_attribs = process_blob_attribs(source, db)
           
-          attribs = db.select_from_table('sources','sync_priority,source_id,partition, sync_type, schema_version, associations, blob_attribs, model_type', {'name'=>name})
+          attribs = db.select_from_table('sources','sync_priority,source_id,partition, sync_type, schema_version, associations, blob_attribs', {'name'=>name})
 
           if attribs && attribs.size > 0 
             if attribs[0]['sync_priority'].to_i != sync_priority.to_i
@@ -418,11 +445,7 @@ module Rho
             if attribs[0]['blob_attribs'] != blob_attribs
                 db.update_into_table('sources', {"blob_attribs"=>blob_attribs},{"name"=>name})
             end
-
-            if attribs[0]['model_type'] != model_type
-                db.update_into_table('sources', {"model_type"=>model_type},{"name"=>name})
-            end
-
+            
             if !source['source_id']
                 source['source_id'] = attribs[0]['source_id'].to_i
                 Rho::RhoConfig::sources[name]['source_id'] = attribs[0]['source_id'].to_i
@@ -438,8 +461,7 @@ module Rho
           
             db.insert_into_table('sources',
                 {"source_id"=>source['source_id'],"name"=>name, "sync_priority"=>sync_priority, "sync_type"=>sync_type, "partition"=>partition,
-                "schema_version"=>source['schema_version'], 'associations'=>associations, 'blob_attribs'=>blob_attribs,
-                "model_type"=>model_type })
+                "schema_version"=>source['schema_version'], 'associations'=>associations, 'blob_attribs'=>blob_attribs })
                 
           end
           
@@ -653,6 +675,10 @@ module Rho
       def max_config_srcid
         @@max_config_srcid
       end
+
+      def reset_max_config_srcid
+        @@max_config_srcid = 1
+      end
         
       def show_log
         RhoConf.show_log

data/lib/framework/rho/rhoapplication.rb

@@ -36,18 +36,7 @@ module Rho
         NativeBar.create(NOBAR_TYPE, [])
 	  end
 	  
-	  uniq_sources = Rho::RhoConfig::sources.values
-      uniq_sources.each do |source|
-          next unless source['migrate_version']
-          
-          db = ::Rho::RHO.get_src_db(source['name'])	  
-          
-          if !on_migrate_source(source['migrate_version'], source)
-            db.execute_batch_sql(source['schema']['sql'])
-          end  
-          
-          db.update_into_table('sources', {"schema_version"=>source['schema_version']},{"name"=>source['name']})
-      end
+	  ::Rho::RHO.get_instance().check_source_migration(self)
           
     end
     
@@ -58,7 +47,7 @@ module Rho
     #return true to run script creating table    
     def on_migrate_source(old_version, new_src)
         puts "on_migrate_source; old_version :#{old_version}; new_src : #{new_src}"
-        if new_src['model_type'] == 'fixed_schema'
+        if new_src['schema']
             db = ::Rho::RHO.get_src_db(new_src['name'])
             db.delete_table(new_src['name'])
             

data/lib/framework/rhodes.rb

@@ -3,7 +3,7 @@ module Rhodes
     VERSION = '2.0.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.3'
+    DBVERSION = '2.0.4'
   end
   
 end

data/lib/framework/rhom/rhom_model.rb

@@ -16,21 +16,22 @@ module Rhom
     end
     
     def fixed_schema?
-        BaseModel.model_params ||= {}
-        BaseModel.model_params["model_type"] = "property_bag" unless BaseModel.model_params["model_type"]
-        
         false
     end
     
     def property(name,type=:string,option=nil)
-      fixed_schema?()
+      if fixed_schema?()
 
-  	  BaseModel.model_params ||= {}
+  	      BaseModel.model_params ||= {}
 
-      BaseModel.model_params['schema'] ||= {}
-      BaseModel.model_params['schema']['property'] ||= {}
-      BaseModel.model_params['schema']['property'][name.to_s] = [type,option] 
-      
+          BaseModel.model_params['schema'] ||= {}
+          BaseModel.model_params['schema']['property'] ||= {}
+          BaseModel.model_params['schema']['property'][name.to_s] = [type,option] 
+      else
+  	      BaseModel.model_params ||= {}
+          BaseModel.model_params['property'] ||= {}
+          BaseModel.model_params['property'][name.to_s] = [type,option] 
+      end
 
     end
 
@@ -63,18 +64,18 @@ module Rhom
   	  return unless fixed_schema?
   	  
       BaseModel.model_params['schema'] ||= {}
-      BaseModel.model_params['schema']['index'] ||= []  	  
+      BaseModel.model_params['schema']['index'] ||= {}  	  
 
-      BaseModel.model_params['schema']['index'] << {name.to_s=>cols}
+      BaseModel.model_params['schema']['index'][name.to_s] = cols
     end
 
     def unique_index(name,cols)
   	  return unless fixed_schema?
   	  
       BaseModel.model_params['schema'] ||= {}
-      BaseModel.model_params['schema']['unique_index'] ||= []  	  
+      BaseModel.model_params['schema']['unique_index'] ||= {}  	  
 
-      BaseModel.model_params['schema']['unique_index'] << {name.to_s=>cols}
+      BaseModel.model_params['schema']['unique_index'][name.to_s] = cols
     end
     
   end
@@ -87,9 +88,6 @@ module Rhom
     end
     
     def fixed_schema?
-        BaseModel.model_params ||= {}
-        BaseModel.model_params["model_type"] = "fixed_schema" unless BaseModel.model_params["model_type"]
-        
         true
     end
     

data/lib/framework/rhom/rhom_object_factory.rb

@@ -119,7 +119,7 @@ module Rhom
                 end
               
                 def is_schema_source
-                    Rho::RhoConfig.sources[get_source_name]['model_type'] == 'fixed_schema'
+                    !Rho::RhoConfig.sources[get_source_name]['schema'].nil?
                 end
                 def get_schema_table_name
                     get_source_name()
@@ -1059,7 +1059,7 @@ module Rhom
               end
           
               def is_inst_schema_source
-                 Rho::RhoConfig.sources[get_inst_source_name]['model_type'] == 'fixed_schema'
+                 !Rho::RhoConfig.sources[get_inst_source_name]['schema'].nil?
               end
               def get_inst_schema_table_name
                  get_inst_source_name()

data/lib/rhodes.rb

@@ -3,7 +3,7 @@ module Rhodes
     VERSION = '2.0.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.3'
+    DBVERSION = '2.0.4'
   end
   
 end

data/platform/android/Rhodes/res/layout/directory_list.xml

@@ -21,7 +21,7 @@ android:text="Look In:"
 <LinearLayout
 android:id="@+id/buttonLayout"
 android:layout_width="fill_parent"
-android:layout_height="wrap_content">
+android:layout_height="wrap_content" android:layout_weight="1">
 
 <ImageView android:id="@+id/preview"
   android:layout_width="120px" 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java

@@ -168,6 +168,10 @@ public class Rhodes extends Activity {
 		return path;
 	}
 	
+	public static String getBlobPath() {
+		return RhodesInstance.getInstance().getRootPath() + "db/db-files";
+	}
+	
 	private RhoLogConf m_rhoLogConf = new RhoLogConf();
 	public RhoLogConf getLogConf() {
 		return m_rhoLogConf;
@@ -463,6 +467,8 @@ public class Rhodes extends Activity {
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		
+		Logger.T(TAG, "+++ onCreate");
+		
 		Thread ct = Thread.currentThread();
 		ct.setPriority(Thread.MAX_PRIORITY);
 		uiThreadId = ct.getId();
@@ -537,29 +543,51 @@ public class Rhodes extends Activity {
 		});
 		init.start();
 	}
-
+	
 	@Override
-	public void onConfigurationChanged(Configuration newConfig) {
-		super.onConfigurationChanged(newConfig);
+	protected void onRestart() {
+		super.onRestart();
+		Logger.T(TAG, "+++ onRestart");
 	}
 	
 	@Override
-	protected void onPause() {
-		super.onPause();
+	protected void onStart() {
+		super.onStart();
+		Logger.T(TAG, "+++ onStart");
 	}
 	
 	@Override
 	protected void onResume() {
 		super.onResume();
+		Logger.T(TAG, "+++ onResume");
+	}
+	
+	@Override
+	protected void onPause() {
+		Logger.T(TAG, "+++ onPause");
+		super.onPause();
 	}
 	
+	@Override
+	protected void onStop() {
+		Logger.T(TAG, "+++ onStop");
+		super.onStop();
+	}
+		
 	@Override
 	protected void onDestroy() {
+		Logger.T(TAG, "+++ onDestroy");
 		stopSelf();
 		
 		super.onDestroy();
 	}
 	
+	@Override
+	public void onConfigurationChanged(Configuration newConfig) {
+		Logger.T(TAG, "+++ onConfigurationChanged");
+		super.onConfigurationChanged(newConfig);
+	}
+	
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		switch (keyCode) {