improve man index settings

cancel indexing when directory cannot be created
2020-05-11 11:38:35 +02:00 · 2020-05-11 11:31:03 +02:00
3 changed files with 60 additions and 36 deletions
--- a/Global_Indexer/frmAdministration.resx
+++ b/Global_Indexer/frmAdministration.resx
@@ -1726,7 +1726,7 @@
    <value>NoControl</value>
  </data>
  <data name="VKT_PREVENT_MULTIPLE_VALUESCheckbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>595, 133</value>
+    <value>527, 150</value>
  </data>
  <data name="VKT_PREVENT_MULTIPLE_VALUESCheckbox.Size" type="System.Drawing.Size, System.Drawing">
    <value>167, 24</value>
@@ -1783,7 +1783,7 @@
    <value>3</value>
  </data>
  <data name="VKT_ADD_ITEMCheckbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>317, 133</value>
+    <value>527, 120</value>
  </data>
  <data name="VKT_ADD_ITEMCheckbox.Size" type="System.Drawing.Size, System.Drawing">
    <value>128, 24</value>
@@ -1813,7 +1813,7 @@
    <value>Tahoma, 8.25pt</value>
  </data>
  <data name="NAMETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>65, 47</value>
+    <value>141, 47</value>
  </data>
  <data name="NAMETextBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>272, 21</value>
@@ -1834,7 +1834,7 @@
    <value>5</value>
  </data>
  <data name="MULTISELECTCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>471, 133</value>
+    <value>527, 90</value>
  </data>
  <data name="MULTISELECTCheckBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>115, 24</value>
@@ -1864,7 +1864,7 @@
    <value>True</value>
  </data>
  <data name="NAMELabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>62, 31</value>
+    <value>138, 31</value>
  </data>
  <data name="NAMELabel.Size" type="System.Drawing.Size, System.Drawing">
    <value>71, 13</value>
@@ -1915,7 +1915,7 @@
    <value>False</value>
  </data>
  <data name="WD_INDEXComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>343, 47</value>
+    <value>419, 47</value>
  </data>
  <data name="WD_INDEXComboBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>231, 21</value>
@@ -1939,7 +1939,7 @@
    <value>True</value>
  </data>
  <data name="lblWDINDEX.Location" type="System.Drawing.Point, System.Drawing">
-    <value>340, 31</value>
+    <value>416, 31</value>
  </data>
  <data name="lblWDINDEX.Size" type="System.Drawing.Size, System.Drawing">
    <value>89, 13</value>
@@ -2051,23 +2051,20 @@ der Datei</value>
    <value>MiddleLeft</value>
  </data>
  <data name="btnSQLView.Location" type="System.Drawing.Point, System.Drawing">
-    <value>595, 162</value>
+    <value>317, 133</value>
  </data>
  <data name="btnSQLView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>136, 23</value>
+    <value>167, 23</value>
  </data>
  <data name="btnSQLView.TabIndex" type="System.Int32, mscorlib">
    <value>80</value>
  </data>
  <data name="btnSQLView.Text" xml:space="preserve">
-    <value>Show SQL Config</value>
+    <value>SQL Abfrage bearbeiten</value>
  </data>
  <data name="btnSQLView.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleRight</value>
  </data>
-  <data name="btnSQLView.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
  <data name="&gt;&gt;btnSQLView.Name" xml:space="preserve">
    <value>btnSQLView</value>
  </data>
@@ -2378,7 +2375,7 @@ der Datei</value>
    <value>False</value>
  </data>
  <data name="SEQUENCETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>580, 47</value>
+    <value>65, 47</value>
  </data>
  <data name="SEQUENCETextBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>70, 21</value>
@@ -2429,7 +2426,7 @@ der Datei</value>
    <value>True</value>
  </data>
  <data name="SEQUENCELabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>577, 31</value>
+    <value>62, 31</value>
  </data>
  <data name="SEQUENCELabel.Size" type="System.Drawing.Size, System.Drawing">
    <value>68, 13</value>
--- a/Global_Indexer/frmAdministration.vb
+++ b/Global_Indexer/frmAdministration.vb
@@ -340,9 +340,9 @@ Public Class frmAdministration
            'Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text)
            Load_ZuordnungDokart_Module(DOKART_GUIDTextBox.Text)
            If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then
-                btnSQLView.Visible = True
+                btnSQLView.Enabled = True
            Else
-                btnSQLView.Visible = False
+                btnSQLView.Enabled = False
            End If
            Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text)
        End If
@@ -454,15 +454,9 @@ Public Class frmAdministration
    Private Sub SUGGESTIONCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles SUGGESTIONCheckBox.CheckedChanged
        If frmloaded = True Then
            If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then
