Merge pull request #91 from onc-healthit/develop

merge develop into master for April 26 release

Author: drbgfc

.gitignore

@@ -5,4 +5,6 @@
 /.project
 /target
 /bin
-/codevalidator-api/target
+/codevalidator-api/target
+/.apt_generated/
+/.apt_generated_tests/

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>org.sitenv.vocabulary</groupId>
 	<artifactId>codevalidator-api</artifactId>
-	<version>1.0.27</version>
+	<version>1.0.28</version>
 	<name>Code Validator API</name>
 	<url>http://www.sitenv.org</url>
 

src/main/java/org/sitenv/vocabularies/loader/code/CptLoader.java

@@ -43,7 +43,7 @@ public void load(List<File> filesToLoad, Connection connection) {
                     while ((line = br.readLine()) != null) {
                         if (!line.isEmpty()) {
                             String code = line.substring(0, 5);
-                            String displayName = line.substring(line.indexOf(" "));
+                            String displayName = isTabDelimitedFile(line) ? line.substring(line.indexOf('\t')) : line.substring(line.indexOf(" "));
                             buildCodeInsertQueryString(insertQueryBuilder, code, displayName, codeSystem, oid, CODES_IN_THIS_SYSTEM_ARE_ALWAYS_ACTIVE);
 
                             if ((++totalCount % BATCH_SIZE) == 0) {
@@ -74,4 +74,8 @@ public void load(List<File> filesToLoad, Connection connection) {
             }
         }
     }
+
+	private boolean isTabDelimitedFile(String line) {
+		return line.indexOf('\t') != -1;
+	}
 }

src/main/resources/schema.sql

@@ -19,7 +19,7 @@ CREATE TABLE VALUESETS (
 CREATE TABLE CODES (
   ID INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
   CODE VARCHAR(50) NOT NULL,
-  DISPLAYNAME VARCHAR(5000) NOT NULL,
+  DISPLAYNAME VARCHAR(100000) NOT NULL,
   CODESYSTEM VARCHAR(50) NOT NULL,
   CODESYSTEMOID VARCHAR(50) NOT NULL,
   ACTIVE BOOLEAN NOT NULL