Index: smart/trunk/p/C0SMART.m
===================================================================
--- smart/trunk/p/C0SMART.m	(revision 1526)
+++ smart/trunk/p/C0SMART.m	(revision 1534)
@@ -42,5 +42,5 @@
  S C0SCTRL("patient")="D PATIENT^C0SDEM(.C0SGR,.C0SARY)"
  S C0SCTRL("lab")="D LAB^C0SLAB(.C0SGR,.C0SARY)"
- S C0SCTRL("problem")="D PROB^C0SPROB(.C0SGR,.C0SARY)"
+ S C0SCTRL("problem")="D PROB^C0SPROB2(.C0SGR,.C0SARY)"
  ;
  I '$D(C0SCTRL(ZTYP)) W !,ZTYP," ","Not Supported" Q  ;
Index: smart/trunk/p/C0SPROB2.m
===================================================================
--- smart/trunk/p/C0SPROB2.m	(revision 1526)
+++ smart/trunk/p/C0SPROB2.m	(revision 1534)
@@ -256,5 +256,5 @@
  S GRTN="" ; default to no problems
  N C0SGRF
- S C0SGRF="/vista/smart/"_ZPATID_"/problems"
+ S C0SGRF="vistaSmart:"_ZPATID_"/problems"
  I $D(DEBUG) W !,"Processing ",C0SGRF
  D DELGRAPH^C0XF2N(C0SGRF) ; delete the old graph
@@ -319,5 +319,5 @@
  . S ZR("rdf:type")="sp:Code"
  . S ZR("sp:system")="http://purl.bioontology.org/ontology/SNOMEDCT"
- . I ZR("sp:system")["icd9" S ZR("sp:system")="http://purl.bioontology.org/ontology/ICD9"
+ . I SNOGRF["icd9" S ZR("sp:system")="http://purl.bioontology.org/ontology/ICD9"
  . S ZR("dcterms:identifier")=SNOMED
  . S ZR("dcterms:title")=SNOTIT
@@ -332,6 +332,9 @@
  ; requires the mapping table installed in the triplestore
  ;
- N ZSN,ZARY,ZSUB
- S ZSUB=$$subject^C0XGET1(,ZICD) ; subject of the ICD9 code
+ N ZSN,ZARY,ZSUB,ZSUBS
+ I $E(ZICD,$L(ZICD))="." S ZICD=$P(ZICD,".",1) ; handle trailing dots
+ D subjects^C0XGET1(.ZSUBS,"cg:ontology#code",ZICD) ; subjects with the ICD9 code
+ S ZSUB=$O(ZSUBS("")) ; pick the first one
+ I ZSUB="" Q ""
  D objects^C0XGET1(.ZARY,ZSUB,"cg:ontology#toCode")
  S ZSN=$O(ZARY(""))
Index: smart/trunk/p/C0STBL.m
===================================================================
--- smart/trunk/p/C0STBL.m	(revision 1526)
+++ smart/trunk/p/C0STBL.m	(revision 1534)
@@ -27,5 +27,5 @@
  S ZI=BEGDFN
  S ZCNT=0
- F  S ZI=$O(^DPT(ZI)) Q:(+ZI="")!(ZCNT>DFNCNT)  D  ;
+ F  S ZI=$O(^DPT(ZI)) Q:(+ZI=0)!(ZCNT>DFNCNT)  D  ;
  . S ZCNT=ZCNT+1
  . W ZI," "
@@ -44,5 +44,5 @@
  . ;K G
  . D EN^C0SMART(.G,ZI,"problem")
- . I $D(G) W !,$$output^C0XGET1("G")
+ . ;I $D(G) W !,$$output^C0XGET1("G")
  Q
  ;