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

MS1

Browse Source
This commit is contained in:
SchreiberM 2016-05-04 16:08:43 +02:00
parent 2041f952ff
commit 042f24e231
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Global_Indexer/ClassFilehandle.vb
View File

@ -175,4 +175,17 @@ Public Class ClassFilehandle
End Try End Try
End Function End Function
'' <summary>
''' Ersetzt alle nicht zulässigen Zeichen im angegebenen Dateinamen
''' </summary>
''' <param name="sFilename">Dateiname ohne Pfadangabe</param>
''' <param name="sChar">Ersatzzeichen für alle unzulässigen Zeichen
''' im Dateinamen</param>
Public Shared Function CleanFilename(ByVal sFilename As String, _
Optional ByVal REPLACEChar As String = "") As String
' alle nicht zulässigen Zeichen ersetzen
Return System.Text.RegularExpressions.Regex.Replace( _
sFilename, "[?*^""<>|]", REPLACEChar)
End Function
End Class End Class

2
Global_Indexer/frmIndex.vb
View File

@ -1063,7 +1063,9 @@ Public Class frmIndex
MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:") MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:")
End Select End Select
Next Next
CURRENT_NEWFILENAME = ClassFilehandle.CleanFilename(CURRENT_NEWFILENAME, "")
CURRENT_NEWFILENAME = NewFileString & extension CURRENT_NEWFILENAME = NewFileString & extension
Dim path = System.IO.Path.GetDirectoryName(CURRENT_NEWFILENAME) Dim path = System.IO.Path.GetDirectoryName(CURRENT_NEWFILENAME)
If folder_Created = False Then If folder_Created = False Then
' Den Zielordner erstellen ' Den Zielordner erstellen

5
Global_Indexer/frmStart.vb
View File

@ -616,6 +616,7 @@ Public Class frmStart
' Dim fil As String ' Dim fil As String
Me.TimerFolderWatch.Stop() Me.TimerFolderWatch.Stop()
For Each row As DataRow In DTACTUAL_FILES.Rows For Each row As DataRow In DTACTUAL_FILES.Rows
Dim FILEGUID = row.Item("GUID")
If ABORT_INDEXING = True Then If ABORT_INDEXING = True Then
Exit For Exit For
End If End If
@ -630,7 +631,9 @@ Public Class frmStart
CURRENT_WORKFILE_GUID = row.Item("GUID") CURRENT_WORKFILE_GUID = row.Item("GUID")
Open_IndexDialog() Open_IndexDialog()
Else Else
ClassLogger.Add(">> file not existing - filexists!", False) ClassLogger.Add(">> File not existing - Row will be deleted!", False)
Dim del = String.Format("DELETE FROM TBGI_FILES_USER WHERE GUID = {0}", FILEGUID)
ClassDatabase.Execute_non_Query(del)
End If End If
Else Else
ClassLogger.Add(">> file '" & row.Item(1) & "' could not be opened exclusively - fileInUse!", False) ClassLogger.Add(">> file '" & row.Item(1) & "' could not be opened exclusively - fileInUse!", False)