gs1process: Improve performance of template checking

Author: terryburton

src/gs1process.ps.src

@@ -3302,30 +3302,27 @@ begin
             /this exch def
             /patt exch def
             1 {  % common exit
-                aivals patt known {true exit} if  % Fast path
+                aivals patt known { true exit } if  % Fast path
                 patt length 4 eq {
                     patt 3 1 getinterval (n) eq {
+                        % XXXn or XXnn
                         /pfxlen patt 2 1 getinterval (n) eq {2} {3} ifelse def
-                        false
-                        ais {
-                            dup dup this ne exch length 4 eq and {
-                                0 pfxlen getinterval patt 0 pfxlen getinterval eq {
-                                    pop true
-                                } if
-                            } {
-                                pop
-                            } ifelse
-                        } forall
-                        exit
+                        patt 0 pfxlen getinterval
+                        aipfx exch 2 copy known { get } { pop pop 0 } ifelse
+                        this length 4 eq {
+                            this 0 pfxlen getinterval patt 0 pfxlen getinterval eq { 1 sub } if
+                        } if
+                        0 gt exit
                     } if
                     false exit
                 } if
                 false exit
             } repeat
         } def
 
-        % Build AI dict and validate repeats
+        % Build AI dict and 2- and 3-char prefixes of 4-char AIs; validate repeats
         /aivals vals length dict def
+        /aipfx vals length 2 mul 1 add dict def
         0 1 vals length 1 sub {
             dup ais exch get /ai exch def
             vals exch get /val exch def
@@ -3339,6 +3336,10 @@ begin
                 } if
             } {
                 aivals ai val put
+                ai length 4 eq {
+                    ai 0 2 getinterval aipfx exch 2 copy known { 2 copy get 1 add } { 1 } ifelse put
+                    ai 0 3 getinterval aipfx exch 2 copy known { 2 copy get 1 add } { 1 } ifelse put
+                } if
             } ifelse
         } for
 

tests/ps_tests/gs1process.ps.test

@@ -1010,6 +1010,24 @@
 ((01)12345678901231(3925)12599(3600)654321) good_tmpl
 ((01)12345678901231(3925)12599(3695)654321) good_tmpl
 
+% Wildcard family exclusion (XXXn) resolved via the AI-prefix index
+((01)12345678901231(3100)123456(3100)123456) good_tmpl                                   % a repeated AI is not exclusive with itself
+((01)12345678901231(3100)123456(3110)123456) good_tmpl                                   % distinct families (310n vs 311n) are not exclusive
+((01)12345678901231(3100)123456(3110)123456(3100)123456(3110)123456) good_tmpl           % two families, each repeated
+((01)12345678901231(3100)123456(3100)123456(3110)123456) good_tmpl                       % a repeat plus a different family
+((01)12345678901231(3100)123456(3101)123456) /bwipp.GS1exclusiveAIs er_tmpl              % two members of one family (310n) are exclusive
+((01)12345678901231(3100)123456(3101)123456(3102)123456) /bwipp.GS1exclusiveAIs er_tmpl  % three members of one family
+((01)12345678901231(3100)123456(3100)123456(3101)123456) /bwipp.GS1exclusiveAIs er_tmpl  % a repeat plus a distinct family member
+
+% Many repeated wildcard-family AIs validate (prefix counts are per distinct AI)
+{
+    /pre (\(01\)12345678901231) def  /seg (\(3100\)123456) def
+    /s pre length seg length 100 mul add string def
+    s 0 pre putinterval
+    0 1 99 { /i exch def s pre length seg length i mul add seg putinterval } for
+    s /ai gs1process pop pop pop null
+} null isEqual
+
 % lintiso5218 (biological sex code)
 ((8018)123123123123123121(7252)0) good_tmpl
 ((8018)123123123123123121(7252)1) good_tmpl