[NCITERM-613] Remove the minimum 3-character search string length res…

…triction on all name searches. [NCITERM-614] Single character Exact Match/Relationship search fails to return results. [NCITERM-616] Search algorithm and search target of the value set search box are not preserved. [NCITERM-617] Consecutive searches on value sets fails to respond. [NCITERM-618] Minimize term browser home page startup delay. [NCITERM-619] Search on the resovled value set page failed. [NCITERM-602] Tree Hierarchy Redesign. [NCITERM-597] Display the name of a concept in a resolved value set based on the source of the corresponding value set.
NCIP · Aug 11, 2014 · aa63617 · aa63617
1 parent a5a51d9
commit aa63617
Show file tree

Hide file tree

Showing 56 changed files with 7,002 additions and 1,858 deletions.
diff --git a/docs/deploy_jboss.txt b/docs/deploy_jboss.txt
@@ -31,6 +31,8 @@ Setup the projects build property file:
 
 3. Updated property values in local.properties as appropriate for your environment.
 
+4. Replace bda-lite-1.1.jar in the extern\lib folder by \software\ncitbrowser\tmp_lib\1.6\bda-lite-1.1.jar
+
 Install JBoss 5.1
 
 1. Run NCI Jboss install

diff --git a/software/build/build.xml b/software/build/build.xml
@@ -167,6 +167,17 @@
                 <file file="${bda.conf.dir}/ehcache.xml"/>
             </resources>
         </copy>
+
+
+         <!-- Setup Value Set Report Configuration property file -->
+
+        <copy todir="${bda.dist.dir}/exploded/${project.name}-webapp/deploy" overwrite="true"
+              flatten="true" includeEmptyDirs="no" filtering="false">
+            <resources>
+                <file file="${bda.conf.dir}/value_set_report_config.txt"/>
+            </resources>
+        </copy>       
+
 
         <!-- Setup application property file with defaults, balance of which is set on deployment -->
 
@@ -259,6 +270,15 @@
             </fileset>
         </copy>
 
+        <copy todir="${exploded.dir}/install" includeEmptyDirs="no"
+           filtering="false" overwrite="true">
+            <fileset dir="${exploded.dir}/deploy">
+                <patternset>
+                    <include name="**/value_set_report_config.txt"/>
+                </patternset>
+            </fileset>
+        </copy>
+
         <!-- Generate application property file -->
 
         <copy todir="${exploded.dir}/install" overwrite="true"
@@ -428,6 +448,13 @@
             value="${application.data.path}/${web.app.conf.path}/${project.short.name}-log4j.xml"
         />
 
+        <bda:AddTomcatProperty
+            deploydir="${tomcat.server.path}"
+            backup="true"
+            name="gov.nih.nci.evs.browser.ValueSetReportConfig"
+            value="${application.data.path}/${web.app.conf.path}/value_set_report_config.txt"
+        />
+
         <antcall target="-deploy:configfiles" />
         <antcall target="tomcat:start" />
 
@@ -441,6 +468,7 @@
                 <file file="${exploded.dir}/install/${project.short.name}-log4j.xml"/>
                 <file file="${exploded.dir}/install/log4j.dtd"/>
                 <file file="${exploded.dir}/install/${ehcache.xml.file}"/>
+                <file file="${exploded.dir}/install/value_set_report_config.txt"/>
             </resources>
         </copy>
         <copy

diff --git a/software/build/project.properties b/software/build/project.properties
@@ -46,7 +46,7 @@ tools.download.url=https://ncisvn.nci.nih.gov/svn/evsuiframework/tools
 ##############################################################################
 ; application.data.path = Path used by application for cache and config files
 ; lex.evs.api.url = URL to the lexevsapi application (If "null", lg.config.file must point to a local lexevs instance)
-lex.evs.api.url=http://ncias-d499-v.nci.nih.gov:29780/lexevsapi61
+; lex.evs.api.url=http://ncias-d499-v.nci.nih.gov:29780/lexevsapi61
 ; lg.config.file = Points to a local lexevs instance
 ; mail.smtp.server = Mail server to use for the 'Contact Us' page
 ; ncicb.contact.url = 'Contact Us' email address

