[GF#33241] Value set tab search failure.

[GF#33242] Term Browser: Rel 2.4: No default tabs associates with the contact us page [GF#33244] Term Browser: Rel 2.4: System is throwing HTTP Status 500 - error on the value sets search
NCIP · Mar 14, 2014 · 83ab1d1 · 83ab1d1
1 parent 021cae0
commit 83ab1d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
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
@@ -1253,8 +1253,7 @@ public static void create_vs_tree(HttpServletRequest request, HttpServletRespons
 
     public static void create_vs_tree(HttpServletRequest request, HttpServletResponse response, int view, String vsd_uri) {
 
-		String nav_type = (String) request.getParameter("nav_type");
-		System.out.println("(*) create_vs_tree: " + nav_type);
+		String nav_type = HTTPUtils.cleanXSS((String) request.getParameter("nav_type"));
 		request.getSession().setAttribute("vs_nav_type", "valuesets");
 
   request.getSession().removeAttribute("dictionary");

diff --git a/software/ncitbrowser/src/java/gov/nih/nci/evs/browser/utils/TreeUtils.java b/software/ncitbrowser/src/java/gov/nih/nci/evs/browser/utils/TreeUtils.java
@@ -646,7 +646,7 @@ public boolean hasSubconcepts(String scheme, String version, String code) {
 
     public static HashMap getSubconcepts(String scheme, String version,
         String code) {
-        if (scheme.compareTo("NCI Thesaurus") == 0) {
+        if (scheme.compareTo("NCI Thesaurus") == 0 || scheme.compareTo("NCI_Thesaurus") == 0) {
             return getAssociatedConcepts(scheme, version, code, "subClassOf",
                 false);
         }