From ff107f1362c8be543d40f3ff566ecac1437455a3 Mon Sep 17 00:00:00 2001 From: george Date: Sat, 5 May 2012 20:17:58 +0000 Subject: [PATCH] fix --- p/C0XXFRM.m | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/p/C0XXFRM.m b/p/C0XXFRM.m index c31f55e..5377988 100644 --- a/p/C0XXFRM.m +++ b/p/C0XXFRM.m @@ -21,14 +21,20 @@ C0XXFRM ; GPL - Fileman Triples utilities ;11/07/11 17:05 ; TEST1 ; test GRAPHY ; - S G("positiveMatch",18262)="" - S G("positiveMatch",18262,"DOB")="19520606^19520606" - S G("positiveMatch",18262,"FNAME")="GEORGE^GEORGE PHILLIP" - S G("positiveMatch",18262,"LNAME")="LILLY^LILLY" - S G("positiveMatch",18262,"SSN")=310449999 + S G("possibleMatch",18262)="" + S G("possibleMatch",18262,"DOB")="19520606^19520606" + S G("possibleMatch",18262,"FNAME")="GEORGE^GEORGE PHILLIP" + S G("possibleMatch",18262,"LNAME")="LILLY^LILLY" + S G("possibleMatch",18262,"SSN")=310449999 + S G("possibleMatch",18263)="" + S G("possibleMatch",18263,"DOB")="19520606^19531031" + S G("possibleMatch",18263,"FNAME")="GEORGE^FRANCIS JAMES" + S G("possibleMatch",18263,"LNAME")="LILLY^LILLY" + S G("possibleMatch",18263,"SSN")=3232221111 S GRAPH="/test/gpl/graph" S SUBJECT="/test/gpl/match" D GRAPHY("G2","G",GRAPH,SUBJECT) ; CONVERT TO GRAPH + W ! ZWR G2 ; Q @@ -48,11 +54,11 @@ GRAPHY(ZOUT,ZIN,ZGRF,ZSUB,ZWHICH) ; turn a mumps array into triples F S ZJ=$O(@ZIN@(ZP,ZJ)) Q:ZJ="" D ; for each object . N ZO . S ZO=$$ANONS^C0XF2N ; anonomous subject - . S @ZOUT@(ZSUB,ZP)=ZO - . S @ZOUT@(ZO,"rdf:id")=ZJ + . S @ZOUT@(ZSUB,ZP,ZO)="" + . S @ZOUT@(ZO,"rdf:id",ZJ)="" . N ZK S ZK="" . F S ZK=$O(@ZIN@(ZP,ZJ,ZK)) Q:ZK="" D ; - . . S @ZOUT@(ZO,ZK)=$G(@ZIN@(ZP,ZJ,ZK)) + . . S @ZOUT@(ZO,ZK,$G(@ZIN@(ZP,ZJ,ZK)))="" . . D GRAPHY(ZOUT,$NA(@ZIN@(ZP,ZJ,ZK)),ZGRF,ZO) ; Q