beezwax 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/btrieve/btrieve_const.rb

@@ -1,5 +1,4 @@
 module BtrCodes
-  PK_KEYS=[:"kid - date",:"kid - time",:"kid - user",:"kid - mult",:"kid - comm"]
   OK = 0
   OPEN = 0
   CLOSE = 1
@@ -9,6 +8,7 @@ module BtrCodes
   GET_EQUAL = 5
   GET_NEXT = 6
   GET_GREATER_THAN_OR_EQUAL = 9
+  GET_LESS_THAN_OR_EQUAL = 11
   SET_DIRECTORY = 17
   BEGIN_TRANSACTION = 19
   END_TRANSACTION = 20

data/lib/btrieve/btrieve_core.rb

@@ -16,8 +16,6 @@ module Btrieve
   attach_function :BTRCALLID, [:int, :pointer, :pointer, :pointer, :pointer, :uchar, :uchar, :pointer], :int
   
   def btr_op(session, ops, pos_buffer, data_buffer, key_buffer, key_number, valid_return_codes=[0])
-    #result_code=nil
-    #dir_voodoo(session) do
       data_length = [data_buffer.size].pack('L')
       key_length = key_buffer.size
       result_code = BTRCALLID(ops, pos_buffer, data_buffer, data_length, key_buffer, key_length, key_number, session.client_id)
@@ -25,7 +23,6 @@ module Btrieve
         p "ops=#{ops} data_buffer.length=#{data_buffer.length} key_buffer=#{key_buffer}, key_buffer.length=#{key_buffer.length}, key_number=#{key_number}, session.client_id=#{session.client_id}"
         raise Exception.new("PSQL Exception Code #{result_code} - #{EXCEPTION_MESSAGES[result_code]}")
       end
-    #end
     result_code
   end
 
@@ -53,6 +50,5 @@ end
 require_relative 'btrieve_session'
 require_relative 'btrieve_table'
 require_relative 'btrieve_schema'
-require_relative 'btrieve_map'
 require_relative 'btrieve_record'
 require_relative 'btrieve_model'

data/lib/btrieve/btrieve_record.rb

@@ -82,15 +82,16 @@ class BtrieveRecord
   end
 
   def get_all_attributes()
-    get_attributes(self.btrieve_table.schema[:columns].keys.sort.inject([]){|array,column|array<<column;array})
+    cols=@btrieve_table.schema[:columns].keys.sort
+    get_attributes(cols)
   end
 
   def primary_key()
-    get_composite_key(PK_KEYS)
+    get_composite_key(@btrieve_table.primary_key)
   end
 
   def foreign_key(prefix)
-    keys=PK_KEYS.map{|key|:"#{prefix} #{key.to_s}"}
+    keys=@btrieve_table.primary_key.map{|key|:"#{prefix} #{key.to_s}"}
     get_composite_key(keys)
   end
 
@@ -129,7 +130,7 @@ class BtrieveRecord
     packer = "#{datatype}#{sizeof}"
     array = [value]
     packed_value = array.pack(packer)
-    range = (offset..offset+sizeof-1)
+    range = (offset..offset+packed_value.size-1)
     @data_buffer[range] = packed_value
   end
 
@@ -137,16 +138,16 @@ class BtrieveRecord
     @btrieve_table.schema[:columns].keys.inject('') { |pretty_print, key| pretty_print = "#{pretty_print} #{key}=>#{self[key]}"; pretty_print }
   end
 
+  def version()
+    Digest::MD5.hexdigest(@data_buffer)
+  end
+
   def method_missing(symbol)
     return get_unique_reference(symbol) if(@btrieve_table.schema[:one_to_one][symbol])
     return get_multiple_references(symbol) if(@btrieve_table.schema[:one_to_many][symbol])
     super(symbol)
   end
 
-  def version()
-    Digest::MD5.hexdigest(@data_buffer)
-  end
-
   private
 
   def dereference(association_group, association_name, &block)

data/lib/btrieve/btrieve_schema.rb

@@ -30,7 +30,7 @@ class BtrieveSchema
       offset = xfield[:'xe$offset']
       size = xfield[:'xe$size']
       datatype = xfield[:'xe$datatype']
-      datatype = (name == 'kid - mult') ? 14 : datatype # BS line of code...
+      datatype = (name == 'kid - mult') ? 14 : datatype # Absolute BS line of code...  Needed for CTA-FOS
       unpacker = BtrieveSchema.unpacker(offset, datatype, size)
       schema[:columns][name.to_sym] = {:unpacker=>unpacker, :id=>id, :offset=>offset, :datatype=>datatype, :size=>size}
       schema[:record_size] += size

