Merge branch 'hotfix'

thehyve · Jan 8, 2019 · 06ea0fb · 06ea0fb
2 parents 3e7f045 + 5bda193
commit 06ea0fb
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/org/ohdsi/whiteRabbit/scan/SourceDataScan.java b/src/org/ohdsi/whiteRabbit/scan/SourceDataScan.java
@@ -199,7 +199,15 @@ private void generateReport(Map<String, List<FieldInfo>> tableToFieldInfos, Stri
 
 			// Create per table sheets
 			for (String table : tables) {
-				sheet = workbook.createSheet(table);
+				String sheetname = table.substring(0, Math.min(table.length(), 31));
+				sheetname = sheetname.replace('/','_');
+
+				if (workbook.getSheet(sheetname) != null) {
+					System.out.println("Worksheet already exists in the scan report, the current table is skipped: " + sheetname);
+					continue;
+				}
+
+				sheet = workbook.createSheet(sheetname);
 				List<FieldInfo> fieldInfos = tableToFieldInfos.get(table);
 				List<List<Pair<String, Integer>>> valueCounts = new ArrayList<List<Pair<String, Integer>>>();
 				Object[] header = new Object[fieldInfos.size() * 2];