-add: search by parsed fields

ZeromusXYZ · May 12, 2019 · fdbb55b · fdbb55b
1 parent b5f4e7d
commit fdbb55b
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 92 deletions.
diff --git a/MainForm.cs b/MainForm.cs
@@ -750,6 +750,11 @@ private void MmSearchSearch_Click(object sender, EventArgs e)
                 return;
             using (SearchForm SearchDlg = new SearchForm())
             {
+                if (tp.PL.IsPreParsed == false)
+                {
+                    searchParameters.SearchByParsedData = false;
+                    SearchDlg.gbSearchByField.Enabled = false;
+                }
                 SearchDlg.searchParameters.CopyFrom(this.searchParameters);
                 var res = SearchDlg.ShowDialog();
                 if ((res == DialogResult.OK) || (res == DialogResult.Retry))
@@ -1191,7 +1196,7 @@ private void TcPackets_ControlRemoved(object sender, ControlEventArgs e)
             {
                 PacketTabPage tp = (e.Control as PacketTabPage);
                 tp.SaveProjectFile();
-                if ((CurrentPP != null) && (tp.GetSelectedPacket().PP == CurrentPP))
+                if ((CurrentPP != null) && (tp.GetSelectedPacket().PP != null) && (tp.GetSelectedPacket().PP == CurrentPP))
                 {
                     CurrentPP = null;
                     dGV.Rows.Clear();

diff --git a/PacketDefs.cs b/PacketDefs.cs
@@ -703,6 +703,26 @@ public bool MatchesSearch(SearchParameters p)
                 }
             }
 
+            if ((res) && (PP != null) && (p.SearchByParsedData) && (p.SearchParsedFieldValue != string.Empty))
+            {
+                res = false;
+                foreach(var f in PP.ParsedView)
+                {
+                    if (p.SearchParsedFieldName != string.Empty)
+                    {
+                        // Field Name Specified
+                        res = ((f.Var.ToLower().IndexOf(p.SearchParsedFieldName) >= 0) && (f.Data.ToLower().IndexOf(p.SearchParsedFieldValue) >= 0));
+                    }
+                    else
+                    {
+                        // No field name defined
+                        res = (f.Data.ToLower().IndexOf(p.SearchParsedFieldValue) >= 0);
+                    }
+                    if (res)
+                        break;
+                }
+            }
+
             return res;
         }
 

diff --git a/PacketParsers.cs b/PacketParsers.cs
@@ -43,6 +43,8 @@ public class PacketParser
 
         static protected void AddFieldNameToList(string fieldName)
         {
+            if (fieldName.StartsWith("??"))
+                return;
             if (AllFieldNames.IndexOf(fieldName) < 0)
                 AllFieldNames.Add(fieldName);
         }

diff --git a/SearchForm.Designer.cs b/SearchForm.Designer.cs
diff --git a/SearchForm.cs b/SearchForm.cs
@@ -191,7 +191,7 @@ private void ValidateFields()
                 eValue.ForeColor = Color.DarkGray;
             }
 
-            if ((cbFieldNames.Text != string.Empty) && (eFieldValue.Text != string.Empty))
+            if (eFieldValue.Text != string.Empty)
             {
                 hasData = true;
                 searchParameters.SearchByParsedData = true;