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

Merge branch 'master' of http://172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
Jonathan Jenne
2017-10-24 16:47:04 +02:00
parent 9161865a71 36cf36f044
commit dedebfae30
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/DD-Record-Organizer/ClassDatabase.vb
View File

@@ -107,6 +107,7 @@ Public Class ClassDatabase
SQLcommand.CommandTimeout = 180 SQLcommand.CommandTimeout = 180
Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand) Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
Dim dt As DataTable = New DataTable() Dim dt As DataTable = New DataTable()
adapter1.Fill(dt) adapter1.Fill(dt)
SQLconnect.Close() SQLconnect.Close()
@@ -115,8 +116,12 @@ Public Class ClassDatabase
Return dt Return dt
Catch ex As Exception Catch ex As Exception
MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung, MsgBoxStyle.Critical) MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", ex.Message & " - SQL: " & Select_anweisung
ClassLogger.Add("Error in Return_Datatable: " & ex.Message, True) ClassLogger.Add("Error in Return_Datatable: " & ex.Message, True)
ClassLogger.Add(">> SQL: " & Select_anweisung, False) ClassLogger.Add(">> SQL: " & Select_anweisung, False)
If (ex.Message.Contains("Ungültiger Objektname") Or ex.Message.Contains("Invalid Object Name")) And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
MsgBox("A database-object could not be found but synchronization of Proxyserver might be in action! So please try again in a few seconds/minutes!", MsgBoxStyle.Exclamation)
End If
Return Nothing Return Nothing
End Try End Try
End Function End Function
@@ -248,6 +253,7 @@ Public Class ClassDatabase
'End If 'End If
ClassLogger.Add("Error in Execute_non_Query: " & ex.Message) ClassLogger.Add("Error in Execute_non_Query: " & ex.Message)
ClassLogger.Add("SQL: " & ExecuteCMD) ClassLogger.Add("SQL: " & ExecuteCMD)
Return False Return False
End Try End Try
End Function End Function

41
app/DD-Record-Organizer/frmWD_IndexFile.vb
View File

@@ -45,26 +45,35 @@ Public Class frmWD_IndexFile
End If End If
sw.Done() sw.Done()
sw = New SW("CheckFileExists") sw = New SW("CheckFileExists")
Dim existsonlyasMaster = False
If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = True Then
sw.Done() sw.Done()
Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?" If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then
If USER_LANGUAGE <> "de-DE" Then ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", "FILE ALREADY EXISTED WITH NON-USER RIGHTS: " & CURRENT_NEWFILENAME)
msg = "There is already a file with the same name! Would You like to replace the file?" existsonlyasMaster = True
End If End If
Dim result As MsgBoxResult If existsonlyasMaster = True Then
result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then
If clsWD_SET.Delete_WDFile(CURRENT_NEWFILENAME.Substring(2)) = False Then
Return False
End If
Else
CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME) CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME)
End If ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", "NEW FILENAME: " & CURRENT_NEWFILENAME)
Else Else
sw.Done() Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?"
End If If USER_LANGUAGE <> "de-DE" Then
msg = "There is already a file with the same name! Would You like to replace the file?"
End If
Dim result As MsgBoxResult
result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then
If clsWD_SET.Delete_WDFile(CURRENT_NEWFILENAME.Substring(2)) = False Then
Return False
End If
Else
CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME)
End If
End If
End If
sw.Done()
'################################################################# '#################################################################
'Stream File to windream 'Stream File to windream
'################################################################# '#################################################################