X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=sql%2Fbase%2Fbase.sql;h=bd2b58a4a7dc1b539160cac018907557812c350e;hp=669a23e4744bc67aafca019fe800375c6b567503;hb=8821acd9cde150b10241e02841bc0bdd52b5cf3a;hpb=0a50e72c7444b635cf5ad2ff5e7fb111925d58dc

diff --git a/sql/base/base.sql b/sql/base/base.sql
index 669a23e..bd2b58a 100644
--- a/sql/base/base.sql
+++ b/sql/base/base.sql
@@ -23,7 +23,7 @@
 -- SELECT migration_tools.build('foo');
 -- SELECT * FROM foo.fields_requiring_mapping;
 -- \d foo.actor_usr
--- create some incoming ILS specific staging tables, like CREATE foo.legacy_items ( l_barcode TEXT, .. ) INHERITS foo.asset_copy;
+-- create some incoming ILS specific staging tables, like CREATE foo.legacy_items ( l_barcode TEXT, .. ) INHERITS (foo.asset_copy);
 -- Do some mapping, like UPDATE foo.legacy_items SET barcode = TRIM(BOTH ' ' FROM l_barcode);
 -- Then, to move into production, do: select migration_tools.insert_base_into_production('foo')
 
@@ -380,38 +380,42 @@ CREATE OR REPLACE FUNCTION migration_tools.name_parse_out_last_first_middle_and_
             prefix := 'Dr.';
             temp := REGEXP_REPLACE( temp, E'DR\.\\s*', '', 'i' );
         END IF;
-        IF temp ilike '%JR%' THEN
+        IF temp ilike '%JR.%' THEN
             suffix := 'Jr.';
-            temp := REGEXP_REPLACE( temp, E'JR\.?\\s*', '', 'i' );
+            temp := REGEXP_REPLACE( temp, E'JR\.\\s*', '', 'i' );
         END IF;
         IF temp ilike '%JR,%' THEN
             suffix := 'Jr.';
             temp := REGEXP_REPLACE( temp, E'JR,\\s*', ',', 'i' );
         END IF;
-        IF temp ilike '%SR%' THEN
+        IF temp ilike '%SR.%' THEN
             suffix := 'Sr.';
-            temp := REGEXP_REPLACE( temp, E'SR\.?\\s*', '', 'i' );
+            temp := REGEXP_REPLACE( temp, E'SR\.\\s*', '', 'i' );
         END IF;
         IF temp ilike '%SR,%' THEN
             suffix := 'Sr.';
             temp := REGEXP_REPLACE( temp, E'SR,\\s*', ',', 'i' );
         END IF;
-        IF temp ilike '%III%' THEN
+        IF temp like '%III%' THEN
             suffix := 'III';
-            temp := REGEXP_REPLACE( temp, E'III', '', 'i' );
+            temp := REGEXP_REPLACE( temp, E'III', '' );
         END IF;
-        IF temp ilike '%II%' THEN
+        IF temp like '%II%' THEN
             suffix := 'II';
-            temp := REGEXP_REPLACE( temp, E'II', '', 'i' );
+            temp := REGEXP_REPLACE( temp, E'II', '' );
         END IF;
-        IF temp ilike '%IV%' THEN
+        IF temp like '%IV%' THEN
             suffix := 'IV';
-            temp := REGEXP_REPLACE( temp, E'IV', '', 'i' );
+            temp := REGEXP_REPLACE( temp, E'IV', '' );
         END IF;
 
+        temp := REGEXP_REPLACE( temp, '\(\)', '');
         family_name := BTRIM( REGEXP_REPLACE(temp,E'^(\\S+).*$',E'\\1') );
+        family_name := REGEXP_REPLACE( family_name, ',', '' );
         first_given_name := CASE WHEN temp ~ E'^\\S+$' THEN 'N/A' ELSE BTRIM( REGEXP_REPLACE(temp,E'^\\S+\\s+(\\S+).*$',E'\\1') ) END;
+        first_given_name := REGEXP_REPLACE( first_given_name, ',', '' );
         second_given_name := CASE WHEN temp ~ E'^\\S+$' THEN '' ELSE BTRIM( REGEXP_REPLACE(temp,E'^\\S+\\s+\\S+\\s*(.*)$',E'\\1') ) END;
+        second_given_name := REGEXP_REPLACE( second_given_name, ',', '' );
 
         RETURN ARRAY[ family_name, prefix, first_given_name, second_given_name, suffix ];
     END;