MergeCommit

Global_Indexer/frmStart.vb

@@ -1,12 +1,9 @@
 Imports System.IO
-Imports Microsoft.Office.Interop
-Imports System.Text
 Imports System.Globalization
 Imports System.Threading
-Imports System.Runtime.InteropServices
-Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.Windows
 Imports DigitalData.Modules.License
+Imports DigitalData.Modules.Base
 Imports DigitalData.GUIs.Common
 Imports DevExpress.LookAndFeel
 
@@ -46,6 +43,7 @@ Public Class frmStart
 #Region "=== FORM EVENTS ==="
 
     Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles Me.Load
+
         Cursor = Cursors.WaitCursor
         Try
             IndexForm = New frmIndex()
@@ -255,10 +253,10 @@ Public Class frmStart
                 End If
             End If
 
-            For Each Filerow As DataRow In DTACTUAL_FILES.Rows
-                Dim oFileString As String = Filerow.Item("FILENAME2WORK")
-                Dim oFileGuid = Filerow.Item("GUID")
-                Dim oFileHash = Utils.NotNull(Filerow.Item("FILE_HASH"), "")
+            For Each oRow As DataRow In DTACTUAL_FILES.Rows
+                Dim oFileString As String = oRow.Item("FILENAME2WORK")
+                Dim oFileGuid = oRow.Item("GUID")
+                Dim oFileHash = oRow.ItemEx("FILE_HASH", "")
                 LOGGER.Info("Processing user file {0}", oFileString)
 
                 CURRENT_FILENAME = oFileString