Improving record counts #153

rappen · Aug 13, 2023 · 05ac6af · 05ac6af
1 parent 16fbcc4
commit 05ac6af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/FetchXmlBuilder/AppCode/QueryInfo.cs b/FetchXmlBuilder/AppCode/QueryInfo.cs
@@ -31,14 +31,8 @@ public QueryBase Query
                     fetchdoc.LoadXml(fetch.Query);
                     if (fetchdoc.SelectSingleNode("fetch") is XmlElement fetchnode)
                     {
-                        if (fetchnode.AttributeInt("count") is int count)
-                        {
-                            PageSize = count;
-                        }
-                        if (fetchnode.AttributeInt("page") is int page)
-                        {
-                            PageNo = page;
-                        }
+                        PageSize = Math.Min(fetchnode.AttributeInt("count") ?? 5000, 5000);
+                        PageNo = fetchnode.AttributeInt("page") ?? 1;
                     }
                 }
             }
@@ -60,7 +54,7 @@ public EntityCollection Results
                         PageNo = page;
                     }
                 }
-                if (result.TotalRecordCount > -1 && PageSize > 0)
+                if (result.TotalRecordCount > -1 && result.TotalRecordCount < 5000 && PageSize > 0 && result.TotalRecordCount > PageSize)
                 {
                     Pages = (int)Math.Ceiling((decimal)result.TotalRecordCount / PageSize);
                 }

diff --git a/FetchXmlBuilder/DockControls/ResultGrid.cs b/FetchXmlBuilder/DockControls/ResultGrid.cs
@@ -59,7 +59,7 @@ internal void SetData(QueryInfo queryinfo)
                 if (queryinfo.RecordFrom > 1 || queryinfo.Results.MoreRecords)
                 {
                     mnuRecordsNumbers.Text = $"Records: {queryinfo.RecordFrom}-{queryinfo.RecordTo}";
-                    if (queryinfo.Results.TotalRecordCount > 0)
+                    if (queryinfo.Results.TotalRecordCount > 0 && queryinfo.Results.TotalRecordCount < 5000)
                     {
                         mnuRecordsNumbers.Text += $" ({queryinfo.Results.TotalRecordCount})";
                     }