diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx index bb2306b3..2c3576b0 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx @@ -166,9 +166,6 @@ 848, 17 - - 17, 17 - 177, 17 diff --git a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb index a97510d3..51da2641 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb @@ -52,31 +52,14 @@ Public Class ClassUserFiles oHash = "" End Try - oSQL = "SELECT * FROM TBGI_FILES_USER WHERE FILE_HASH = '" & oHash & "' AND WORKED = 0 ORDER BY ADDED_WHEN" + oSQL = "SELECT * FROM TBIDB_FILE_OBJECT WHERE FILE_HASH = '" & oHash & "' ORDER BY ADDED_WHEN" Dim oResult As DataTable = My.DatabaseECM.GetDatatable(oSQL) - If oResult Is Nothing Then - Return Nothing - End If - If oResult.Rows.Count = 0 Then - oSQL = "SELECT * FROM TBIDB_FILE_OBJECT WHERE FILE_HASH = '" & oHash & "' ORDER BY ADDED_WHEN" - oResult = My.DatabaseIDB.GetDatatable(oSQL) - - If oResult Is Nothing Then - Return Nothing - End If - - If oResult.Rows.Count = 0 Then - Return Nothing - Else - Dim oFirstRow As DataRow = oResult.Rows.Item(0) - My.Application.Globix.DOCUMENT_ID = oFirstRow.Item("IDB_OBJ_ID") - Return oFirstRow.Item("ADDED_WHEN") - End If + Return Nothing Else Dim oFirstRow As DataRow = oResult.Rows.Item(0) - My.Application.Globix.DOCUMENT_ID = oFirstRow.Item("DocID") + My.Application.Globix.DOCUMENT_ID = oFirstRow.Item("IDB_OBJ_ID") Return oFirstRow.Item("ADDED_WHEN") End If Catch ex As Exception