Open for default pagesize !=5000. Fixed #1084

rappen · rappen · commit c378508a7fe0 · 2025-02-27T21:48:01.000+01:00
diff --git a/FetchXmlBuilder/AppCode/QueryInfo.cs b/FetchXmlBuilder/AppCode/QueryInfo.cs
@@ -31,7 +31,7 @@ public QueryBase Query
                 {
                     if (fetch.Query.ToXml().SelectSingleNode("fetch") is XmlElement fetchnode)
                     {
-                        PageSize = Math.Min(fetchnode.AttributeInt("count") ?? 5000, 5000);
+                        PageSize = Math.Min(fetchnode.AttributeInt("count") ?? 0, 5000);
                         PageNo = fetchnode.AttributeInt("page") ?? 1;
                     }
                 }
@@ -52,6 +52,17 @@ public EntityCollection Results
                         PageNo = page;
                     }
                 }
+                if (PageSize == 0)
+                {
+                    if (result.MoreRecords)
+                    {
+                        PageSize = result.Entities.Count;
+                    }
+                    else
+                    {
+                        PageSize = 5000;
+                    }
+                }
                 if (result.TotalRecordCount > -1 && result.TotalRecordCount < 5000 && PageSize > 0 && result.TotalRecordCount > PageSize)
                 {
                     Pages = (int)Math.Ceiling((decimal)result.TotalRecordCount / PageSize);
diff --git a/Rappen.XTB.Helper b/Rappen.XTB.Helper
@@ -1 +1 @@
-Subproject commit 8818ab525312a2192254ee2035f644f6bd9abb50
+Subproject commit c018054b98f5de774f7e318179bdcd7021b80fa1

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public QueryBase Query`
`31`	`31`	`{`
`32`	`32`	`if (fetch.Query.ToXml().SelectSingleNode("fetch") is XmlElement fetchnode)`
`33`	`33`	`{`
`34`		`- PageSize = Math.Min(fetchnode.AttributeInt("count") ?? 5000, 5000);`
	`34`	`+ PageSize = Math.Min(fetchnode.AttributeInt("count") ?? 0, 5000);`
`35`	`35`	`PageNo = fetchnode.AttributeInt("page") ?? 1;`
`36`	`36`	`}`
`37`	`37`	`}`
`@@ -52,6 +52,17 @@ public EntityCollection Results`
`52`	`52`	`PageNo = page;`
`53`	`53`	`}`
`54`	`54`	`}`
	`55`	`+ if (PageSize == 0)`
	`56`	`+ {`
	`57`	`+ if (result.MoreRecords)`
	`58`	`+ {`
	`59`	`+ PageSize = result.Entities.Count;`
	`60`	`+ }`
	`61`	`+ else`
	`62`	`+ {`
	`63`	`+ PageSize = 5000;`
	`64`	`+ }`
	`65`	`+ }`
`55`	`66`	`if (result.TotalRecordCount > -1 && result.TotalRecordCount < 5000 && PageSize > 0 && result.TotalRecordCount > PageSize)`
`56`	`67`	`{`
`57`	`68`	`Pages = (int)Math.Ceiling((decimal)result.TotalRecordCount / PageSize);`