data/lib/btrieve/btrieve_session.rb

@@ -28,8 +28,7 @@ class BtrieveSession
     btr_op(self, END_TRANSACTION, NULL_BUFFER, NULL_BUFFER, NULL_BUFFER, NULL_KEY)
   end
 
-  def get_table(url_tablename)
-    tablename=BtrieveTable.url_to_tablename(url_tablename)
+  def get_table(tablename)
     table=@table_cache[tablename]||=BtrieveTable.new(tablename.to_sym, self)
     [table,table.version]
   end

data/lib/btrieve/btrieve_table.rb

@@ -2,7 +2,8 @@ require 'digest/md5'
 
 class BtrieveTable
   include Btrieve
-  attr_reader :tablename, :session, :pos_buffer, :schema
+  attr_reader :tablename, :session, :pos_buffer, :schema 
+  attr_accessor :primary_key
 
   def initialize(tablename, session, schema=nil)
     @tablename = tablename
@@ -57,13 +58,15 @@ class BtrieveTable
       result = []
       batch() do
         btr_record = BtrieveRecord.new(self)
-        btr_op(@session, GET_GREATER_THAN_OR_EQUAL, @pos_buffer, btr_record.data_buffer, key_buffer, index)
-        result << btr_record
-        while(true)
-          btr_record = BtrieveRecord.new(self)
-          op_result = btr_op(@session, GET_NEXT, @pos_buffer, btr_record.data_buffer, key_buffer, index_number, [OK, EOF, 21])
-          break unless btr_record.get_attributes(absolute_match_keys)==absolute_match and op_result!=EOF and op_result!=21
+        ops_result = btr_op(@session, GET_GREATER_THAN_OR_EQUAL, @pos_buffer, btr_record.data_buffer, key_buffer, index, [OK, EOF])
+        if OK==ops_result
           result << btr_record
+          while(true)
+            btr_record = BtrieveRecord.new(self)
+            op_result = btr_op(@session, GET_NEXT, @pos_buffer, btr_record.data_buffer, key_buffer, index_number, [OK, EOF, 21])
+            break unless btr_record.get_attributes(absolute_match_keys)==absolute_match and op_result!=EOF and op_result!=21
+            result << btr_record
+          end
         end
       end
       result
@@ -89,21 +92,21 @@ class BtrieveTable
   end
 
   def version()
-    Digest::MD5.hexdigest(BtrieveSchema.sort(schema[:columns]).inject([]){|array,column|array<<BtrieveSchema.readable_type(column);array}.to_s)
+    Digest::MD5.hexdigest(BtrieveSchema.sort(schema[:columns]).inject([]){|array,column|array << BtrieveSchema.readable_type(column);array}.to_s)
   end
 
-  def self.primary_key_match(pk)
-    vals=pk.split('.')
-    {PK_KEYS[0]=>vals[0].to_i,PK_KEYS[1]=>vals[1].to_i,PK_KEYS[2]=>vals[2],PK_KEYS[3]=>vals[3].to_i,PK_KEYS[4]=>vals[4].to_i}
-  end
+  #def self.primary_key_match(pk)
+  #  vals=pk.split('.')
+  #  {PK_KEYS[0]=>vals[0].to_i,PK_KEYS[1]=>vals[1].to_i,PK_KEYS[2]=>vals[2],PK_KEYS[3]=>vals[3].to_i,PK_KEYS[4]=>vals[4].to_i}
+  #end
 
-  def self.tablename_to_url(tablename)
-    tablename.gsub(' & ','.and.').gsub('a/c ', 'ac.').gsub('es - o','es.o').gsub(' ','.')
-  end
+  #def self.tablename_to_url(tablename)
+  #  tablename.gsub(' & ','.and.').gsub('a/c ', 'ac.').gsub('es - o','es.o').gsub(' ','.')
+  #end
 
-  def self.url_to_tablename(url_tablename)
-    url_tablename.gsub('.and.', ' & ').gsub('ac.', 'a/c ').gsub('es.o','es - o').gsub('.',' ')
-  end
+  #def self.url_to_tablename(url_tablename)
+  #  url_tablename.gsub('.and.', ' & ').gsub('ac.', 'a/c ').gsub('es.o','es - o').gsub('.',' ')
+  #end
   
   private
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beezwax
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Patrick Lardin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -07:00
+date: 2010-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency