X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=sql%2Fbase%2Fbase.sql;h=01817db2dfc637b8979c5b321f09cbe56978d4d3;hp=22f259e84fc57d2ee52c166b21a70443372033b3;hb=9cecf073cae1e0be03024902596747825b6e2bb2;hpb=27f784377e3d4dac68e131025725c0fa20a2a2b7

diff --git a/sql/base/base.sql b/sql/base/base.sql
index 22f259e..01817db 100644
--- a/sql/base/base.sql
+++ b/sql/base/base.sql
@@ -431,67 +431,78 @@ CREATE OR REPLACE FUNCTION migration_tools.name_parse_out_fuller_last_first_midd
         suffix TEXT := '';
         prefix TEXT := '';
     BEGIN
-        temp := full_name;
+        temp := BTRIM(full_name);
         -- Use values, not structure, for prefix/suffix, unless we come up with a better idea
+        --IF temp ~ '^\S{2,}\.' THEN
+        --    prefix := REGEXP_REPLACE(temp, '^(\S{2,}\.).*$','\1');
+        --    temp := BTRIM(REGEXP_REPLACE(temp, '^\S{2,}\.(.*)$','\1'));
+        --END IF;
+        --IF temp ~ '\S{2,}\.$' THEN
+        --    suffix := REGEXP_REPLACE(temp, '^.*(\S{2,}\.)$','\1');
+        --    temp := REGEXP_REPLACE(temp, '^(.*)\S{2,}\.$','\1');
+        --END IF;
         IF temp ilike '%MR.%' THEN
             prefix := 'Mr.';
-            temp := REGEXP_REPLACE( temp, E'MR\.\\s*', '', 'i' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'MR\.\\s*', '', 'i' ));
         END IF;
         IF temp ilike '%MRS.%' THEN
             prefix := 'Mrs.';
-            temp := REGEXP_REPLACE( temp, E'MRS\.\\s*', '', 'i' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'MRS\.\\s*', '', 'i' ));
         END IF;
         IF temp ilike '%MS.%' THEN
             prefix := 'Ms.';
-            temp := REGEXP_REPLACE( temp, E'MS\.\\s*', '', 'i' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'MS\.\\s*', '', 'i' ));
         END IF;
         IF temp ilike '%DR.%' THEN
             prefix := 'Dr.';
-            temp := REGEXP_REPLACE( temp, E'DR\.\\s*', '', 'i' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'DR\.\\s*', '', 'i' ));
         END IF;
         IF temp ilike '%JR.%' THEN
             suffix := 'Jr.';
-            temp := REGEXP_REPLACE( temp, E'JR\.\\s*', '', 'i' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'JR\.\\s*', '', 'i' ));
         END IF;
         IF temp ilike '%JR,%' THEN
             suffix := 'Jr.';
-            temp := REGEXP_REPLACE( temp, E'JR,\\s*', ',', 'i' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'JR,\\s*', ',', 'i' ));
         END IF;
         IF temp ilike '%SR.%' THEN
             suffix := 'Sr.';
-            temp := REGEXP_REPLACE( temp, E'SR\.\\s*', '', 'i' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'SR\.\\s*', '', 'i' ));
         END IF;
         IF temp ilike '%SR,%' THEN
             suffix := 'Sr.';
-            temp := REGEXP_REPLACE( temp, E'SR,\\s*', ',', 'i' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'SR,\\s*', ',', 'i' ));
         END IF;
         IF temp like '%III%' THEN
             suffix := 'III';
-            temp := REGEXP_REPLACE( temp, E'III', '' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'III', '' ));
         END IF;
         IF temp like '%II%' THEN
             suffix := 'II';
-            temp := REGEXP_REPLACE( temp, E'II', '' );
-        END IF;
-        IF temp like '%IV%' THEN
-            suffix := 'IV';
-            temp := REGEXP_REPLACE( temp, E'IV', '' );
+            temp := BTRIM(REGEXP_REPLACE( temp, E'II', '' ));
         END IF;
 
-
         IF temp ~ ',' THEN
-            family_name = BTRIM(REGEXP_REPLACE(temp,E'^(.*?,).*$',E'\\1'));
-            temp := REPLACE( temp, family_name, '' );
+            family_name = BTRIM(REGEXP_REPLACE(temp,'^(.*?,).*$','\1'));
+            temp := BTRIM(REPLACE( temp, family_name, '' ));
             family_name := REPLACE( family_name, ',', '' );
-            first_given_name := BTRIM( REGEXP_REPLACE(temp,E'^(\\S+).*?$',E'\\1') );
-            temp := REPLACE( temp, first_given_name, '' );
-            second_given_name := BTRIM(temp);
+            IF temp ~ ' ' THEN
+                first_given_name := BTRIM( REGEXP_REPLACE(temp,'^(.+)\s(.+)$','\1') );
+                second_given_name := BTRIM( REGEXP_REPLACE(temp,'^(.+)\s(.+)$','\2') );
+            ELSE
+                first_given_name := temp;
+                second_given_name := '';
+            END IF;
         ELSE
-            first_given_name := BTRIM( REGEXP_REPLACE(temp,E'^(\\S+).*?$',E'\\1') );
-            temp := REPLACE( temp, first_given_name, '' );
-            family_name := BTRIM( REGEXP_REPLACE(temp,E'^.*?(\\S+)$',E'\\1') );
-            temp := REPLACE( temp, family_name, '' );
-            second_given_name := BTRIM(temp);
+            IF temp ~ '^\S+\s+\S+\s+\S+$' THEN
+                first_given_name := BTRIM( REGEXP_REPLACE(temp,'^(\S+)\s*(\S+)\s*(\S+)$','\1') );
+                second_given_name := BTRIM( REGEXP_REPLACE(temp,'^(\S+)\s*(\S+)\s*(\S+)$','\2') );
+                family_name := BTRIM( REGEXP_REPLACE(temp,'^(\S+)\s*(\S+)\s*(\S+)$','\3') );
+            ELSE
+                first_given_name := BTRIM( REGEXP_REPLACE(temp,'^(\S+)\s*(\S+)$','\1') );
+                second_given_name := temp;
+                family_name := BTRIM( REGEXP_REPLACE(temp,'^(\S+)\s*(\S+)$','\2') );
+            END IF;
         END IF;
 
         RETURN ARRAY[ family_name, prefix, first_given_name, second_given_name, suffix ];
@@ -2661,3 +2672,27 @@ CREATE OR REPLACE FUNCTION migration_tools.push_bib_sequence(INTEGER) RETURNS BI
     END;
 $$ LANGUAGE PLPGSQL STRICT VOLATILE;
 
+-- set a new salted password
+
+CREATE OR REPLACE FUNCTION migration_tools.set_salted_passwd(INTEGER,TEXT) RETURNS BOOLEAN AS $$
+    DECLARE
+        usr_id              ALIAS FOR $1;
+        plain_passwd        ALIAS FOR $2;
+        plain_salt          TEXT;
+        md5_passwd          TEXT;
+    BEGIN
+
+        SELECT actor.create_salt('main') INTO plain_salt;
+
+        SELECT MD5(plain_passwd) INTO md5_passwd;
+        
+        PERFORM actor.set_passwd(usr_id, 'main', MD5(plain_salt || md5_passwd), plain_salt);
+
+        RETURN TRUE;
+
+    END;
+$$ LANGUAGE PLPGSQL STRICT VOLATILE;
+
+
+
+