remove debug files

SetupWIXVS19/Product.wxs

@@ -24,6 +24,11 @@
       DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
     />
 
+    <!-- Liest den Installationsort über die Registry aus -->
+    <Property Id="INSTALLDIR">
+      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKLM" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
+    </Property>
+
     <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
     <Upgrade Id="$(var.UpgradeCode)">
       <UpgradeVersion

SetupWIXVS19/obj/Debug/SetupWIXVS19.wixproj.BindBuiltOutputsFileListde-DE.txt

@@ -1,2 +0,0 @@
-E:\JenneJ\Visual Studio\WIDIG\SetupWIXVS19\bin\Debug\WIDigConsoleApp-x86-1.3.1.0.msi
-E:\JenneJ\Visual Studio\WIDIG\SetupWIXVS19\bin\Debug\WIDigConsoleApp-x86-1.3.1.0.wixpdb

SetupWIXVS19/obj/Debug/SetupWIXVS19.wixproj.BindContentsFileListde-DE.txt

@@ -1,20 +0,0 @@
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\WIDigConsoleApp.exe
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\WIDigConsoleApp.exe.config
-E:\JenneJ\Visual Studio\WIDIG\WIDigForm\bin\Debug\DevExpress.Data.v19.2.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigForm\bin\Debug\DevExpress.Pdf.v19.2.Core.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigForm\bin\Debug\DevExpress.Printing.v19.2.Core.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigForm\bin\Debug\DevExpress.Sparkline.v19.2.Core.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigForm\bin\Debug\DevExpress.Utils.v19.2.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigForm\bin\Debug\DevExpress.XtraBars.v19.2.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigForm\bin\Debug\DevExpress.XtraEditors.v19.2.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\DigitalData.Modules.Config.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\DigitalData.Modules.Database.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\DigitalData.Modules.Filesystem.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\DigitalData.Modules.Language.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\DigitalData.Modules.Logging.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\DigitalData.Modules.Windream.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\Interop.WINDREAMLib.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigForm\bin\Debug\WIDIG.exe
-E:\JenneJ\Visual Studio\WIDIG\WIDigForm\bin\Debug\WIDIG.exe.config
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\NLog.dll
-E:\JenneJ\Visual Studio\WIDIG\WIDigConsoleApp\bin\Debug\protobuf-net.dll

SetupWIXVS19/obj/Debug/SetupWIXVS19.wixproj.BindOutputsFileListde-DE.txt

@@ -1,2 +0,0 @@
-E:\JenneJ\Visual Studio\WIDIG\SetupWIXVS19\bin\Debug\WIDigConsoleApp-x86-1.3.1.0.msi
-E:\JenneJ\Visual Studio\WIDIG\SetupWIXVS19\bin\Debug\WIDigConsoleApp-x86-1.3.1.0.wixpdb

SetupWIXVS19/obj/Debug/SetupWIXVS19.wixproj.FileList.txt

@@ -1,6 +0,0 @@
-E:\JenneJ\Visual Studio\WIDIG\SetupWIXVS19\bin\Debug\WIDigConsoleApp-x86-1.3.1.0.msi
-E:\JenneJ\Visual Studio\WIDIG\SetupWIXVS19\bin\Debug\WIDigConsoleApp-x86-1.3.1.0.wixpdb
-obj\Debug\Product.wixobj
-obj\Debug\SetupWIXVS19.wixproj.BindContentsFileListde-DE.txt
-obj\Debug\SetupWIXVS19.wixproj.BindOutputsFileListde-DE.txt
-obj\Debug\SetupWIXVS19.wixproj.BindBuiltOutputsFileListde-DE.txt

WIDigConsoleApp/Module1.vb

@@ -10,16 +10,20 @@ Module Module1
     Private _ArgumentLength As Integer
     Public _database As MSSQLServer
     Public oRegExArg As String
-    Public Function Main(args As String()) As Integer
+
+    Public Const CODE_SUCCESS = 0
+    Public Const CODE_ERROR = 1
+
+    Public Function Main(CommandLineArguments As String()) As Integer
         Dim oReturnResult As Integer
         Try
 
-            oReturnResult = 0
+            oReturnResult = CODE_SUCCESS
             ' Console.WriteLine("Starting up WIDig...")
             Dim opath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
             Dim oLogConfig As New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
                                           "Digital Data",
-                                          "WIDigCons")
+                                          "WIDig")
 
             LOGCONFIG = oLogConfig
             LOGGER = LOGCONFIG.GetLogger
@@ -27,67 +31,67 @@ Module Module1
             LOGCONFIG.Debug = CONFIG.Config.LOG_DEBUG
             LOGGER = LOGCONFIG.GetLogger
             Dim oUserPW = GetUserPWPlain()
-            LOGGER.Debug("Initializing MainForm....")
 
             System.Console.WriteLine($"Starting up WIDig...")
+
             If Connect2Windream(oUserPW) = True Then
