trix51db 0.1.0 → 0.1.1

data/lib/trix51db.rb

@@ -719,8 +719,8 @@ end
 	  hashdata.each_pair do |k,v|
 	    next if v.nil?
 	    str = ''
-	    str = "#{k} = #{v}"  if v.class.name != 'String'
-	    str = "#{k} = \"#{v}\"" if v.class.name == 'String'
+	    str = %Q|#{k} = #{v}|  if v.class.name != 'String'
+	    str = %Q{#{k} = %Q|#{v}|} if v.class.name == 'String'
 	    inits.push( str )
 	  end
 	  inits.push( expression )
@@ -728,29 +728,6 @@ end
 	  return eval( str )
 	end
 	
-	def hash_compare( h1, h2 ) #:nodoc:
-	  
-	  # Comparitors: like, not_like, not, equals, lt, gt
-	  # 
-	  
-	  h1.keys.each { |key|
-	    #pp key
-	    #pp self.structure[key]
-	    if self.structure[key][:datatype] == 'calculated' then
-		h2[key] = self.eval_in_context( h2, self.structure[key][:calculation] )
-	    end
-	    v1 = h1[key]
-	    if v1.class.name != 'Hash' then
-	      return false if not comparison( h2[key], 'is', h1[key] )
-	    else
-	      v1.each_pair do |operand, target|
-	         return false if not comparison( h2[key], operand, target )
-	      end
-	    end
-	  }
-	  return true
-	end
-	
 	# delete records matching the specified hash
 	# ==== Example
 	#     num_deleted = animal.delete_hash( {
@@ -1057,34 +1034,31 @@ end
 	
 	def index_add( urid, record ) #:nodoc:
 	  record.keys.each { |fieldname|
-	    if self.indexed?(fieldname) then
-	         # check index exists
-	         if self.indices[fieldname].nil? then
-	              self.index_build( fieldname )
-	         else
-	              # partial add
-	              res = self.indices[fieldname]
-	              rv = record[fieldname]
-		      rlist = res[rv] || []
-		      rlist.push( urid )
-		      res[rv] = rlist	              
-	         end
-	    end	    
+	    next unless self.indexed?(fieldname) 
+	    # check index exists
+	    if self.indices[fieldname].nil? then
+		self.index_build( fieldname )
+	    else
+		# partial add
+		rv = record[fieldname]
+		rlist = self.indices[fieldname][rv] || []
+		rlist.push( urid )
+		self.indices[fieldname][rv] = rlist
+	    end 
 	  }
 	end
 	
 	def index_update( oldurid, newurid, record ) #:nodoc:
 	  record.keys.each { |fieldname|
-	    if self.indexed?(fieldname) then
-	         # check index exists
-	         if self.indices[fieldname].nil? then
-	              self.index_build( fieldname )
-	         else
-	              # partial update
-	              self.index_remove( oldurid )
-	              self.index_add( newurid, record )              
-	         end
-	    end
+	    next unless self.indexed?(fieldname)
+	    # check index exists
+	    if self.indices[fieldname].nil? then
+		self.index_build( fieldname )
+	    else
+		# partial update
+		self.index_remove( oldurid )
+		self.index_add( newurid, record )              
+	    end    
 	  }
 	end
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trix51db
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies: []
 description: Database based on GDBM and Marshal with complex queries, indexes, constraints
   relationships and calculated fields.