AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS23032016

Browse Source
This commit is contained in:
SchreiberM
2016-03-23 13:01:40 +01:00
parent 777de5582e
commit 58788043c5
14 changed files with 989 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/DD-Record-Organiser/ClassDatabase.vb
View File

@@ -13,7 +13,7 @@ Public Class ClassDatabase
SQLconnect.Close()
Return True
Catch ex As Exception
ClassLogger.Add("Fehler bei DatabaseInit: " & ex.Message, True)
ClassLogger.Add("Error in DatabaseInit: " & ex.Message, True)
Return False
End Try
End Function
@@ -50,8 +50,8 @@ Public Class ClassDatabase
End If
Catch ex As Exception
ClassLogger.Add(" - Unvorhergesehener Fehler bei GetConnectionString - Fehler: " & vbNewLine & ex.Message)
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei GetConnectionString:")
ClassLogger.Add(" - Error in bei GetConnectionString - Fehler: " & vbNewLine & ex.Message)
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in GetConnectionString:")
End Try
Return connectionString
End Function
@@ -70,8 +70,8 @@ Public Class ClassDatabase
SQLconnect.Close()
Return dt
Catch ex As Exception
MsgBox("Fehler bei Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung & vbNewLine & vbNewLine & "Call-Method: " & CallMethod, MsgBoxStyle.Critical)
ClassLogger.Add("Fehler bei Return_Datatable: " & ex.Message & "Call-Method: " & CallMethod, True)
MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung & vbNewLine & vbNewLine & "Call-Method: " & CallMethod, MsgBoxStyle.Critical)
ClassLogger.Add("Error in Return_Datatable: " & ex.Message & "Call-Method: " & CallMethod, True)
If CallMethod <> "" Then ClassLogger.Add(">> Call-Method: " & CallMethod, False)
ClassLogger.Add(">> SQL: " & Select_anweisung, False)
Return Nothing
@@ -79,6 +79,13 @@ Public Class ClassDatabase
End Function
Public Shared Function MSSQL_ReturnDTWithConnection(connectionId As Integer, sql As String)
Try
Dim regex As New System.Text.RegularExpressions.Regex("(@(\d+)@)")
Dim match As System.Text.RegularExpressions.Match = regex.Match(sql)
If match.Success Then
Return Nothing
End If
Dim connectionString As String
connectionString = ClassDatabase.GetConnectionString(connectionId)
If connectionString <> "" Then
@@ -96,13 +103,13 @@ Public Class ClassDatabase
SQLconnect.Close()
Return dt
Else
MsgBox("No ConnectionID!", MsgBoxStyle.Exclamation)
MsgBox("No Connection received for ID: " & connectionId.ToString, MsgBoxStyle.Exclamation)
Return Nothing
End If
Catch ex As Exception
ClassLogger.Add(" - Unvorhergesehener Fehler bei MSSQL_ReturnDTWithConnection: " & vbNewLine & ex.Message)
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei MSSQL_ReturnDTWithConnection:")
ClassLogger.Add(" - Unexpected Error in MSSQL_ReturnDTWithConnection: " & vbNewLine & ex.Message)
MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected Error in MSSQL_ReturnDTWithConnection:")
Return Nothing
End Try
End Function
@@ -124,7 +131,7 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Fehler bei Return_Datatable_CS: " & ex.Message, True)
ClassLogger.Add("Error in Return_Datatable_CS: " & ex.Message, True)
ClassLogger.Add("#SQL: " & Select_anweisung, False)
Return Nothing
End Try
@@ -145,10 +152,10 @@ Public Class ClassDatabase
Return True
Catch ex As Exception
If Userinput = True Then
MsgBox("Fehler bei Execute_non_Query: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
MsgBox("Error in Execute_non_Query: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Fehler bei Execute_non_Query: " & ex.Message, True)
ClassLogger.Add("Error in Execute_non_Query: " & ex.Message, True)
ClassLogger.Add("SQL: " & ExecuteCMD, False)
Return False
End Try
@@ -175,7 +182,7 @@ Public Class ClassDatabase
End If
Catch ex As Exception
ClassLogger.Add("Fehler bei Execute_non_Query_withConn: " & ex.Message, True)
ClassLogger.Add("Error in Execute_non_Query_withConn: " & ex.Message, True)
ClassLogger.Add("SQL: " & ExecuteCMD, False)
Return False
End Try
@@ -197,9 +204,9 @@ Public Class ClassDatabase
SQLcommand.BeginExecuteNonQuery(callback, SQLcommand)
Catch ex As Exception
If Userinput = True Then
MsgBox("Fehler bei Execute_non_Query_Async: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
MsgBox("Error in Execute_non_Query_Async: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Fehler bei Execute_non_Query_Async: " & ex.Message, True)
ClassLogger.Add("Error in Execute_non_Query_Async: " & ex.Message, True)
ClassLogger.Add("SQL: " & ExecuteCMD, False)
Finally
SQLcommand.Dispose()
@@ -230,9 +237,9 @@ Public Class ClassDatabase
Return result
Catch ex As Exception
If Userinput = True Then
MsgBox("Fehler bei Execute_Scalar: " & ex.Message & vbNewLine & vbNewLine & cmdscalar, MsgBoxStyle.Critical)
MsgBox("Error in Execute_Scalar: " & ex.Message & vbNewLine & vbNewLine & cmdscalar, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Fehler bei Execute_Scalar: " & ex.Message, True)
ClassLogger.Add("Error in Execute_Scalar: " & ex.Message, True)
ClassLogger.Add("SQL: " & cmdscalar, False)
Return Nothing
End Try
@@ -261,7 +268,7 @@ Public Class ClassDatabase
End If
Catch ex As Exception
ClassLogger.Add("Fehler bei Execute_ScalarWithConnection: " & ex.Message, True)
ClassLogger.Add("Error in Execute_ScalarWithConnection: " & ex.Message, True)
ClassLogger.Add("SQL: " & cmdscalar, False)
Return Nothing
End Try
@@ -282,7 +289,7 @@ Public Class ClassDatabase
SQLconnect.Close()
Return result
Catch ex As Exception
ClassLogger.Add("Fehler bei OracleExecute_Scalar: " & ex.Message, True)
ClassLogger.Add("Error in OracleExecute_Scalar: " & ex.Message, True)
ClassLogger.Add("#SQL: " & cmdscalar, False)
Return Nothing
End Try
@@ -304,7 +311,7 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in OracleExecute_non_Query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Fehler bei OracleExecute_non_Query: " & ex.Message, True)
ClassLogger.Add("Error in OracleExecute_non_Query: " & ex.Message, True)
ClassLogger.Add("#SQL: " & ExecuteCMD, False)
Return False
@@ -329,7 +336,7 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Oracle Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Fehler bei Oracle_Return_Datatable: " & ex.Message, True)
ClassLogger.Add("Error in Oracle_Return_Datatable: " & ex.Message, True)
ClassLogger.Add("#SQL: " & Select_anweisung, False)
Return Nothing
End Try