-                System.Console.WriteLine($"Windream initialized!")
+                Throw New ApplicationException("Could not initialize windream")
-                If InitDatabase() = True Then
-                    Load_DB_DAta()
-                    'Dim oArguments As String() = Environment.GetCommandLineArgs()
-                    If ParseArgs(args) = True Then
-                        System.Console.WriteLine($"Parsed all arguments!")
-                        If StreamORIndexFile() = True Then
-                            oErrorImport = False
-                            oReturnResult = 1
-                        Else
-                            System.Console.WriteLine($"###Error in StreamIndexFile!####")
-                            oErrorImport = True
-                        End If
-                    Else
-                        System.Console.WriteLine($"###Error in ParseArgs!####")
-                        System.Console.WriteLine($"### Error in ParseArgs ####")
-                        System.Console.WriteLine(oErrorMessage)
-                        System.Console.WriteLine("### For more information check the log! Press any key to exit! ####")
-                        System.Console.WriteLine($"####################")
-                        Console.ReadKey()
-                    End If
-
-
-                Else
-                    oErrorMessage = "Could not initialize DB"
-                End If
-
-            Else
-                oErrorMessage = "Could not initialize windream"
-
             End If
 
+            System.Console.WriteLine($"Windream initialized!")
 
+            If InitDatabase() = False Then
+                Throw New ApplicationException("Could not initialize DB")
+            End If
+
+            System.Console.WriteLine($"Database initialized!")
+
+            If Load_DB_DAta() = False Then
+                Throw New ApplicationException("Could not load Regex from Database")
+            End If
+
+            System.Console.WriteLine($"Regex loaded from Database!")
+
+            If ParseArgs(CommandLineArguments) = False Then
+                Throw New ApplicationException("Could not parse command line arguments")
+            End If
+
+            System.Console.WriteLine($"Command line arguments parsed!")
+
+            If StreamORIndexFile() = False Then
+                Throw New ApplicationException("Could not stream or index file")
+            End If
+
+            System.Console.WriteLine($"File indexed or streamed!")
+
+            ' Brauchen Sie das überhaupt?
             If oErrorParse = True Or oErrorImport = True Then
-                System.Console.WriteLine(oErrorMessage)
+                Throw New ApplicationException(oErrorMessage)
-                System.Console.WriteLine("### For more information check the log! Press any key to exit! ####")
-                System.Console.WriteLine($"####################")
-                Console.ReadKey()
-                oReturnResult = 0
 
-            Else
-                oReturnResult = 1
             End If
-            Return oReturnResult
+
+            Return CODE_SUCCESS
         Catch ex As Exception
+            LOGGER.Warn("Could not process file because of an error: {0}", oErrorMessage)
+            LOGGER.Warn("Error at Parse Stage: [{0}]", oErrorParse)
+            LOGGER.Warn("Error at Import Stage: [{0}]", oErrorImport)
             LOGGER.Error(ex)
-            Return oReturnResult
+
+            Return CODE_ERROR
         End Try
 
     End Function
     Public Sub InitUserConfig()
-        Dim oUserAppDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)
+
-        oUserAppDataPath = oUserAppDataPath & "\Digital Data\WIDigDat"
+        Dim oProgramDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Digital Data", "WIDig")
-        Dim oCommonAppDataPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)
+        Dim oUserAppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Digital Data", "WIDig")
-        CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, System.AppDomain.CurrentDomain.BaseDirectory, oCommonAppDataPath)
+        CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, oProgramDataPath)
-        System.Console.WriteLine($"Config loaded!")
+
-        LOGGER.Info("Config loaded")
+        'oUserAppDataPath = oUserAppDataPath & "\Digital Data\WIDigDat"
+        'Dim oCommonAppDataPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)
+        'CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, System.AppDomain.CurrentDomain.BaseDirectory, oCommonAppDataPath)
+        'System.Console.WriteLine($"Config loaded!")
+        'LOGGER.Info("Config loaded")
         'Settings_Load()
     End Sub
     Public Function InitDatabase() As Boolean
@@ -116,6 +120,7 @@ Module Module1
             If oRegExArg.Length = 0 Then
                 oRegExArg = 0
             End If
+            Return True
         Catch ex As Exception
             LOGGER.Error(ex)
             Return False
@@ -130,6 +135,7 @@ Module Module1
                     Return True
                 End If
             End If
+            Return False
         Catch ex As Exception
             LOGGER.Warn("CHECKING WMConnectivity: " & ex.Message)
             Return False
@@ -326,8 +332,8 @@ Module Module1
         Catch ex As Exception
             LOGGER.Warn($"Unexpected Error in StreamORIndexFile: {ex.Message}")
             LOGGER.Error(ex)
+            Return False
         End Try
-
     End Function
     Private Function WMIndex_exists(pIndex As String)
         Dim oexist As Boolean = False

WIDigConsoleApp/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.3.1.0")>
+<Assembly: AssemblyVersion("1.3.3.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>