TopConcept vs Broader work

afk314 · Sep 14, 2015 · 4a327d9 · 4a327d9
1 parent 589e6b1
commit 4a327d9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/cfm.csv b/src/cfm.csv
diff --git a/src/conditions.txt b/src/conditions.txt
@@ -5924,22 +5924,18 @@ Heart Attack
 Arteriosclerosis
   SA:Card
   CL:Arteriosclerosis
-  NT:Hardening of the Arteries (Atherosclerosis)
   DEF:Any hardening (and loss of elasticity) of medium or large arteries.
 Arteriolosclerosis
   SA:Card
   CL:Arteriolosclerosis
   DEF:Any hardening (and loss of elasticity) of arterioles (small arteries).
-Hardening of the Arteries (Atherosclerosis)
+Atherosclerosis
   SA:Card
   CL:Atherosclerosis
   UF:Atherosclerosis
   UF:Arteriosclerotic Vascular Disease (ASVD)
   UF:Arteriosclerotic Vascular Disease
   UF:Hardening of the Arteries
-  NT:Arteriosclerosis
-  NT:Arteriolosclerosis
-  NF:Coronary Artery Disease (CAD)
   RT:High Cholesterol
   RT:Peripheral Artery Disease (PAD)
   RT:Heart Disease

diff --git a/src/org/healthwise/quantumleap/parsing/beans/ConceptBean.java b/src/org/healthwise/quantumleap/parsing/beans/ConceptBean.java
@@ -334,20 +334,20 @@ public String render() {
             iter = this.getCuis().iterator();
             while (iter.hasNext()) {
                 String cui = (String) iter.next();
-                out.append("    <hw_legacy:has_relevant_cui rdf:resource=\"#" + cui + "\"/>\n");
+                out.append("    <hw_legacy:has_relevant_cui rdf:resource=\"http://www.healthwise.org/legacy/concept_schema#" + cui + "\"/>\n");
             }
         }
 
         if (this.getDocs().size() > 0) {
             iter = this.getDocs().iterator();
             while (iter.hasNext()) {
                 String doc = (String) iter.next();
-                out.append("    <hw_legacy:has_relevant_hwid rdf:resource=\"#" + doc + "\"/>\n");
+                out.append("    <hw_legacy:has_relevant_hwid rdf:resource=\"http://www.healthwise.org/legacy/concept_schema#" + doc + "\"/>\n");
             }
         }
 
         if (this.getRdId() != null) {
-            out.append("    <hw_legacy:has_rd_id rdf:resource=\"#" + getRdId() + "\"/>\n");
+            out.append("    <hw_legacy:has_rd_id rdf:resource=\"http://www.healthwise.org/legacy/concept_schema#" + getRdId() + "\"/>\n");
         }
 
 
@@ -372,9 +372,8 @@ public String render() {
         }
 
 
-
-        if (this.getFacetId() != null) {
-            out.append("    <hw_legacy:has_facet_id rdf:resource=\"#" + getFacetId() + "\"/>\n");
+        if (this.getFacetId() != null || !this.getFacetId().equals("null")) {
+            out.append("    <hw_legacy:has_facet_id rdf:resource=\"http://www.healthwise.org/legacy/concept_schema#" + getFacetId() + "\"/>\n");
         }
 
         out.append("    <" + HWNS + ":" + LIFECYCLE + ">" + getLifecycleStage() + "</" + HWNS + ":" + LIFECYCLE + ">\n");