Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/FileFlow

Global_Indexer/frmIndex.vb

@@ -875,9 +875,9 @@ Public Class frmIndex
                             Count += 1
 
                             ' den Typ des Zielindexes auslesen
-                            Dim indexType As Integer = WINDREAM.GetIndexType(oIndexName)
-                            _Logger.Debug("WMIndexType: " & indexType.ToString)
-                            If indexType > 4095 Then
+                            Dim oIndexType As Integer = WINDREAM.GetIndexType(oIndexName)
+                            _Logger.Debug("WMIndexType: " & oIndexType.ToString)
+                            If oIndexType > 4095 Then
                                 _Logger.Debug("Es Handelt sich um einen VektorIndex...")
                                 Dim oExistingItems = WINDREAM.GetIndexValue(CURRENT_NEWFILENAME, oIndexName)
 
@@ -897,7 +897,7 @@ Public Class frmIndex
                                 'If oSplitArray.Length <= 1 Then
                                 '    indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, oIndexName, oIndexValue, CURR_DOKART_OBJECTTYPE)
                                 'Else
-                                If oOverwrite = False And oExistingItems.Count > 0 Then
+                                If oOverwrite = False And oExistingItems.Count > 0 And oIndexType <> 4100 Then
                                     _Logger.Debug("oOverwrite = False and WMObject already contains [{0}] values in attribute,Values will be concatted", oExistingItems.Count)
                                     oListofString = oExistingItems.Concat(oListofString).ToList()
                                 End If
@@ -2438,7 +2438,7 @@ Public Class frmIndex
                         'Den Zielnamen zusammenbauen
                         If Name_Generieren() = True Then
                             'Die Datei verschieben
-                            If Move_File2_Target() = True Then
+                            If Move_File_and_Index() = True Then
                                 _Logger.Debug(" ...Move_File2_Target durchlaufen")
 
                                 _Logger.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.")
@@ -2479,7 +2479,6 @@ Public Class frmIndex
                         End If
                         Return False
                     End If
-                    '#### Automatische Werte indexieren ####
                 End If
             Else
                 If USER_LANGUAGE = LANG_DE Then
@@ -2556,7 +2555,7 @@ Public Class frmIndex
     '    End If
     '    Me.Cursor = Cursors.Default
     'End Sub
-    Private Function Move_File2_Target()
+    Private Function Move_File_and_Index()
         Dim oError As Boolean
         Try
             CURRENT_DOC_ID = 0
@@ -2590,8 +2589,8 @@ Public Class frmIndex
                         End If
                     End If
 
-                        'Kein Fehler in Export2windream
-                        oError = False
+                    'Kein Fehler in Export2windream
+                    oError = False
                     If Write_Indizes() = True Then
                         'Kein Fehler in Setzen der windream-Indizes
                         Dim Insert_String As String