diff --git a/software/build_jboss/build.xml b/software/build_jboss/build.xml
@@ -28,6 +28,7 @@
     <property name="project.short.name" value="ncit" />
     <property name="webapp.war.name" value="${project.name}.war" />
     <property name="webapp.prop.file" value="NCItBrowserProperties.xml" />
+    <property name="vsd.config.file" value="value_set_report_config.txt" />
 
     <path id="classpath">
         <fileset dir="../${project.name}/extlib">
@@ -200,6 +201,8 @@
                 <file file="${bda.conf.dir}/application-config-client.xml"/>
             </resources>
         </copy>
+
+
 
         <!-- Setup log4j file -->
 
@@ -222,6 +225,13 @@
             </resources>
         </copy>
 
+        <copy todir="${bda.dist.dir}/exploded/${project.name}-webapp/deploy" overwrite="true"
+             flatten="true" includeEmptyDirs="no" filtering="false">
+            <resources>
+                <file file="${bda.conf.dir}/value_set_report_config.txt"/>
+            </resources>
+        </copy>
+
     </target>
 
     <target name="build:config" description="Generates configuration files for a target environment">
@@ -252,6 +262,15 @@
             </fileset>
         </copy>
 
+        <copy todir="${exploded.dir}/install" includeEmptyDirs="no"
+           filtering="false" overwrite="true">
+            <fileset dir="${exploded.dir}/deploy">
+                <patternset>
+                    <include name="**/value_set_report_config.txt"/>
+                </patternset>
+            </fileset>
+        </copy>
+
         <!-- Generate application property file -->
 
         <copy todir="${exploded.dir}/install" overwrite="true"
@@ -303,6 +322,7 @@
             </resources>
         </copy>
 
+
     </target>
 
     <target name="deploy:local:upgrade" depends="build:all,build:config" description="Build and upgrade application">
@@ -316,20 +336,31 @@
             value="${application.data.path}/${ncitbrowser.conf.path}/${webapp.prop.file}"
         />
 
+
         <bda:AddJBossProperty
             deploydir="${jboss.server.path}/server/default/deploy"
             backup="true"
             name="gov.nih.nci.evs.browser.NCItlog4jProperties"
             value="${application.data.path}/${ncitbrowser.conf.path}/${project.short.name}-log4j.xml"
         />
 
+
+        <bda:AddJBossProperty
+            deploydir="${jboss.server.path}/server/default/deploy"
+            backup="true"
+            name="gov.nih.nci.evs.browser.ValueSetReportConfig"
+            value="${application.data.path}/${ncitbrowser.conf.path}/${vsd.config.file}"
+        />
+
+
         <copy todir="${application.data.path}/conf" overwrite="true"
               flatten="true" includeEmptyDirs="no" filtering="false">
             <resources>
                 <file file="${exploded.dir}/install/ehcache.xml"/>
                 <file file="${exploded.dir}/install/${webapp.prop.file}"/>
                 <file file="${exploded.dir}/install/${project.short.name}-log4j.xml"/>
                 <file file="${exploded.dir}/install/log4j.dtd"/>
+                <file file="${exploded.dir}/install/value_set_report_config.txt"/>
             </resources>
         </copy>
 
@@ -340,6 +371,7 @@
             </resources>
         </copy>
 
+
         <copy
             file="${bda.dist.dir}/exploded/${project.name}-webapp/${webapp.war.name}"
             tofile="${jboss.server.path}/server/default/deploy/${webapp.war.name}"

diff --git a/software/ncitbrowser/conf/NCItBrowserProperties.xml b/software/ncitbrowser/conf/NCItBrowserProperties.xml
@@ -452,6 +452,13 @@
                  <value>@ehcache.xml.file@</value>
         </ConfigurableItem>
 
+<!--        
+        <ConfigurableItem>
+                 <key>VALUE_SET_DOWNLOAD_DIR</key>
+                 <value>@value_set_download_dir@</value>
+        </ConfigurableItem>        
+-->        
+
         <ConfigurableItem>
                  <key>SORT_BY_SCORE</key>
                  <value>@sort.by.score@</value>