diff --git a/p/C0XF2N.m b/p/C0XF2N.m index b16f406..957f1d2 100644 --- a/p/C0XF2N.m +++ b/p/C0XF2N.m @@ -37,7 +37,7 @@ INITFARY(ZFARY) ; INITIALIZE FILE NUMBERS AND OTHER USEFUL THINGS S @ZFARY@("C0XSFN")=172.201 ; TRIPLES STRINGS FILE NUMBER S @ZFARY@("C0XTN")=$NA(^C0X(101)) ; TRIPLES GLOBAL NAME S @ZFARY@("C0XSN")=$NA(^C0X(201)) ; STRING FILE GLOBAL NAME - S @ZFARY@("C0XDIR")="/home/glilly/sage/test/" + S @ZFARY@("C0XDIR")="/home/glilly/fmts/trunk/samples/smart-new/" S @ZFARY@("BLKLOAD")=1 ; this file supports block load S @ZFARY@("FMTSSTYLE")="F2N" ; fileman style S @ZFARY@("REPLYFMT")="JSON" @@ -287,9 +287,11 @@ PROCESS(ZRTN,ZRDF,ZGRF,ZMETA,FARY) ; PROCESS AN INCOMING RDF FILE S C0XTYPE("owl:Ontology")=1 S C0XTYPE("owl:Class")=1 S C0XTYPE("rdfs:subClassOf")=1 + S C0XTYPE("rdf:RDF")=1 S ZI=$O(@ZDOM@(1,"C","")) - I '$G(C0XTYPE(@ZDOM@(1,"C",ZI))) D Q ; not an rdf file - . W !,"Error. Not an RDF file. Cannot process." + I '$G(C0XTYPE(@ZDOM@(1,"C",ZI))) D ;Q ; not an rdf file + . W !,"Unusual RDF file ",@ZDOM@(1,"C",ZI) + . ;W !,"Error. Not an RDF file. Cannot process." . D SHOW(1) ; ; -- now process the rdf description children diff --git a/p/C0XUTIL.m b/p/C0XUTIL.m index 0970c73..022b2ee 100644 --- a/p/C0XUTIL.m +++ b/p/C0XUTIL.m @@ -63,6 +63,7 @@ VOCINIT ; INITIALIZE VOCABULARIES S C0XVOC("fmts")="http://glilly.net/fmts#" S C0XVOC("oro")="http://oro.com/vista/sage" ;change to get URL from system S C0XVOC("sage")="http://oro.com/sage/schema#" + S C0XVOC("v")="http://www.w3.org/2006/vcard/ns#" Q ; EXT(C0XIN) ; EXTRINSIC WHICH EXPANDS NAMESPACES diff --git a/samples/smart-new/Bob-Odenkirk.rdf b/samples/smart-new/Bob-Odenkirk.rdf index 7906737..ce09ada 100644 --- a/samples/smart-new/Bob-Odenkirk.rdf +++ b/samples/smart-new/Bob-Odenkirk.rdf @@ -1,60 +1,53 @@ - - - - - - - Bob - J - Odenkirk - - - - - - - - - 15 Main St - Apt 2 - Wonderland - OZ - 54321 - USA - - - - - - - - 800-555-1212 - - - - - - - 800-555-1515 - - - - male - 1959-12-25 - bob.odenkirk@example.com - - - - My Hospital Record 2304575 - 2304575 - My Hospital Record - - - - - \ No newline at end of file + + + + + + Bob + J + Odenkirk + + + + + + + 15 Main St + Apt 2 + Wonderland + OZ + 54321 + USA + + + + + + + 800-555-1212 + + + + + + 800-555-1515 + + + male + 1959-12-25 + bob.odenkirk@example.com + + + + My Hospital Record 2304575 + 2304575 + My Hospital Record + + + + diff --git a/samples/smart-new/brian-brooks-meds.rdf b/samples/smart-new/brian-brooks-meds.rdf index a655165..b364eca 100644 --- a/samples/smart-new/brian-brooks-meds.rdf +++ b/samples/smart-new/brian-brooks-meds.rdf @@ -1,431 +1,431 @@ - - - - - - - - - - - - - - - - - carbinoxamine 0.4 MG/ML / Hydrocodone 1 MG/ML / Pseudoephedrine 6 MG/ML Oral Solution [Histex HC] - http://rxnav.nlm.nih.gov/REST/rxcui/ - 858869 - - - - carbinoxamine 0.4 MG/ML / Hydrocodone 1 MG/ML / Pseudoephedrine 6 MG/ML Oral Solution [Histex HC] - - - - - 2006-09-01 - - - - - - - - - - - - - - - - 30 - 2005-10-17 - - - - - - - - - 1 - {tablet} - - - - - - - - - 1 - /d - - - - - - - - - - - - - - - Etodolac 400 MG Extended Release Tablet - http://rxnav.nlm.nih.gov/REST/rxcui/ - 285004 - - - - Etodolac 400 MG Extended Release Tablet - - - - 1 daily - 2005-10-17 - - - - - - - - - - - - - - - - 3 - 2005-05-17 - - - - - - - - - 1 - {tablet} - - - - - - - - - 4 - /d - - - - - - - - - - - - - - - Acetaminophen 500 MG / Hydrocodone 5 MG Oral Tablet - http://rxnav.nlm.nih.gov/REST/rxcui/ - 856903 - - - - Acetaminophen 500 MG / Hydrocodone 5 MG Oral Tablet - - - - 1 q6h prn pain - 2005-05-17 - - - - - - - - - - - - - - - - 10 - 2008-07-10 - - - - - - - - - 1 - {tablet} - - - - - - - - - 4 - /d - - - - - - - - - - - - - - - Cephalexin 500 MG Oral Capsule - http://rxnav.nlm.nih.gov/REST/rxcui/ - 309114 - - - - Cephalexin 500 MG Oral Capsule - - - - 1 qid - 2008-07-10 - - - - - - - - - - - - - - 2 - {puff} - - - - - - - - - 4 - /d - - - - - - - - - - - - - - - 200 ACTUAT Albuterol 0.09 MG/ACTUAT Metered Dose Inhaler [ProAir HFA] - http://rxnav.nlm.nih.gov/REST/rxcui/ - 745752 - - - - 200 ACTUAT Albuterol 0.09 MG/ACTUAT Metered Dose Inhaler [ProAir HFA] - - - - 2 puffs qid prn SOB - 2006-09-01 - - - - - - - - - - - - - - 2 - {puff} - - - - - - - - - 4 - /d - - - - - - - - - - - - - - - 200 ACTUAT Albuterol 0.09 MG/ACTUAT Metered Dose Inhaler - http://rxnav.nlm.nih.gov/REST/rxcui/ - 745679 - - - - 200 ACTUAT Albuterol 0.09 MG/ACTUAT Metered Dose Inhaler - - - - 2 puffs qid prn SOB - 2004-10-27 - - - - - - - - - - - - - - - - 10 - 2005-05-17 - - - - - - - - - 1 - {tablet} - - - - - - - - - 3 - /d - - - - - - - - - - - - - - - Cyclobenzaprine hydrochloride 10 MG Oral Tablet - http://rxnav.nlm.nih.gov/REST/rxcui/ - 828348 - - - - Cyclobenzaprine hydrochloride 10 MG Oral Tablet - - - - 1 tid prn - 2005-05-17 - - - - - - - - - - - - - - 1 - /d - - - - - - - - - - - - - - - mometasone furoate 1 MG/ML Topical Cream - http://rxnav.nlm.nih.gov/REST/rxcui/ - 311753 - - - - mometasone furoate 1 MG/ML Topical Cream - - - - apply daily - 2008-06-22 - - - - - - + + + + + + + + + + + + + + + + + carbinoxamine 0.4 MG/ML / Hydrocodone 1 MG/ML / Pseudoephedrine 6 MG/ML Oral Solution [Histex HC] + http://rxnav.nlm.nih.gov/REST/rxcui/ + 858869 + + + + carbinoxamine 0.4 MG/ML / Hydrocodone 1 MG/ML / Pseudoephedrine 6 MG/ML Oral Solution [Histex HC] + + + + + 2006-09-01 + + + + + + + + + + + + + + + + 30 + 2005-10-17 + + + + + + + + + 1 + {tablet} + + + + + + + + + 1 + /d + + + + + + + + + + + + + + + Etodolac 400 MG Extended Release Tablet + http://rxnav.nlm.nih.gov/REST/rxcui/ + 285004 + + + + Etodolac 400 MG Extended Release Tablet + + + + 1 daily + 2005-10-17 + + + + + + + + + + + + + + + + 3 + 2005-05-17 + + + + + + + + + 1 + {tablet} + + + + + + + + + 4 + /d + + + + + + + + + + + + + + + Acetaminophen 500 MG / Hydrocodone 5 MG Oral Tablet + http://rxnav.nlm.nih.gov/REST/rxcui/ + 856903 + + + + Acetaminophen 500 MG / Hydrocodone 5 MG Oral Tablet + + + + 1 q6h prn pain + 2005-05-17 + + + + + + + + + + + + + + + + 10 + 2008-07-10 + + + + + + + + + 1 + {tablet} + + + + + + + + + 4 + /d + + + + + + + + + + + + + + + Cephalexin 500 MG Oral Capsule + http://rxnav.nlm.nih.gov/REST/rxcui/ + 309114 + + + + Cephalexin 500 MG Oral Capsule + + + + 1 qid + 2008-07-10 + + + + + + + + + + + + + + 2 + {puff} + + + + + + + + + 4 + /d + + + + + + + + + + + + + + + 200 ACTUAT Albuterol 0.09 MG/ACTUAT Metered Dose Inhaler [ProAir HFA] + http://rxnav.nlm.nih.gov/REST/rxcui/ + 745752 + + + + 200 ACTUAT Albuterol 0.09 MG/ACTUAT Metered Dose Inhaler [ProAir HFA] + + + + 2 puffs qid prn SOB + 2006-09-01 + + + + + + + + + + + + + + 2 + {puff} + + + + + + + + + 4 + /d + + + + + + + + + + + + + + + 200 ACTUAT Albuterol 0.09 MG/ACTUAT Metered Dose Inhaler + http://rxnav.nlm.nih.gov/REST/rxcui/ + 745679 + + + + 200 ACTUAT Albuterol 0.09 MG/ACTUAT Metered Dose Inhaler + + + + 2 puffs qid prn SOB + 2004-10-27 + + + + + + + + + + + + + + + + 10 + 2005-05-17 + + + + + + + + + 1 + {tablet} + + + + + + + + + 3 + /d + + + + + + + + + + + + + + + Cyclobenzaprine hydrochloride 10 MG Oral Tablet + http://rxnav.nlm.nih.gov/REST/rxcui/ + 828348 + + + + Cyclobenzaprine hydrochloride 10 MG Oral Tablet + + + + 1 tid prn + 2005-05-17 + + + + + + + + + + + + + + 1 + /d + + + + + + + + + + + + + + + mometasone furoate 1 MG/ML Topical Cream + http://rxnav.nlm.nih.gov/REST/rxcui/ + 311753 + + + + mometasone furoate 1 MG/ML Topical Cream + + + + apply daily + 2008-06-22 + + + + + + \ No newline at end of file