MS

SetupWiX/Product.wxs

@@ -57,14 +57,39 @@
         </File>     
       </Component>
       
+      <Component Id="MainApplicationExeConfig" Guid="e733ac75-e980-405f-869e-8a15301c6e1f" NeverOverwrite="yes" Permanent="yes">
+        <File Id="MainApplicationExeConfig" Name="$(var.ProgramName).exe.config" KeyPath="no" Checksum="yes"></File>
+      </Component>
+        
+      <Component Id="SQLiteDatabase" Guid="f01ed812-dd47-42ce-b174-15ca27b808a0" NeverOverwrite="yes" Permanent="yes">
+         <File Id="ToolCollection_sqlite" Name="ToolCollection.sqlite" Source="ToolCollection.sqlite" />
+      </Component>
+      
+      <Component Id="PreexistingFiles" Guid="40447dec-eb3b-4e2a-8924-ffd657c8617f" Permanent="yes" NeverOverwrite="yes">
+        <File Id="DIConfig" Name="modDateiimportConfig.xml" KeyPath="yes" />
+        <File Id="NIConfig" Name="modNachindexierungConfig.xml" KeyPath="no" />
+      </Component>
+
       <Component Id="WindreamLibs" Guid="3666d0d9-6406-4f95-8610-4ed36403378f">
-        <File Id="WINDREAMLib" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes" />
+        <File Id="WINDREAMLib" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes"  />
         <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
         <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
         <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
         <File Id="Scripting" Name="Interop.Scripting.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.Scripting.dll" KeyPath="no" />
       </Component>
 
+      <Component Id="DigitalDataLibs" Guid="52b36112-c73f-4d70-a89a-a24e078a7d27">
+        <File Id="DigitalData.Modules.Database" Name="DigitalData.Modules.Database.dll" Source="DigitalData.Modules.Database.dll" KeyPath="yes" />
+        <File Id="DigitalData.Modules.Config" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll" KeyPath="no" />
+        <File Id="DigitalData.Modules.Logging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll" KeyPath="no" />
+        <File Id="DigitalData.Modules.Filesystem" Name="DigitalData.Modules.Filesystem.dll" Source="DigitalData.Modules.Filesystem.dll" KeyPath="no" />
+      </Component>
+
+      <Component Id="MiscLibs" Guid="f914875a-2ba2-486d-b3dd-c4d274504c81">
+        <File Id="NLog" Name="NLog.dll" Source="NLog.dll" KeyPath="yes" />
+        <File Id="protobufnet" Name="protobuf-net.dll" Source="protobuf-net.dll" KeyPath="no" />     
+       </Component>
+
       <Component Id="SQLiteLibs" Guid="bcd5db55-0e93-453a-9792-493a624a73b4">
         <File Id="System.Data.SQLite" Name="System.Data.SQLite.dll" Source="System.Data.SQLite.dll" KeyPath="yes" />
         <File Id="System.Data.SQLite.EF6" Name="System.Data.SQLite.EF6.dll" Source="System.Data.SQLite.EF6.dll" KeyPath="no" />
@@ -89,7 +114,9 @@
 
         </RegistryKey>
 
-        <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+      <!--  
+      <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+      -->
       </Component>
 
       <!-- Für weitere Dateien hier Component Elemente anlegen!! -->
@@ -111,13 +138,18 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
     </DirectoryRef>
 
-    <Feature Id="MainApplication" Title="Main Application" Level="1">
+    <Feature Id="MainApplication" Title="Main Application" Level="1" >
       <ComponentRef Id="MainApplicationExe" />
+      <ComponentRef Id="DigitalDataLibs" />
+      <ComponentRef Id="MiscLibs" />
       <ComponentRef Id="WindreamLibs" />
       <ComponentRef Id="SQLiteLibs" />
       <ComponentRef Id="OracleLibs" />
+      <ComponentRef Id="SQLiteDatabase" />
       <ComponentRef Id="ProgramMenuDir" />
       <ComponentRef Id="RegistryKeys" />
+      <ComponentRef Id="MainApplicationExeConfig" />
+      <ComponentRef Id="PreexistingFiles" />
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->