-                btnSQLView.Visible = True
-                'MULTISELECTCheckBox.Visible = True
-                VKT_ADD_ITEMCheckbox.Visible = True
-                VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = True
+                btnSQLView.Enabled = True
            Else
-                btnSQLView.Visible = False
-                'MULTISELECTCheckBox.Visible = False
-                VKT_ADD_ITEMCheckbox.Visible = False
-                VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = False
+                btnSQLView.Enabled = False
            End If
        End If
    End Sub
@@ -991,13 +985,21 @@ Public Class frmAdministration

    Private Sub WD_INDEXComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WD_INDEXComboBox.SelectedIndexChanged
        _indexIsVectorField = indexIsVectorField()
-        MULTISELECTCheckBox.Visible = _indexIsVectorField
-        'VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = _indexIsVectorField
+        MULTISELECTCheckBox.Enabled = _indexIsVectorField
+

        If Not _indexIsVectorField Then
            MULTISELECTCheckBox.Checked = False
            'VKT_PREVENT_MULTIPLE_VALUESCheckbox.Checked = False
        End If
+
+        If MULTISELECTCheckBox.Checked Then
+            VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = True
+            VKT_ADD_ITEMCheckbox.Enabled = True
+        Else
+            VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = False
+            VKT_ADD_ITEMCheckbox.Enabled = False
+        End If
    End Sub

    Private Function indexIsVectorField() As Boolean
@@ -1412,14 +1414,6 @@ Public Class frmAdministration
        EnableControls(XtraTabPageProfileRegex)
    End Sub

-    Private Sub ListBoxControl3_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxControl3.SelectedIndexChanged
-        If ListBoxControl3.SelectedIndex = -1 Then
-            EnableControls(Panel1, False)
-        Else
-            EnableControls(Panel1)
-        End If
-    End Sub
-
    Private Sub GridView1_ValidateRow(sender As Object, e As ValidateRowEventArgs) Handles GridView1.ValidateRow
        e.Valid = True
    End Sub
@@ -1427,4 +1421,36 @@ Public Class frmAdministration
    Private Sub GridView1_InvalidRowException(sender As Object, e As InvalidRowExceptionEventArgs) Handles GridView1.InvalidRowException
        e.ExceptionMode = DevExpress.XtraEditors.Controls.ExceptionMode.NoAction
    End Sub
+
+    Private Sub MULTISELECTCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles MULTISELECTCheckBox.CheckedChanged
+        If MULTISELECTCheckBox.Checked Then
+            VKT_ADD_ITEMCheckbox.Enabled = True
+            VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = True
+        Else
+            VKT_ADD_ITEMCheckbox.Enabled = False
+            VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = False
+        End If
+    End Sub
+
+    Private Sub TBDD_INDEX_MANBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBDD_INDEX_MANBindingSource.CurrentChanged
+        If ListBoxControl3.SelectedIndex = -1 Then
+            EnableControls(Panel1, False)
+        Else
+            EnableControls(Panel1)
+        End If
+
+        If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then
+            btnSQLView.Enabled = True
+        Else
+            btnSQLView.Enabled = False
+        End If
+
+        If MULTISELECTCheckBox.Checked Then
+            VKT_ADD_ITEMCheckbox.Enabled = True
+            VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = True
+        Else
+            VKT_ADD_ITEMCheckbox.Enabled = False
+            VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = False
+        End If
+    End Sub
 End Class
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -476,7 +476,7 @@ Public Class frmIndex
                    Case "M"
                        LOGGER.Debug("NameGenerieren: Manueller Index wird geprüft...")
                        Dim Indexname = oElement.Value.Substring(3, oElement.Value.Length - 4)
-                        Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & Indexname & "')", MyConnectionString, True)
+                        Dim optional_index As Boolean = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{Indexname}')", MyConnectionString, True)
                        Dim oManValue As String = GetManIndex_Value(Indexname, "FILE", optional_index)
                        If oManValue <> String.Empty Then
                            Dim firstVectorValue = oManValue.Split(ClassConstants.VECTORSEPARATOR).First()
@@ -637,6 +637,7 @@ Public Class frmIndex
                    Catch ex As Exception
                        LOGGER.Info("Unexpected Error in 'Name_Generieren' - Error: " & vbNewLine & ex.Message & vbNewLine & "Directory.CreateDirectory(" & path & ")")
                        LOGGER.Error(ex.Message)
+                        err = True
                        MsgBox("Unexpected Error in 'Name_Generieren' - Error: " & vbNewLine & ex.Message & vbNewLine & "Directory.CreateDirectory(" & path & ")", MsgBoxStyle.Critical)
                    End Try
Author	SHA1	Message	Date
Jonathan Jenne	7f329d9f0d	improve man index settings	2020-05-11 11:38:35 +02:00
Jonathan Jenne	349671c2d3	cancel indexing when directory cannot be created	2020-05-11 11:31:03 +02:00