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

account for other windream drive letters than W

Browse Source
This commit is contained in:
Jonathan Jenne 2020-04-06 13:59:08 +02:00
parent 89c6ddaeed
commit 3f084d17a1
1 changed files with 153 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Global_Indexer/ClassWindream.vb
View File

@ -8,6 +8,7 @@ Imports WINDREAMLib.WMSearchRelation
Imports WMOBRWSLib
Imports WMOSRCHLib
Imports System.IO
Imports System.Text.RegularExpressions
Public Class ClassWindream
@ -411,14 +412,22 @@ Public Class ClassWindream
Dim oWindreamFilename As String = NewFileName
Dim oFileName As String = NewFileName
Dim oWDriveRegex As New Regex("^\w{1}:")
If NewFileName.StartsWith("W:") Then
oFileName = NewFileName.Replace("W:", vWLaufwerk)
oWindreamFilename = NewFileName.Replace("W:", String.Empty)
If oWDriveRegex.IsMatch(NewFileName) Then
oFileName = oWDriveRegex.Replace(NewFileName, vWLaufwerk)
oWindreamFilename = oWDriveRegex.Replace(NewFileName, String.Empty)
Else
oWindreamFilename = NewFileName.Replace(vWLaufwerk, String.Empty)
End If
'If NewFileName.StartsWith("W:") Then
' oFileName = NewFileName.Replace("W:", vWLaufwerk)
' oWindreamFilename = NewFileName.Replace("W:", String.Empty)
'Else
' oWindreamFilename = NewFileName.Replace(vWLaufwerk, String.Empty)
'End If
Dim oSourceFilename As String = Path.GetFileName(SourceFilePath)
Dim oDestination As String = Path.GetDirectoryName(oFileName)
@ -434,16 +443,6 @@ Public Class ClassWindream
LOGGER.Info(" ...Quelldatei gelesen")
'If oWindreamFilename.Contains("[%Version]") Then
' oWindreamFilename = oWindreamFilename.Replace("[%Version]", "")
' NewFileName = oWindreamFilename
'End If
'If NewFileName.StartsWith("W:") Then
' NewFileName = NewFileName.Replace("W:", vWLaufwerk)
' oWindreamFilename = NewFileName.Replace(vWLaufwerk, String.Empty)
'End If
If My.Computer.FileSystem.DirectoryExists(oDestination) Then
LOGGER.Info(" ...targetPath existiert")
' Überprüfen ob der zu Kopieren notwendige Speicherplatz auf Ziellaufwerk vorhanden ist
@ -451,20 +450,6 @@ Public Class ClassWindream
Dim oFileInfo As New FileInfo(SourceFilePath)
Dim oFileLength As Long = oFileInfo.Length
'If vWLaufwerk.Count = 1 Then
' Dim oDriveInfo As New DriveInfo(vWLaufwerk & ":")
' Dim oFreeSpace = oDriveInfo.TotalFreeSpace
' If oFreeSpace < oFileLength Then
' If USER_LANGUAGE = "de-DE" Then
' MsgBox("Auf dem Zielverzeichnis ist nicht genug Speicherplatz zum Übertragen frei.", MsgBoxStyle.Exclamation, "Nicht genug Speicherplatz")
' Else
' MsgBox("Not enough diskspace in Target-Directory.", MsgBoxStyle.Exclamation, "Not enough diskspace")
' End If
' Return -10
' End If
'End If
LOGGER.Info(" ...Datei kopieren von '" & SourceFilePath & "' nach '" & NewFileName & "'.")
Dim Connect
@ -477,13 +462,6 @@ Public Class ClassWindream
LOGGER.Info(" ...Connect definieren: CreateObject('Windream.WMConnect')")
Connect = CreateObject("Windream.WMConnect")
aFileIO = New WMOTOOLLib.WMFileIO
'If My.Settings.DLL_WMOTOOL = "" Then
' aFileIO = New WMOTOOLLib.WMFileIO
' LOGGER.Info(" ...Direkter Verweis auf New WMOTOOLLib.WMFileIO")
'Else
' aFileIO = CreateObject(My.Settings.DLL_WMOTOOL) 'WMOTool.WMFileIO oder WMOTOOLLib.WMFileIO
' LOGGER.Info(" ...Verwendeter Verweis aus Anwendungsstring: '" & My.Settings.DLL_WMOTOOL & "'")
'End If
wmbrwsr = CreateObject("WMOBrws.ServerBrowser")
'==================================================================
@ -535,7 +513,9 @@ Public Class ClassWindream
' wenn auf die Datei zugeriffen werden konnte ist sie bereits vorhanden -> Datum anhängen
LOGGER.Info(" ...Es konnte zugegriffen werden -> DATEI IST BEREITS VORHANDEN")
Select Case CURRENT_DOKART_DUPLICATE_HANDLING
Case "New version"
LOGGER.Info("Creating new version of file [{0}]", NewFileName)
oWindreamFilename = ClassFilehandle.Versionierung_Datei(NewFileName).ToString.Substring(2)