ToolCollection/ClassDIProfile.vb

@@ -5,10 +5,13 @@ Public Class ClassDIProfile
     Public Shared xmlConfigFile As String
     Public Shared aktivesProfil As ClassDIProfil
     Public Shared aktivesProfilAusProfileigenschaften As Boolean = False
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
 
     Public Shared Sub Init()
-        xmlConfigFile = My.Application.Info.DirectoryPath & "\" & My.Settings.vDIConfigDatei
+        Dim oConfigPath As String = My.Application.Info.DirectoryPath & "\" & My.Settings.vDIConfigDatei
+        CURR_Logger.Info("[ClassDIProfile] Loading config for DI from {0}", oConfigPath)
+
+        xmlConfigFile = oConfigPath
         ClassDIProfile.LoadFromXmlFile()
         ' 3b. Windream initialisieren (Connection, Session, ... aufbauen)
         _windream.Init()
@@ -98,7 +101,7 @@ Public Class ClassDIProfile
 
     End Function
 
-    Public Shared Function IsXmlAccessable()
+    Public Shared Function IsXmlAccessable() As Boolean
         Dim xml As New Xml.XmlDocument
 
         Try
@@ -110,6 +113,9 @@ Public Class ClassDIProfile
 
         Catch ex As Exception
             Try
+                CURR_Logger.Warn("[ClassDIProfile] Could not load config file, creating default.")
+                CURR_Logger.Error(ex)
+
                 If My.Settings.vLogErrorsonly = False Then MsgBox("System kann nicht auf Konfig-Datei " & vbNewLine & xmlConfigFile & vbNewLine & " zugreifen! (Nicht vorhanden bzw Syntaxfehler)" & vbNewLine & "Datei wird neu erstellt!", MsgBoxStyle.Exclamation, "Achtung:")
                 Dim fw As System.IO.StreamWriter = New System.IO.StreamWriter(xmlConfigFile)
 

ToolCollection/ClassMI_Profile.vb

@@ -3,7 +3,7 @@
     Public Shared xmlConfigFile As String
     Public Shared aktivesProfil As ClassMI_Profil
     Public Shared aktivesProfilAusProfileigenschaften As Boolean = False
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
     'Public Shared xmlConfigFile As String = My.Settings.vConfigDatei
     'Private Shared config As ClassMerkatorIntegrationKonfiguration = New ClassMerkatorIntegrationKonfiguration()
 

ToolCollection/ClassMoReDokumentart.vb

@@ -18,7 +18,7 @@
     Private _namenskonvention As String
     Private _zielort As String
 
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
 
     Private _saved As Boolean
     'Private _config As ClassNachindexierungKonfiguration = New ClassNachindexierungKonfiguration

ToolCollection/ClassMoReDokumentarten.vb

@@ -1,7 +1,7 @@
 Public Class ClassMoReDokumentarten
 
     Private Shared _profiles() As ClassMoReDokumentart
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
     Public Shared xmlConfigFile As String
 
     Public Shared Sub Init()

ToolCollection/ClassNIProfil.vb

@@ -65,7 +65,7 @@
     Private _CrFolder_Created_Folder As String
     Private _CrFolder_move As Boolean
 
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
 
     Private _saved As Boolean
     'Private _config As ClassNachindexierungKonfiguration = New ClassNachindexierungKonfiguration

ToolCollection/ClassNIProfile.vb

@@ -2,15 +2,19 @@
 Public Class ClassNIProfile
     Private Shared _Logger As DigitalData.Modules.Logging.Logger
     Private Shared _profiles() As ClassNIProfil
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
     Public Shared xmlConfigFile As String
+
     Public Shared Sub Init()
-        xmlConfigFile = My.Application.Info.DirectoryPath & "\" & My.Settings.vNIConfigDatei
+        Dim oConfigPath As String = My.Application.Info.DirectoryPath & "\" & My.Settings.vNIConfigDatei
+        CURR_Logger.Info("[ClassNIProfile] Loading config for NI from {0}", oConfigPath)
+
+        xmlConfigFile = oConfigPath
         ClassNIProfile.LoadFromXmlFile()
         ' 3b. Windream initialisieren (Connection, Session, ... aufbauen)
         _windream.Init()
     End Sub
