From 156028af4b80cde10ba5ffed8f73e9a0ab834d84 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Wed, 26 Jun 2024 01:53:28 +0200
Subject: [PATCH 1/2] GMP doc: add C_COUNT to AGGREGATE/OVERALL in
 GET_AGGREGATES

---
 src/schema_formats/XML/GMP.xml.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 6d3241b5d..22221b195 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -8107,6 +8107,7 @@ END:VCALENDAR
           <summary>Aggregate data for all resources of the selected type</summary>
           <pattern>
             <e>count</e>
+            <e>c_count</e>
             <e>min</e>
             <e>max</e>
             <e>mean</e>
@@ -8117,6 +8118,12 @@ END:VCALENDAR
             <summary>Overall number of resources</summary>
             <pattern><t>integer</t></pattern>
           </ele>
+          <ele>
+            <name>c_count</name>
+            <summary>Cumulative number of resources</summary>
+            <description>For overall this is always the same as count.</description>
+            <pattern><t>integer</t></pattern>
+          </ele>
           <ele>
             <name>min</name>
             <summary>Overall minimum value of the data column</summary>

From c8c397fc8ca8ee3b4ea4d205d3554947b72502a7 Mon Sep 17 00:00:00 2001
From: Matt Mundell <matt@mundell.me>
Date: Wed, 26 Jun 2024 02:24:57 +0200
Subject: [PATCH 2/2] GMP doc: add STATS to AGGREGATE/OVERALL in GET_AGGREGATES

---
 src/schema_formats/XML/GMP.xml.in | 63 ++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 22221b195..96c32a796 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -8108,10 +8108,7 @@ END:VCALENDAR
           <pattern>
             <e>count</e>
             <e>c_count</e>
-            <e>min</e>
-            <e>max</e>
-            <e>mean</e>
-            <e>sum</e>
+            <any><e>stats</e></any>
           </pattern>
           <ele>
             <name>count</name>
@@ -8125,24 +8122,46 @@ END:VCALENDAR
             <pattern><t>integer</t></pattern>
           </ele>
           <ele>
-            <name>min</name>
-            <summary>Overall minimum value of the data column</summary>
-            <pattern><t>text</t></pattern>
-          </ele>
-          <ele>
-            <name>max</name>
-            <summary>Overall maximum value of the data column</summary>
-            <pattern><t>text</t></pattern>
-          </ele>
-          <ele>
-            <name>mean</name>
-            <summary>Overall arithmetic mean of the numeric values of the data</summary>
-            <pattern><t>text</t></pattern>
-          </ele>
-          <ele>
-            <name>sum</name>
-            <summary>Overall sum of the numeric values of the data column</summary>
-            <pattern><t>text</t></pattern>
+            <name>stats</name>
+            <summary>Statistics of a data column</summary>
+            <pattern>
+              <attrib>
+                <name>column</name>
+                <summary>Name of the column the stats apply to</summary>
+                <type>text</type>
+              </attrib>
+              <e>min</e>
+              <e>max</e>
+              <e>mean</e>
+              <e>sum</e>
+              <e>c_sum</e>
+            </pattern>
+            <ele>
+              <name>min</name>
+              <summary>Overall minimum value of the data column</summary>
+              <pattern><t>text</t></pattern>
+            </ele>
+            <ele>
+              <name>max</name>
+              <summary>Overall maximum value of the data column</summary>
+              <pattern><t>text</t></pattern>
+            </ele>
+            <ele>
+              <name>mean</name>
+              <summary>Overall arithmetic mean of the numeric values of the data</summary>
+              <pattern><t>text</t></pattern>
+            </ele>
+            <ele>
+              <name>sum</name>
+              <summary>Overall sum of the numeric values of the data column</summary>
+              <pattern><t>text</t></pattern>
+            </ele>
+            <ele>
+              <name>c_sum</name>
+              <summary>Cumulative sum of the numeric values of the data column</summary>
+              <description>For overall this is always the same as sum.</description>
+              <pattern><t>text</t></pattern>
+            </ele>
           </ele>
         </ele>
         <ele>