[NCITERM-595] Handle coding schemes with multiple namespaces.

NCIEVS · Aug 26, 2015 · 4c08c9b · 4c08c9b
1 parent 8d30563
commit 4c08c9b
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 10 deletions.
diff --git a/software/browser-util/browser-util.jar b/software/browser-util/browser-util.jar
diff --git a/software/browser-util/src/gov/nih/nci/evs/browser/utils/ViewInHierarchyUtils.java b/software/browser-util/src/gov/nih/nci/evs/browser/utils/ViewInHierarchyUtils.java
@@ -725,6 +725,25 @@ public ConceptReferenceList createConceptReferenceList(Vector codes,
         return list;
     }
 
+    public String getTree(String codingScheme,
+        CodingSchemeVersionOrTag versionOrTag, String code, String namespace) {
+		TreeService treeService =
+			TreeServiceFactory.getInstance().getTreeService(lbSvc);
+
+		LexEvsTree tree = null;
+		if (StringUtils.isNullOrBlank(namespace)) {
+			tree = treeService.getTree(codingScheme, versionOrTag, code);
+		} else {
+			tree = treeService.getTree(codingScheme, versionOrTag, code, namespace);
+		}
+
+		String json =
+			treeService.getJsonConverter().buildJsonPathFromRootTree(
+				tree.getCurrentFocus());
+
+		return json;
+    }
+
 
     public static void main(String[] args) throws Exception {
 		LexBIGService lbSvc = LexBIGServiceImpl.defaultInstance();

diff --git a/software/junit-test/browser-util.jar b/software/junit-test/browser-util.jar
diff --git a/software/ncitbrowser/extlib/browser-util.jar b/software/ncitbrowser/extlib/browser-util.jar
diff --git a/software/ncitbrowser/src/java/gov/nih/nci/evs/browser/servlet/AjaxServlet.java b/software/ncitbrowser/src/java/gov/nih/nci/evs/browser/servlet/AjaxServlet.java
@@ -176,15 +176,11 @@ private static void debugJSONString(String msg, String jsonString) {
     }
 
 
-
-
-
-
     public static void search_tree(HttpServletResponse response, String node_id,
-        String ontology_display_name, String ontology_version) {
+        String ontology_display_name, String ontology_version, String namespace) {
         try {
             String jsonString = search_tree(node_id,
-                ontology_display_name, ontology_version);
+                ontology_display_name, ontology_version, namespace);
             if (jsonString == null)
                 return;
 
@@ -202,7 +198,7 @@ public static void search_tree(HttpServletResponse response, String node_id,
     }
 
     public static String search_tree(String node_id,
-        String ontology_display_name, String ontology_version) throws Exception {
+        String ontology_display_name, String ontology_version, String namespace) throws Exception {
         if (node_id == null || ontology_display_name == null)
             return null;
 
@@ -216,7 +212,7 @@ public static String search_tree(String node_id,
 
         String jsonString =
             CacheController.getTree(
-                ontology_display_name, versionOrTag, node_id);
+                ontology_display_name, versionOrTag, node_id, namespace);
         debugJSONString("Section: search_tree", jsonString);
 
         _logger.debug("search_tree: " + stopWatch.getResult());
@@ -482,7 +478,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
         } else if (action.equals("search_hierarchy")) {
             search_hierarchy(request, response, node_id, ontology_display_name, ontology_version, ns);
         } else if (action.equals("search_tree")) {
-            search_tree(response, node_id, ontology_display_name, ontology_version);
+            search_tree(response, node_id, ontology_display_name, ontology_version, ns);
         } else if (action.equals("build_tree")) {
             if (ontology_display_name == null)
                 ontology_display_name = CODING_SCHEME_NAME;

diff --git a/software/ncitbrowser/src/java/gov/nih/nci/evs/browser/utils/CacheController.java b/software/ncitbrowser/src/java/gov/nih/nci/evs/browser/utils/CacheController.java
@@ -1127,7 +1127,34 @@ public static String getSubConcepts(String codingScheme,
             .getObjectValue();
     }
 
+    public static String getTree(String codingScheme,
+        CodingSchemeVersionOrTag versionOrTag, String code, String namespace) {
+        if (!CacheController.getInstance()
+            .containsKey(getTreeKey(codingScheme, code))) {
+            _logger.debug("Tree Not Found In Cache.");
+            TreeService treeService =
+                TreeServiceFactory.getInstance().getTreeService(
+                    RemoteServerUtil.createLexBIGService());
+
+            LexEvsTree tree = null;
+            if (StringUtils.isNullOrBlank(namespace)) {
+				tree = treeService.getTree(codingScheme, versionOrTag, code);
+			} else {
+				tree = treeService.getTree(codingScheme, versionOrTag, code, namespace);
+			}
+
+            String json =
+                treeService.getJsonConverter().buildJsonPathFromRootTree(
+                    tree.getCurrentFocus());
 
+            _cache.put(new Element(getTreeKey(tree, versionOrTag.getVersion()), json));
+            return json;
+        }
+        return (String) _cache.get(getTreeKey(codingScheme, versionOrTag.getVersion(), code))
+            .getObjectValue();
+    }
+
+/*
     public static String getTree(String codingScheme,
         CodingSchemeVersionOrTag versionOrTag, String code) {
         if (!CacheController.getInstance()
@@ -1150,7 +1177,11 @@ public static String getTree(String codingScheme,
         return (String) _cache.get(getTreeKey(codingScheme, versionOrTag.getVersion(), code))
             .getObjectValue();
     }
-
+*/
+    public static String getTree(String codingScheme,
+        CodingSchemeVersionOrTag versionOrTag, String code) {
+		return getTree(codingScheme, versionOrTag, code, null);
+	}
 
     public void activeCacheTree(ResolvedConceptReference ref) {
         _logger.debug("Actively caching tree.");