-    Public Shared Function IsXmlAccessable()
+    Public Shared Function IsXmlAccessable() As Boolean
         Dim xml As New Xml.XmlDocument
         Try
             ' XML-Datei laden und speichern um Zugriff zu testen
@@ -20,7 +24,8 @@ Public Class ClassNIProfile
             Return True
         Catch ex As Exception
             Try
-               _Logger.Error(ex)
+                CURR_Logger.Warn("[ClassNIProfile] Could not load config file, creating default.")
+                CURR_Logger.Error(ex)
 
                 Dim fw As System.IO.StreamWriter = New System.IO.StreamWriter(xmlConfigFile)
                 fw.WriteLine("<?xml version=""1.0"" encoding=""ISO-8859-1"" standalone=""yes""?>")
@@ -34,7 +39,6 @@ Public Class ClassNIProfile
             Catch e2 As Exception
                 Return False
             End Try
-
         End Try
     End Function
     Public Shared Sub LoadFromXmlFile()
@@ -47,7 +51,9 @@ Public Class ClassNIProfile
             If xmlConfigFile Is Nothing Then Exit Sub
 
             If Not xmlConfigFile = "" Then
-                If System.IO.File.Exists(xmlConfigFile) Then
+                'If System.IO.File.Exists(xmlConfigFile) Then
+                If ClassNIProfile.IsXmlAccessable() Then
+
                     xml = New Xml.XmlDocument()
                     xml.Load(xmlConfigFile)
                     'MsgBox(xmlConfigFile)

ToolCollection/ModuleCURRENT.vb

@@ -24,6 +24,6 @@ Module ModuleCURRENT
     Public CURRENT_DYNAMICFOLDER As String
     Public CURRENT_IndexList As List(Of String)
 
-    Public CURR_MyLogger As LogConfig
+    Public Property CURR_LogConfig As LogConfig
-    Public CURR_Logger As DigitalData.Modules.Logging.Logger
+    Public Property CURR_Logger As DigitalData.Modules.Logging.Logger
 End Module

ToolCollection/My Project/AssemblyInfo.vb

@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("Digital Data")> 
 <Assembly: AssemblyProduct("ToolCollection")>
-<Assembly: AssemblyCopyright("Copyright © Digital Data 2017")>
+<Assembly: AssemblyCopyright("Copyright © Digital Data 2019")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>

ToolCollection/ToolCollection.vbproj

@@ -86,9 +86,15 @@
     <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DigitalData.Modules.Config">
+      <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Database">
       <HintPath>..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Filesystem">
+      <HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Logging">
       <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
@@ -550,6 +556,7 @@
   <ItemGroup>
     <None Include="app.config">
       <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="DSNachbearbeitung.xsc">
       <DependentUpon>DSNachbearbeitung.xsd</DependentUpon>
@@ -838,6 +845,8 @@
     <None Include="Resources\folder_Closed_16xMD.png" />
     <None Include="Resources\lines_Text_code_16xLG.png" />
     <None Include="Resources\CheckConstraints_5634.png" />
+    <Content Include="modDateiimportConfig.xml" />
+    <Content Include="modNachindexierungConfig.xml" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

ToolCollection/frmDIProfilEigenschaften.vb

@@ -11,7 +11,7 @@ Public Class frmDIProfilEigenschaften
     Dim arrProfile(1, 1) As Object
     Dim Prof_Anzahl As Integer
 
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
     Private Shared _Instance As frmDIProfilEigenschaften = Nothing
 
     Public Shared Function Instance() As frmDIProfilEigenschaften

ToolCollection/frmDIProfilHinzufuegen.vb

@@ -1,7 +1,7 @@
 Public Class frmDIProfilHinzufuegen
 
     Public oSession
-    Protected _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Protected _windream As New ClassWindream_allgemein(CURR_LogConfig)
     ' Private _parentClass As ClassDateiimport = ClassDateiimport.GetInstance
 
     Private Sub frmProfilHinzufügen_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load

ToolCollection/frmDIRegelAssistent.vb

