@@ -100,12 +100,12 @@ class Name end def Name.extract_last_name_at_end(names) - # Hack to deal with a specific person who has two last names that aren't hyphenated - if names.size >= 2 && names[-2].downcase == "stott" && names[-1].downcase == "despoja" - last = names[-2..-1].join(' ') - names.pop - names.pop - last + # First try matching the last name to one of the special ones that consist of multiple words + multiword = multi_word_last_names.find do |m| + names.size >= m.size && names[-(m.size)..-1].map{|t| t.downcase} == m + end + if multiword + names.slice!(-(multiword.size)..-1).join(' ') elsif names.size >= 1 names.pop end lib/name.rb f3b3641ba39719e13f68bc4940c3215055038f8c Matthew Landauer matthew@openaustralia.org http://github.com/openaustralia/openaustralia-parser/commit/db4a52b1a17e7d19896b348e5a4cf5cecf2e599d db4a52b1a17e7d19896b348e5a4cf5cecf2e599d 2009-11-07T19:15:20-08:00 2009-11-07T19:15:20-08:00 Using multi_word_last_names in other method c05f4d840297a0cd1d85141d9c87b565497cd9e7 Matthew Landauer matthew@openaustralia.org