kevintyll-ofac 1.1.0 → 1.1.1

data/History.txt

@@ -11,4 +11,11 @@
 == 1.1.0 2009-05-12
 
 * 1 minor enhancement:
-  * Modified the match alogorithm to reduct the score if there is not an address or city match if the data is in the database.
+  * Modified the match alogorithm to reduct the score if there is not an address or city match if the data is in the database.
+
+== 1.1.1 2009-05-13
+
+* 2 minor changes:
+  * Changed the sql in the initial search to do a like instead of a soundex.  For short names, the soundex returned almost the entire table
+    making the process take too long.
+  * Also changed the sql to only return individuals, also for the sake of performance.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 0
+:patch: 1
 :major: 1

data/generators/ofac_migration/templates/migration.rb

@@ -22,6 +22,7 @@ class CreateOfacSdnTable < ActiveRecord::Migration
       t.string    :alternate_identity_remarks
       t.timestamps
     end
+    add_index :ofac_sdns, :sdn_type
   end
   
   def self.down

data/lib/ofac/models/ofac.rb

@@ -1,6 +1,3 @@
-require 'activerecord'
-require 'active_record/connection_adapters/mysql_adapter'
-
 class Ofac
 
   
@@ -99,29 +96,26 @@ class Ofac
 
   def calculate_score
     unless @identity[:name].to_s == ''
-      if OfacSdn.connection.kind_of?(ActiveRecord::ConnectionAdapters::MysqlAdapter)
-        #first get a list from the database of possible matches by name
-        #this query is pretty liberal, we just want to get a list of possible
-        #matches from the database that we can run through our ruby matching algorithm
-        partial_name = @identity[:name].gsub!(/\W/,'|')
-        name_array = partial_name.split('|')
-        name_array.delete('')
-        sql_name_partial = name_array.collect {|partial_name| "INSTR(SUBSTR(SOUNDEX(concat('O',name)), 2), REPLACE(SUBSTR(SOUNDEX('O#{partial_name}'), 2), '0', '')) > 0"}.join(' and ')
-        sql_alt_name_partial = name_array.collect {|partial_name| "INSTR(SUBSTR(SOUNDEX(concat('O',alternate_identity_name)), 2), REPLACE(SUBSTR(SOUNDEX('O#{partial_name}'), 2), '0', '')) > 0"}.join(' and ')
-        ##this sql for getting "accurate sounds like" functionality comes from:
-        #http://jgeewax.wordpress.com/2006/07/21/efficient-sounds-like-searches-in-mysql/
-        possible_sdns = OfacSdn.connection.select_all("select concat(name,'|', alternate_identity_name) name, address, city
+      
+      #first get a list from the database of possible matches by name
+      #this query is pretty liberal, we just want to get a list of possible
+      #matches from the database that we can run through our ruby matching algorithm
+      partial_name = @identity[:name].gsub(/\W/,'|')
+      name_array = partial_name.split('|')
+      name_array.delete('')
+      sql_name_partial = name_array.collect {|partial_name| "name like '%#{partial_name}%'"}.join(' or ')
+      sql_alt_name_partial = name_array.collect {|partial_name| "alternate_identity_name like '%#{partial_name}%'"}.join(' or ')
+      possible_sdns = OfacSdn.connection.select_all("select name, alternate_identity_name, address, city
                                 from ofac_sdns
                                 where name is not null
-                                and (((#{sql_name_partial}))
-                                or ((#{sql_alt_name_partial})))")
-      else
-        possible_sdns = OfacSdn.find(:all, :select => 'name, alternate_identity_name, address, city').collect{|sdn| {:name => "#{sdn.name}|#{sdn.alternate_identity_name}", :address => sdn.address, :city => sdn.city}}
-      end
-      
+                                and sdn_type = 'individual'
+                                and #{sql_name_partial}
+                                or #{sql_alt_name_partial}")
+      possible_sdns = possible_sdns.collect {|sdn|{:name => "#{sdn['name']}|#{sdn['alternate_identity_name']}", :city => sdn['city'], :address => sdn['address']}}
+     
       match = OfacMatch.new({:name => {:weight => 60, :token => "#{@identity[:name]}"},
-                                  :address => {:weight => 10, :token => @identity[:address]},
-                                  :city => {:weight => 30, :token => @identity[:city]}})
+          :address => {:weight => 10, :token => @identity[:address]},
+          :city => {:weight => 30, :token => @identity[:city]}})
 
       score = match.score(possible_sdns)
       @possible_hits = match.possible_hits

data/test/test_helper.rb

@@ -41,6 +41,7 @@ class Test::Unit::TestCase
           t.string    :alternate_identity_remarks
           t.timestamps
         end
+        add_index :ofac_sdns, :sdn_type
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kevintyll-ofac
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Kevin Tyll
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-05-13 00:00:00 -07:00
 default_executable: 
 dependencies: []