Index: KPID.mac.rou
===================================================================
diff -u -r734 -r920
--- KPID.mac.rou	(.../KPID.mac.rou)	(revision 734)
+++ KPID.mac.rou	(.../KPID.mac.rou)	(revision 920)
@@ -35,11 +35,11 @@
 26 I $E(PROG,1,5)'="KPSEL",$TR($E($P(B(3),D,25),4,8),".","")'=PR,$L(K)=1 G 1:K=9 S K=K_$E($P(B(3),D,25),2,99) G 29
  I $E(PROG,1,5)'="KPSEL",$TR($E($P(B(3),D,25),4,8),".","")=PR,$L(K)=1 G 1:K=0 S K=K_$E($P(B(3),D,25),2,99) G 29
  ;I $E(PROG,1,5)'="KPSEL",$TR($E($P(B(3),D,25),4,8),".","")=PR,$TR($E(K,4,8),".","")'=PR G 1
-27 I $E(PROG,1,5)="KPSEL" G 4:K="",YZ:KT>6,1:980'[$E(K,1)!(K'?1N1"."3N1"."3N1"."1N) S SID=$E(K,3,5)_$E(K,7,8) D S1 G YZ
-29 G 1:K'?1N1"."3N1"."3N1"."1N S SID=$E(K,3,5)_$E(K,7,8) D S1
+27 I $E(PROG,1,5)="KPSEL" G 4:K="",YZ:KT>6,1:'$$IsValidIdentNr^PRODUKT2(K) S SID=$E(K,3,5)_$E(K,7,8) D S1 G YZ ;[IDENT] CW
+29 G 1:'$$IsValidIdentNr^PRODUKT2(K) S SID=$E(K,3,5)_$E(K,7,8) D S1 ;[IDENT] CW
  I PROG'="KPE100" G 1:'$$ValidateFromBNode^PRODUKT(PR,.B,,K),YZ
  ;
-3 S PNC=$$TRIMN^vhRtn1(K)
+3 S PNC=$$TRIMIDENT^vhRtn1(K) ;[IDENT] CW
 31 S PNC=PNC_" "
 33 I $D(^KPR2(0_$E(PNC,2,99))) X ^cTXT(0,"N",12) R K G 1
  I $D(^KPR2(8_$E(PNC,2,99))) X ^cTXT(0,"N",12) R K G 1