@@ -28,7 +28,7 @@ Public Class frmDIRegelAssistent
     Private _trennzeichen_temp As String = " "
     Private _value As String = ""
     Private _indexe As String()
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
     Private _datumFormat As String = ""
     Private _removeZeros As Boolean = False
 #End Region

ToolCollection/frmDIRegelverwaltung.vb

@@ -2,7 +2,7 @@
 
     Private profilname As String
     Private selectedProfil As ClassDIProfil
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
 
     Public _regeln As ClassDIRegeln
 

ToolCollection/frmMIParameterHinzufügen.vb

@@ -1,6 +1,6 @@
 Public Class frmMIParameterHinzufügen
     Public selectedProfil As ClassMI_Profil
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
 
     Private Sub frmParameterHinzufügen_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
         If Not Me.selectedProfil.DokumenttypString = "" Then

ToolCollection/frmMIProfileigenschaften.vb

@@ -2,7 +2,7 @@
     ' entspricht dem, über die Toolbar-Combobox ausgewählten, Profil und enthält alle relevanten Informationen darüber
     Private _selectedProfile As ClassMI_Profil
     Dim Formloaded As Boolean = False
-    Public Shared _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Public Shared _windream As New ClassWindream_allgemein(CURR_LogConfig)
     Private Shared _Instance As frmMIProfileigenschaften = Nothing
     Public Shared Function Instance() As frmMIProfileigenschaften
         If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then

ToolCollection/frmMI_Profilhinzufuegen.vb

@@ -2,7 +2,7 @@
 Imports Scripting
 Public Class frmMI_Profilhinzufuegen
     Public oSession
-    Protected _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Protected _windream As New ClassWindream_allgemein(CURR_LogConfig)
     'Public oSession
     'Public oConnect
     'Public oBrowser As New WMOBRWSLib.ServerBrowser

ToolCollection/frmNB_AD_add.vb

@@ -6,7 +6,7 @@ Public Class frmNB_AD_add
     Dim Rechtename As String = ""
     Dim deleteall As Boolean = False
     Dim AccessRight As Integer
-    Private _windream As New ClassWindream_allgemein(CURR_MyLogger)
+    Private _windream As New ClassWindream_allgemein(CURR_LogConfig)
     Dim _windreamRechte As ClassWD_Rechte
     Dim countRegel As Integer
     Dim _deleteRoles As Boolean = False

ToolCollection/frmNIProfilhinzufuegen.vb

@@ -17,7 +17,7 @@ Public Class frmNIProfilhinzufuegen
 
 
     Private Sub frmNIProfilhinzufuegen_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
-        _windream = New ClassWindream_allgemein(CURR_MyLogger)
+        _windream = New ClassWindream_allgemein(CURR_LogConfig)
         ' Verbindung mit windream herstellen
         _windream.Init()
 

ToolCollection/frmNIVerknuepfungen.vb

@@ -52,10 +52,10 @@ Public Class frmNIVerknuepfungen
         ' Dieser Aufruf ist für den Windows Form-Designer erforderlich.
         InitializeComponent()
 
-        _Logger = CURR_MyLogger.GetLogger()
+        _Logger = CURR_LogConfig.GetLogger()
         _flagIgnoreCheckedChanged = False
-        _windream = New ClassWindream_allgemein(CURR_MyLogger)
+        _windream = New ClassWindream_allgemein(CURR_LogConfig)
-        database = New ClassNIDatenbankzugriff(CURR_MyLogger)
+        database = New ClassNIDatenbankzugriff(CURR_LogConfig)
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         Me.LoadProfilesInCombobox()
     End Sub

ToolCollection/frmStart.vb

@@ -47,7 +47,8 @@ Public Class frmStart
     Private Sub FMStart_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
         _MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"))
         _Logger = _MyLogger.GetLogger()
-        CURR_MyLogger = _MyLogger
+        CURR_Logger = _Logger
+        CURR_LogConfig = _MyLogger
         'Aktueller Benutzer
         Me.tslblVersion.Text = Environment.UserName.ToString
         Me.Text = Application.CompanyName & "-" & Application.ProductName

ToolCollection/modDateiimportConfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Dummy></Dummy> 

ToolCollection/modNachindexierungConfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Dummy></Dummy>