Commit 73fba987 authored by Martin Bauer's avatar Martin Bauer
Browse files

Merge branch 'bauermar-master-patch-97220' into 'fix/pagination_on_temporal_instances' 

Added firstN and offsetN for temporal queries

See merge request !19
parents 0adecf8c 373a2d48

md/clause-5.md

+11 −3
Original line number Diff line number Diff line
@@ -409,6 +409,8 @@ Table: Matrix of all Attributes 
+--------------------------------+-----------------------------------------------------------------------+

| features                       | FeatureCollection                                                     |

+--------------------------------+-----------------------------------------------------------------------+

| firstN                         | TemporalParams                                                        |

+--------------------------------+-----------------------------------------------------------------------+

| format                         | NotificationParams                                                    |

+--------------------------------+-----------------------------------------------------------------------+

| geoQ                           | Feature, Query, Subscription                                          |
@@ -507,6 +509,8 @@ Table: Matrix of all Attributes 
|                                | LanguageProperty, JsonProperty, VocabProperty                         |

|                                |                                                                       |

+--------------------------------+-----------------------------------------------------------------------+

| offsetN                        | TemporalParams                                                        |

+--------------------------------+-----------------------------------------------------------------------+

| omit                           | Query, NotificationParams                                             |

+--------------------------------+-----------------------------------------------------------------------+

| operations                     | CSourceRegistration                                                   |
@@ -2070,7 +2074,7 @@ Table: Query data type definition 
+---------------------+--------------------+----------------------------------------------------------------------------------------------------------------------------+--------------+------------------------------------------------------------------------------------------------+

| scopeQ              | String             | See Clause+++clause-7+++7.2.5                                                                                              | 0..1         | Scope query.                                                                                   |

+---------------------+--------------------+----------------------------------------------------------------------------------------------------------------------------+--------------+------------------------------------------------------------------------------------------------+

| temporalQ           | TemporalQuery      | See data type definition in Clause+++root.2.6.7.4                                                                          | 0..1         | Temporal Query to be present only for "Query                                                   |

| temporalQ           | TemporalParams     | See data type definition in Clause+++root.2.6.7.4                                                                          | 0..1         | Temporal Query to be present only for "Query                                                   |

|                     |                    |                                                                                                                            |              | [Temporal Evolution of Entities]{.HTML-Keyboard}" operation (Clause+++clause-11+++11.3.3).     |

+---------------------+--------------------+----------------------------------------------------------------------------------------------------------------------------+--------------+------------------------------------------------------------------------------------------------+

| attrs               | String[]           | Attribute name as short hand strings or URIs.                                                                              | 0..1         | A synonym for a combination of the *pick* and*q* members. **Deprecated**                       |
@@ -2197,7 +2201,7 @@ Table: Subscription data type definition 
+---------------------+--------------------+----------------------------------------------------------------------------------------------------------------------------+--------------+------------------------------------------------------------------------------------------------+

| scopeQ              | String             | See Clause+++clause-7+++7.2.5                                                                                              | 0..1         | Scope query.                                                                                   |

+---------------------+--------------------+----------------------------------------------------------------------------------------------------------------------------+--------------+------------------------------------------------------------------------------------------------+

| temporalQ           | TemporalQuery      | See data type definition in Clause+++root.2.6.7.4                                                                          | 0..1         | Temporal Query to be used **only** in *Context Registration Subscriptions*                     |

| temporalQ           | TemporalParams     | See data type definition in Clause+++root.2.6.7.4                                                                          | 0..1         | Temporal Query to be used **only** in *Context Registration Subscriptions*                     |

|                     |                    |                                                                                                                            |              | for matching [Context Source Registrations]{.HTML-Keyboard} of                                 |

|                     |                    |                                                                                                                            |              | [Context Sources]{.HTML-Keyboard} providing temporal information.                              |

+---------------------+--------------------+----------------------------------------------------------------------------------------------------------------------------+--------------+------------------------------------------------------------------------------------------------+
@@ -3026,7 +3030,11 @@ Table: TemporalParams data type definition 
| endTimeAt          | String representing the _`endTimeAt`_ parameter as defined by           | It shall be a _DateTime_. Cardinality shall be 1 if _`timerel`_ is equal to ["between"]{.HTML-Code}                                                                                                                      | 0..1        |                                                                                                                                                                                                                                                          |

|                    | Clause+++clause-7+++7.2.6                                               |                                                                                                                                                                                                                          |             |                                                                                                                                                                                                                                                          |

+--------------------+-------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

| lastN              | Positive integer                                                        |                                                                                                                                                                                                                          | 0..1        | Only the last n instances, per Attribute, per Entity (under the specified time interval) shall be retrieved.                                                                                                                                             |

| firstN             | Positive integer                                                        | Cannot be used in combination with _`lastN`_.                                                                                                                                                                            | 0..1        | Only the first n instances, per Attribute, per Entity (under the specified time interval) shall be retrieved. This is relative to _`offsetN`_ parameter if specified.                                                                                    |

+--------------------+-------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

| lastN              | Positive integer                                                        | Cannot be used in combination with _`firstN`_.                                                                                                                                                                           | 0..1        | Only the last n instances, per Attribute, per Entity (under the specified time interval) shall be retrieved. This is relative to _`offsetN`_ parameter if specified.                                                                                     |

+--------------------+-------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

| offsetN            | Positive integer                                                        | Shall only be used in combination with either _`firstN`_ or _`lastN`_.                                                                                                                                                   | 0..1        | Provides the offset for temporal pagination (ascending in case of _`firstN`_ and descending in case of _`lastN`_)                                                                                                                                        |

+--------------------+-------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

| timeproperty       | String representing a Temporal Property name                            | Allowed values: ["observedAt"]{.HTML-Code}, ["createdAt"]{.HTML-Code}, ["modifiedAt"]{.HTML-Code} and ["deletedAt"]{.HTML-Code}. If not specified, the default is ["observedAt"]{.HTML-Code}. (See Clause+++root.2.4)    | 0..1        |                                                                                                                                                                                                                                                          |

|                    |                                                                         |                                                                                                                                                                                                                          |             | Only applicable if ["aggregatedValues"]{.HTML-Code} is present in the _`format`_ or _`options`_ parameter.                                                                                                                                               |