From 26984a6a35ae9c5f1ef0d6903c87c98506bddf1b Mon Sep 17 00:00:00 2001 From: tballison Date: Thu, 1 Dec 2022 13:54:49 -0500 Subject: [PATCH] This fixes #87. --- .../tika/app/fx/emitters/CSVEmitterSpec.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tika-gui-app/src/main/java/org/tallison/tika/app/fx/emitters/CSVEmitterSpec.java b/tika-gui-app/src/main/java/org/tallison/tika/app/fx/emitters/CSVEmitterSpec.java index 3a7d876..172acfb 100644 --- a/tika-gui-app/src/main/java/org/tallison/tika/app/fx/emitters/CSVEmitterSpec.java +++ b/tika-gui-app/src/main/java/org/tallison/tika/app/fx/emitters/CSVEmitterSpec.java @@ -208,16 +208,23 @@ private String getSelect() { String tikaTable = CSV_DB_TABLE_NAME; StringBuilder sb = new StringBuilder(); sb.append("select "); - sb.append("t.").append(PATH_COL_NAME).append(" as Path, s.status as Status, "); - sb.append(ATTACHMENT_NUM_COL_NAME); + sb.append("s.").append(PATH_COL_NAME).append(" as Path, s.status as Status, "); + sb.append("case when ").append(ATTACHMENT_NUM_COL_NAME).append(" is null then 0"); + sb.append(" else ").append(ATTACHMENT_NUM_COL_NAME).append(" end"); for (MetadataTuple t : getMetadataTuples()) { sb.append(", "); + String out = t.getOutput(); + //if there's a column in tika_extracts + if (out.equals(PATH_COL_NAME) || out.equals("status")) { + sb.append("t."); + } sb.append(t.getOutput()); } - sb.append(" from ").append(tikaTable) - .append(" t left join tika_status s on t.path = s.path") - .append(" order by t.path asc, attachment_num asc"); + sb.append(" from tika_status s left join ").append(tikaTable) + .append(" t on s.path = t.path") + .append(" order by s.status, t.path asc, t.attachment_num asc"); + return sb.toString(); }