From 664246d263d32bd9f1eb0e85d31bedf05e8d4e04 Mon Sep 17 00:00:00 2001 From: rfeldman Date: Tue, 8 Mar 2016 12:56:58 -0500 Subject: [PATCH] #171 --- src/edu/si/CDIS/CreateCISmedia.java | 1 + src/edu/si/CDIS/GenVfcuDirReport.java | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/edu/si/CDIS/CreateCISmedia.java b/src/edu/si/CDIS/CreateCISmedia.java index 555fc3c07..9780e967c 100644 --- a/src/edu/si/CDIS/CreateCISmedia.java +++ b/src/edu/si/CDIS/CreateCISmedia.java @@ -156,6 +156,7 @@ else if (objectId == -1 ) { } CDISActivityLog activityLog = new CDISActivityLog(); + activityLog.setCdisMapId(cdisMap.getCdisMapId()); activityLog.setCdisStatusCd("LCC"); activityLog.insertActivity(); } diff --git a/src/edu/si/CDIS/GenVfcuDirReport.java b/src/edu/si/CDIS/GenVfcuDirReport.java index 398b1bf4b..fc321ed41 100644 --- a/src/edu/si/CDIS/GenVfcuDirReport.java +++ b/src/edu/si/CDIS/GenVfcuDirReport.java @@ -185,11 +185,16 @@ int countPendingRecords () { "FROM vfcu_media_file a " + "WHERE a.vfcu_md5_file_id in (" + this.masterMd5Id + ", " + this.childMd5Id + ") " + "AND NOT EXISTS ( " + - " SELECT 'X' " + - " FROM cdis_map b, " + - " cdis_activity_log c " + - " WHERE a.vfcu_media_file_id = b.vfcu_media_file_id " + - " AND c.cdis_status_cd in ('LDC','ERR'))"; + " SELECT 'X' " + + " FROM cdis_map b, " + + " cdis_activity_log c " + + " WHERE a.vfcu_media_file_id = b.vfcu_media_file_id " + + " AND c.cdis_status_cd in ('LDC','ERR')) " + + "AND NOT EXISTS ( " + + " SELECT 'X' " + + " FROM vfcu_activity_log d " + + " WHERE a.vfcu_media_file_id = d.vfcu_media_file_id " + + " AND d.vfcu_status_cd in ('ER','OH')) "; try (PreparedStatement stmt = CDIS.getDamsConn().prepareStatement(sql); ResultSet rs = stmt.executeQuery() ) { @@ -478,7 +483,7 @@ private void writeCompleted() { if (completedIdName.get(mapId).equals("emuLinkComplete") ) { listing = "File: " + cdisMap.getFileName() + " Linked UAN: " + siAsst.getOwningUnitUniqueName() + " IRN: " + cdisMap.getCisUniqueMediaId() ; } - else if (completedIdName.get(mapId).equals("DAMSIngestComplete") ) { + else { listing = "File: " + cdisMap.getFileName() + " Ingested UAN: " + siAsst.getOwningUnitUniqueName(); }