module timespan

diff --git a/include/siri/version.h b/include/siri/version.h
index 15eb357331a6966fc81e649e6596b09704f8f67c..3e84f1f7b85838bb1295a76fcb32275b84e08c2f 100644 (file)
--- a/include/siri/version.h
+++ b/include/siri/version.h
@@ -15,7 +15,7 @@
  * Note that debian alpha packages should use versions like this:
  *   2.0.34-0alpha0
  */
-#define SIRIDB_VERSION_PRE_RELEASE "-alpha-0"
+#define SIRIDB_VERSION_PRE_RELEASE "-alpha-1"
 
 #ifndef NDEBUG
 #define SIRIDB_VERSION_BUILD_RELEASE "+debug"

diff --git a/src/siri/db/aggregate.c b/src/siri/db/aggregate.c
index 476b3a4091fbab3469f4ee596c8d67a2e0f97d23..a70eb05e9cb256299bfd07287ec8177eae6b4147 100644 (file)
--- a/src/siri/db/aggregate.c
+++ b/src/siri/db/aggregate.c
@@ -232,17 +232,11 @@ vec_t * siridb_aggregate_list(cleri_children_t * children, char * err_msg)
             if (cleri_gn(cleri_gn(children)->children)
                     ->children->next->next->next != NULL)
             {
-                /* result is always positive, checked earlier */
+                /* group_by is always > 0 */
                 aggr->offset = CLERI_NODE_DATA(
                         cleri_gn(cleri_gn(cleri_gn(cleri_gn(children)
-                        ->children)->children->next->next)->children));
-
-                if (aggr->offset >= aggr->group_by)
-                {
-                    sprintf(err_msg, "Offset too large.");
-                    siridb_aggregate_list_free(vec);
-                    return NULL;
-                }
+                        ->children)->children->next->next)->children)
+                       ) % aggr->group_by;
             }
             break;
         case CLERI_GID_F_LIMIT: