Remove ClassDatabase, Replace with Database.MSSQL Module
This commit is contained in:
@@ -155,10 +155,12 @@ Public Class frmIndex
|
||||
sql = sqlscalar
|
||||
Dim ergebnis As Integer
|
||||
If DR.Item("SQL_PROVIDER") = "Oracle" Then
|
||||
ergebnis = ClassDatabase.OracleExecute_Scalar(sql, connectionString)
|
||||
|
||||
' ergebnis = ClassDatabase.OracleExecute_Scalar(sql, connectionString)
|
||||
LOGGER.Warn("Oracle is not supported")
|
||||
Else
|
||||
'MSQL
|
||||
ergebnis = ClassDatabase.Execute_Scalar(sql, connectionString)
|
||||
ergebnis = DATABASE_ECM.GetScalarValueWithConnection(sql, connectionString)
|
||||
End If
|
||||
|
||||
Select Case ergebnis
|
||||
@@ -219,7 +221,6 @@ Public Class frmIndex
|
||||
_Logger.Info(" >>Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"))
|
||||
Return DR.Item("Indexwert")
|
||||
Else
|
||||
'Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & indexname & "')", MyConnectionString, True)
|
||||
If opt = False Then
|
||||
_Logger.Info("Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!")
|
||||
ShowNotice("Indexiert = True - Der Index: " & DR.Item("INDEXNAME") & " wurde nicht ordnungsgemäss indexiert! - Automatischer Index konnte nicht gesetzt werden!")
|
||||
@@ -290,7 +291,7 @@ Public Class frmIndex
|
||||
If vProvider.ToLower = "oracle" Then
|
||||
oErgebnis = ClassDatabase.OracleExecute_Scalar(SQLCommand, oConnectionString)
|
||||
Else 'im Moment nur SQL-Server
|
||||
oErgebnis = ClassDatabase.Execute_Scalar(SQLCommand, oConnectionString)
|
||||
oErgebnis = DATABASE_ECM.GetScalarValueWithConnection(SQLCommand, oConnectionString)
|
||||
End If
|
||||
|
||||
If LogErrorsOnly = False Then
|
||||
@@ -323,7 +324,7 @@ Public Class frmIndex
|
||||
If oControl.Name.StartsWith("txt") Then
|
||||
Dim box As DevExpress.XtraEditors.TextEdit = oControl
|
||||
If box.Text = "" Then
|
||||
Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(box.Name, "txt", "") & "'", MyConnectionString, True)
|
||||
Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(box.Name, "txt", "") & "'")
|
||||
If optional_index = False Then
|
||||
|
||||
If USER_LANGUAGE = LANG_DE Then
|
||||
@@ -366,7 +367,7 @@ Public Class frmIndex
|
||||
Dim oValues As List(Of String) = oLookup.Properties.SelectedValues
|
||||
|
||||
If oValues.Count = 0 Then
|
||||
Dim oIsOptionalIndex As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(oLookup.Name, "cmbMulti", "") & "'", MyConnectionString, True)
|
||||
Dim oIsOptionalIndex As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(oLookup.Name, "cmbMulti", "") & "'")
|
||||
|
||||
If oIsOptionalIndex = False Then
|
||||
If USER_LANGUAGE = LANG_DE Then
|
||||
@@ -390,7 +391,7 @@ Public Class frmIndex
|
||||
Dim cmbSingle As TextBox = oControl
|
||||
|
||||
If cmbSingle.Text = "" Then
|
||||
Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmbSingle.Name, "cmbSingle", "") & "'", MyConnectionString, True)
|
||||
Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmbSingle.Name, "cmbSingle", "") & "'")
|
||||
|
||||
If optional_index = False Then
|
||||
If USER_LANGUAGE = LANG_DE Then
|
||||
@@ -411,7 +412,7 @@ Public Class frmIndex
|
||||
ElseIf oControl.Name.StartsWith("cmb") Then
|
||||
Dim cmb As ComboBox = oControl
|
||||
If cmb.Text = "" Then
|
||||
Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmb.Name, "cmb", "") & "'", MyConnectionString, True)
|
||||
Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmb.Name, "cmb", "") & "'")
|
||||
If optional_index = False Then
|
||||
If USER_LANGUAGE = LANG_DE Then
|
||||
MsgBox(TEXT_MISSING_INPUT_DE, MsgBoxStyle.Exclamation, Text)
|
||||
@@ -434,7 +435,7 @@ Public Class frmIndex
|
||||
Dim oIndexName As String = Replace(dtp.Name, "dtp", "")
|
||||
|
||||
If dtp.Text = String.Empty Then
|
||||
Dim optional_index As Boolean = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocumentTypeId} AND NAME = '{oIndexName}'", MyConnectionString, True)
|
||||
Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocumentTypeId} AND NAME = '{oIndexName}'")
|
||||
|
||||
If optional_index = False Then
|
||||
If USER_LANGUAGE = LANG_DE Then
|
||||
@@ -489,7 +490,7 @@ Public Class frmIndex
|
||||
'Die Nachbearbeitungsschritte laden
|
||||
'FILE AND INDEX
|
||||
'Zuerst nur die Fälle für die Variante ONLY FILE/FOLDER
|
||||
Dim DTNB As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'ONLY FILE/FOLDER' ORDER BY SEQUENCE")
|
||||
Dim DTNB As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'ONLY FILE/FOLDER' ORDER BY SEQUENCE")
|
||||
If DTNB Is Nothing = False Then
|
||||
If DTNB.Rows.Count > 0 Then
|
||||
value_post = ClassPostprocessing.Get_Nachbearbeitung_Wert(wert_in, DTNB)
|
||||
@@ -499,7 +500,7 @@ Public Class frmIndex
|
||||
End If
|
||||
'Jetzt die Fälle für die Variante FILE AND INDEX
|
||||
DTNB = Nothing
|
||||
DTNB = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'FILE AND INDEX' ORDER BY SEQUENCE")
|
||||
DTNB = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'FILE AND INDEX' ORDER BY SEQUENCE")
|
||||
If DTNB Is Nothing = False Then
|
||||
If DTNB.Rows.Count > 0 Then
|
||||
value_post = ClassPostprocessing.Get_Nachbearbeitung_Wert(wert_in, DTNB)
|
||||
@@ -520,7 +521,7 @@ Public Class frmIndex
|
||||
_Logger.Debug("#### Name_Generieren ####")
|
||||
Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES WHERE GUID = 1"
|
||||
Dim oFilesystem As New DigitalData.Modules.Filesystem.File(LOGCONFIG)
|
||||
Dim DT1 As DataTable = ClassDatabase.Return_Datatable(sql)
|
||||
Dim DT1 As DataTable = DATABASE_ECM.GetDatatable(sql)
|
||||
For Each row As DataRow In DT1.Rows
|
||||
FILE_DELIMITER = row.Item("FILE_DELIMITER")
|
||||
VERSION_DELIMITER = row.Item("VERSION_DELIMITER")
|
||||
@@ -530,7 +531,7 @@ Public Class frmIndex
|
||||
Dim folder_Created As Boolean = False
|
||||
Dim oRAWZielordner As String
|
||||
Dim extension As String = System.IO.Path.GetExtension(CURRENT_WORKFILE)
|
||||
Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID)
|
||||
Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID)
|
||||
sql_history_INSERT_INTO = "INSERT INTO TBGI_HISTORY (FILENAME_ORIGINAL,FILENAME_NEW"
|
||||
sql_history_Index_Values = ""
|
||||
Dim AnzahlIndexe As Integer = 1
|
||||
@@ -562,7 +563,7 @@ Public Class frmIndex
|
||||
Case "M"
|
||||
_Logger.Debug("NameGenerieren: Manueller Index wird geprüft...")
|
||||
Dim Indexname = oElement.Value.Substring(3, oElement.Value.Length - 4)
|
||||
Dim optional_index As Boolean = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{Indexname}')", MyConnectionString, True)
|
||||
Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{Indexname}')")
|
||||
Dim oManValue As String = GetManIndex_Value(Indexname, "FILE", optional_index)
|
||||
If oManValue <> String.Empty Then
|
||||
Dim firstVectorValue = oManValue.Split(ClassConstants.VECTORSEPARATOR).First()
|
||||
@@ -872,7 +873,7 @@ Public Class frmIndex
|
||||
Dim oIndexNames As Dictionary(Of String, Object)
|
||||
|
||||
Dim oSQL As String = $"SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '{CURR_DOKART_OBJECTTYPE}'"
|
||||
Dim oTable As DataTable = ClassDatabase.Return_Datatable(oSQL)
|
||||
Dim oTable As DataTable = DATABASE_ECM.GetDatatable(oSQL)
|
||||
|
||||
If IsNothing(oTable) Then
|
||||
_Logger.Info("Could not get Email Indicies for DocType = [{0}]. Exiting.", CURR_DOKART_OBJECTTYPE)
|
||||
@@ -1011,7 +1012,7 @@ Public Class frmIndex
|
||||
' finalize_pattern = rowregex.Item("REGEX")
|
||||
' End If
|
||||
' Next
|
||||
' Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
|
||||
' Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
|
||||
' If IsNothing(DT) Then
|
||||
' _Logger.Info("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "' RESULTED in NOTHING")
|
||||
' Return False
|
||||
@@ -1297,7 +1298,7 @@ Public Class frmIndex
|
||||
'Private Function SetAttachmentIndices()
|
||||
' Dim indexierung_erfolgreich As Boolean = True
|
||||
' Try
|
||||
' Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
|
||||
' Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
|
||||
' If DT.Rows.Count = 1 Then
|
||||
|
||||
' If Not CURRENT_MESSAGEID Is Nothing Then
|
||||
@@ -1394,19 +1395,19 @@ Public Class frmIndex
|
||||
Dim oUser As String = $"{Environment.UserDomainName}\{Environment.UserName}"
|
||||
|
||||
Insert_String = sql_history_INSERT_INTO & $",ADDED_WHO, ADDED_WHERE, FILE_HASH) VALUES ('{oCurrentWorkfile}','{oCurrentNewFilename}'{sql_history_Index_Values},'{oUser}','{Environment.MachineName}','{CURRENT_WORKFILE_HASH}')"
|
||||
If ClassDatabase.Execute_non_Query(Insert_String) = True Then
|
||||
If DATABASE_ECM.ExecuteNonQuery(Insert_String) = True Then
|
||||
If CURRENT_MESSAGEID <> "" Then
|
||||
Dim max As String = "SELECT MAX(GUID) FROM TBGI_HISTORY"
|
||||
Dim GUID = ClassDatabase.Execute_Scalar(max, MyConnectionString, True)
|
||||
Dim GUID = DATABASE_ECM.GetScalarValue(max)
|
||||
Try
|
||||
If GUID > 0 Then
|
||||
Dim sql As String
|
||||
If CURRENT_ISATTACHMENT = True Then
|
||||
sql = "Update TBGI_HISTORY SET ATTACHMENT = 1, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID
|
||||
ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
|
||||
DATABASE_ECM.GetScalarValue(sql)
|
||||
Else
|
||||
sql = "Update TBGI_HISTORY SET ATTACHMENT = 0, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID
|
||||
ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
|
||||
DATABASE_ECM.GetScalarValue(sql)
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
@@ -1446,7 +1447,7 @@ Public Class frmIndex
|
||||
Try
|
||||
ABORT_INDEXING = True
|
||||
Dim sql As String = $"SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')"
|
||||
Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
|
||||
Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql)
|
||||
|
||||
Dim anz = DT.Rows.Count
|
||||
For Each Filerow As DataRow In DT.Rows
|
||||
@@ -1465,7 +1466,7 @@ Public Class frmIndex
|
||||
End If
|
||||
Next
|
||||
'Zuerst die Daten des Ablaufs löschen
|
||||
If ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) = True Then
|
||||
If DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") = True Then
|
||||
If containsfw_file = True Then
|
||||
If USER_LANGUAGE = LANG_DE Then
|
||||
MsgBox("Der Indexierungsprozess beinhaltete (auch) Dateien per Folderwatch!" & vbNewLine & "Diese Dateien wurden nicht gelöscht und verbleiben im Folderwatch-Verzeichnis!" & vbNewLine & "Bitte verschieben Sie die Dateien ggfls.", MsgBoxStyle.Information, "Achtung - Hinweis:")
|
||||
@@ -1523,13 +1524,13 @@ Public Class frmIndex
|
||||
|
||||
Try
|
||||
CURRENT_ISATTACHMENT = False
|
||||
DropType = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID, MyConnectionString, True)
|
||||
DropType = DATABASE_ECM.GetScalarValue("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID)
|
||||
|
||||
CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile
|
||||
checkItemDeleteSource.Enabled = True
|
||||
checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile
|
||||
|
||||
VIEWER_LICENSE = ClassDatabase.Execute_Scalar("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'", MyConnectionString)
|
||||
VIEWER_LICENSE = DATABASE_ECM.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'")
|
||||
|
||||
DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE)
|
||||
|
||||
@@ -1609,8 +1610,8 @@ Public Class frmIndex
|
||||
|
||||
Load_String()
|
||||
|
||||
DTTBGI_REGEX_DOCTYPE = ClassDatabase.Return_Datatable("SELECT DISTINCT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID")
|
||||
MULTIFILES = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", MyConnectionString, True)
|
||||
DTTBGI_REGEX_DOCTYPE = DATABASE_ECM.GetDatatable("SELECT DISTINCT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID")
|
||||
MULTIFILES = DATABASE_ECM.GetScalarValue("SELECT COUNT(*) FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
|
||||
MULTIINDEXING_ACTIVE = False
|
||||
If MULTIFILES > 0 Then
|
||||
If USER_LANGUAGE = LANG_DE Then
|
||||
@@ -1708,7 +1709,7 @@ Public Class frmIndex
|
||||
Try
|
||||
Dim sql = String.Format("SELECT DISTINCT DOCTYPE_ID, DOCTYPE, SEQUENCE FROM VWGI_DOCTYPE where UPPER(USERNAME) = UPPER('{0}') ORDER BY SEQUENCE", Environment.UserName)
|
||||
_Logger.Info("SQL DoctypeList: " & sql)
|
||||
Dim oDoctypes = ClassDatabase.Return_Datatable(sql)
|
||||
Dim oDoctypes = DATABASE_ECM.GetDatatable(sql)
|
||||
'cmbDokumentart.DataSource = oDoctypes
|
||||
'cmbDokumentart.ValueMember = oDoctypes.Columns("DOCTYPE_ID").ColumnName
|
||||
'cmbDokumentart.DisplayMember = oDoctypes.Columns("DOCTYPE").ColumnName
|
||||
@@ -1745,7 +1746,7 @@ Public Class frmIndex
|
||||
|
||||
pnlIndex.Controls.Clear()
|
||||
Dim sql As String = "Select WINDREAM_DIRECT, ZIEL_PFAD, DUPLICATE_HANDLING from TBDD_DOKUMENTART WHERE GUID = " & oSelectedItem.Guid
|
||||
Dim oDoctypes As DataTable = ClassDatabase.Return_Datatable(sql)
|
||||
Dim oDoctypes As DataTable = DATABASE_ECM.GetDatatable(sql)
|
||||
Dim oDocType As DataRow = oDoctypes.Rows.Item(0)
|
||||
|
||||
Dim oDestination As String = oDocType.Item("ZIEL_PFAD")
|
||||
@@ -1775,7 +1776,7 @@ Public Class frmIndex
|
||||
Dim sql
|
||||
Try
|
||||
sql = "select T1.BEZEICHNUNG AS DOKUMENTART,T.* from TBDD_INDEX_MAN T, TBDD_DOKUMENTART T1 where T.ACTIVE = 1 AND T.DOK_ID = T1.GUID AND T.DOK_ID = " & dokartid & " ORDER BY T.SEQUENCE"
|
||||
DT_INDEXEMAN = ClassDatabase.Return_Datatable(sql)
|
||||
DT_INDEXEMAN = DATABASE_ECM.GetDatatable(sql)
|
||||
pnlIndex.Visible = True
|
||||
LoadIndexe_Man()
|
||||
Catch ex As System.Exception
|
||||
@@ -1926,7 +1927,7 @@ Public Class frmIndex
|
||||
End Sub
|
||||
|
||||
Private Function GetLookupData(pLookup As LookupControl3, pSQLCommand As String, pConnectionId As Integer)
|
||||
Dim oConnectionString = ClassFormFunctions.GetConnectionString(pConnectionId)
|
||||
Dim oConnectionString = DATABASE_ECM.Get_ConnectionStringforID(pConnectionId)
|
||||
|
||||
If oConnectionString IsNot Nothing And pSQLCommand.Length > 0 Then
|
||||
LOGGER.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30))
|
||||
@@ -1938,7 +1939,8 @@ Public Class frmIndex
|
||||
pSQLCommand = ClassPatterns.ReplaceInternalValues(pSQLCommand)
|
||||
pSQLCommand = ClassPatterns.ReplaceUserValues(pSQLCommand, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID)
|
||||
|
||||
Dim oDatatable = ClassDatabase.Return_Datatable_Combined(pSQLCommand, oConnectionString, False)
|
||||
'Dim oDatatable = ClassDatabase.Return_Datatable_Combined(pSQLCommand, oConnectionString, False)
|
||||
Dim oDatatable = DATABASE_ECM.GetDatatableWithConnection(pSQLCommand, oConnectionString)
|
||||
Return oDatatable
|
||||
End If
|
||||
Else
|
||||
@@ -1956,7 +1958,7 @@ Public Class frmIndex
|
||||
Dim oMeta = DirectCast(Control.Tag, ControlCreator.ControlMeta)
|
||||
Dim oIndexName As String = oMeta.IndexName
|
||||
Dim oSQL = $"SELECT * FROM TBDD_INDEX_MAN WHERE SQL_RESULT LIKE '%{oIndexName}%' AND DOK_ID = {CURRENT_DOKART_ID}"
|
||||
Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL)
|
||||
Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL)
|
||||
|
||||
If Not IsNothing(oDatatable) Then
|
||||
LOGGER.Debug("Found [{0}] depending controls for [{1}]", oDatatable.Rows.Count, Control.Name)
|
||||
@@ -1991,7 +1993,8 @@ Public Class frmIndex
|
||||
End If
|
||||
|
||||
Dim oConnectionString = ClassFormFunctions.GetConnectionString(SqlConnectionId)
|
||||
Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SqlCommand, oConnectionString)
|
||||
'Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SqlCommand, oConnectionString)
|
||||
Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(SqlCommand)
|
||||
Dim oFoundControl As Control = Nothing
|
||||
|
||||
For Each oControl As Control In pnlIndex.Controls
|
||||
@@ -2152,7 +2155,7 @@ Public Class frmIndex
|
||||
oSqlResult = oSqlResult.Replace(oMatch.Value, oPlaceholderResult)
|
||||
End If
|
||||
|
||||
oOptionalIndex = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')", MyConnectionString, True)
|
||||
oOptionalIndex = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')")
|
||||
oManualIndexResult = GetManIndex_Value(oIndexValue, "IDX_AUTO", oOptionalIndex)
|
||||
|
||||
' Wenn Ergebnis den VektorPlatzhalter enthält, soll nichts ersetzt werden.
|
||||
@@ -2187,7 +2190,7 @@ Public Class frmIndex
|
||||
Dim oOptionalIndex = False
|
||||
Dim oManualIndexResult As String = Nothing
|
||||
|
||||
oOptionalIndex = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')", MyConnectionString, True)
|
||||
oOptionalIndex = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')")
|
||||
oManualIndexResult = GetManIndex_Value(oIndexValue, "IDX_AUTO", oOptionalIndex)
|
||||
|
||||
Dim oVectorIndexValues = oManualIndexResult.Split(ClassConstants.VECTORSEPARATOR).ToList()
|
||||
@@ -2278,7 +2281,7 @@ Public Class frmIndex
|
||||
CURRENT_LASTDOKART = oDokart.Name
|
||||
_Logger.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.")
|
||||
Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID
|
||||
ClassDatabase.Execute_non_Query(oDEL, True)
|
||||
DATABASE_ECM.ExecuteNonQuery(oDEL)
|
||||
|
||||
If CURR_DELETE_ORIGIN = True Then
|
||||
_Logger.Info("Datei [" & CURRENT_WORKFILE & "] wird gelöscht.")
|
||||
@@ -2343,7 +2346,7 @@ Public Class frmIndex
|
||||
' 'Die erste Datei indexieren
|
||||
' If WORK_FILE() = True Then
|
||||
' 'Und nun die folgenden
|
||||
' Dim DTFiles2Work As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
|
||||
' Dim DTFiles2Work As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
|
||||
' If Not DTFiles2Work Is Nothing Then
|
||||
' Dim err = False
|
||||
' For Each filerow As DataRow In DTFiles2Work.Rows
|
||||
@@ -2390,7 +2393,7 @@ Public Class frmIndex
|
||||
Dim oError As Boolean
|
||||
Try
|
||||
Dim oSQL As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID
|
||||
Dim oFolderForIndex = ClassDatabase.Execute_Scalar(oSQL, MyConnectionString, True)
|
||||
Dim oFolderForIndex = DATABASE_ECM.GetScalarValue(oSQL)
|
||||
If Not IsDBNull(oFolderForIndex) Then
|
||||
CreateFolderForIndex(oFolderForIndex)
|
||||
Else
|
||||
@@ -2420,20 +2423,20 @@ Public Class frmIndex
|
||||
Dim oUser As String = $"{Environment.UserDomainName}\{Environment.UserName}"
|
||||
|
||||
Insert_String = sql_history_INSERT_INTO & $",ADDED_WHO, ADDED_WHERE, FILE_HASH) VALUES ('{tempCur_WF}','{tempCur_New_FN}'{sql_history_Index_Values},'{oUser}','{Environment.MachineName}','{CURRENT_WORKFILE_HASH}')"
|
||||
ClassDatabase.Execute_Scalar(Insert_String, MyConnectionString, True)
|
||||
DATABASE_ECM.GetScalarValue(Insert_String)
|
||||
If DropType.Contains("MSG") Or DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
|
||||
If CURRENT_MESSAGEID <> "" Then
|
||||
Dim max As String = "SELECT MAX(GUID) FROM TBGI_HISTORY"
|
||||
Dim GUID = ClassDatabase.Execute_Scalar(max, MyConnectionString, True)
|
||||
Dim GUID = DATABASE_ECM.GetScalarValue(max)
|
||||
Try
|
||||
If GUID > 0 Then
|
||||
Dim sqlUpdate As String
|
||||
If DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
|
||||
sqlUpdate = "Update TBGI_HISTORY SET ATTACHMENT = 1, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID
|
||||
ClassDatabase.Execute_non_Query(sqlUpdate, True)
|
||||
DATABASE_ECM.ExecuteNonQuery(sqlUpdate)
|
||||
Else
|
||||
sqlUpdate = "Update TBGI_HISTORY SET ATTACHMENT = 0, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID
|
||||
ClassDatabase.Execute_non_Query(sqlUpdate, True)
|
||||
DATABASE_ECM.ExecuteNonQuery(sqlUpdate)
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
@@ -2499,7 +2502,7 @@ Public Class frmIndex
|
||||
'Manueller Indexwert
|
||||
Case "M"
|
||||
Dim oManIndexName = oMatch.Value.Substring(3, oMatch.Value.Length - 4)
|
||||
Dim oIsOptional As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & oManIndexName & "')", MyConnectionString, True)
|
||||
Dim oIsOptional As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & oManIndexName & "')")
|
||||
_Logger.Info("Versuch den Indexwert aus '" & oManIndexName & "' auszulesen.")
|
||||
Dim oManIndexValue As String = GetManIndex_Value(oManIndexName, "FILE", oIsOptional)
|
||||
_Logger.Info("Ergebnis/Wert für neuen Ordner: '" & oManIndexName & "'")
|
||||
@@ -2646,7 +2649,7 @@ Public Class frmIndex
|
||||
ABORT_INDEXING = True
|
||||
Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
|
||||
|
||||
Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
|
||||
Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql)
|
||||
|
||||
|
||||
Dim anz = DT.Rows.Count
|
||||
@@ -2666,7 +2669,7 @@ Public Class frmIndex
|
||||
End If
|
||||
Next
|
||||
'Zuerst die Daten des Ablaufs löschen
|
||||
If ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) = True Then
|
||||
If DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") = True Then
|
||||
If containsfw_file = True Then
|
||||
If USER_LANGUAGE = LANG_DE Then
|
||||
MsgBox("Der Indexierungsprozess beinhaltete (auch) Dateien per Folderwatch!" & vbNewLine & "Diese Dateien wurden nicht gelöscht und verbleiben im Folderwatch-Verzeichnis!" & vbNewLine & "Bitte verschieben Sie die Dateien ggfls.", MsgBoxStyle.Information, "Achtung - Hinweis:")
|
||||
@@ -2732,7 +2735,7 @@ Public Class frmIndex
|
||||
'Die erste Datei indexieren
|
||||
If WORK_FILE() = True Then
|
||||
'Und nun die folgenden
|
||||
Dim DTFiles2Work As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
|
||||
Dim DTFiles2Work As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
|
||||
If Not DTFiles2Work Is Nothing Then
|
||||
Dim err = False
|
||||
For Each filerow As DataRow In DTFiles2Work.Rows
|
||||
@@ -2838,7 +2841,7 @@ Public Class frmIndex
|
||||
End Sub
|
||||
|
||||
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
|
||||
ClassDatabase.Execute_non_Query($"DELETE FROM TBGI_FILES_USER WHERE GUID = {CURRENT_WORKFILE_GUID}", True)
|
||||
DATABASE_ECM.ExecuteNonQuery($"DELETE FROM TBGI_FILES_USER WHERE GUID = {CURRENT_WORKFILE_GUID}")
|
||||
|
||||
CancelAttempts = 2
|
||||
Close()
|
||||
|
||||
Reference in New Issue
Block a user