update

Author: tomkralidis

pycsw/core/repository.py

@@ -422,32 +422,22 @@ def query(self, constraint=None, sortby=None, typenames=None,
               maxrecords=10, startposition=0):
         ''' Query records from underlying repository '''
 
-        # run the raw query and get total
-        if self.database is not None:
-            if 'where' in constraint:  # GetRecords with constraint
-                LOGGER.debug('constraint detected')
-                query = self.session.query(self.dataset).filter(
-                                           text(constraint['where'])).params(self._create_values(constraint['values']))
-            else:  # GetRecords sans constraint
-                LOGGER.debug('No constraint detected')
-                query = self.session.query(self.dataset)
-        else:
-            if constraint.get('ast') is not None:  # GetRecords with pygeofilter AST
-                LOGGER.debug('pygeofilter AST detected')
-                LOGGER.debug('Transforming AST into filters')
-                try:
-                    filters = to_filter(constraint['ast'], self.dbtype, self.query_mappings)
-                    LOGGER.debug(f'Filter: {filters}')
-                except Exception as err:
-                    msg = f'AST evaluator error: {str(err)}'
-                    LOGGER.exception(msg)
-                    raise RuntimeError(msg)
+        if constraint.get('ast') is not None:  # GetRecords with pygeofilter AST
+            LOGGER.debug('pygeofilter AST detected')
+            LOGGER.debug('Transforming AST into filters')
+            try:
+                filters = to_filter(constraint['ast'], self.dbtype, self.query_mappings)
+                LOGGER.debug(f'Filter: {filters}')
+            except Exception as err:
+                msg = f'AST evaluator error: {str(err)}'
+                LOGGER.exception(msg)
+                raise RuntimeError(msg)
 
-                query = self.session.query(self.dataset).filter(filters)
+            query = self.session.query(self.dataset).filter(filters)
 
-            else:  # GetRecords sans pygeofilter AST
-                LOGGER.debug('No pygeofilter AST detected')
-                query = self.session.query(self.dataset)
+        else:  # GetRecords sans pygeofilter AST
+            LOGGER.debug('No pygeofilter AST detected')
+            query = self.session.query(self.dataset)
 
         total = self._get_repo_filter(query).count()
 

pycsw/ogc/api/records.py

@@ -760,7 +760,9 @@ def items(self, headers_, json_post_data, args, collection='metadata:main'):
         else:
             ast = None
 
-        count, records = self.repository.query(ast=ast, sortby=sortby, maxrecords=limit, startposition=offset)
+        count, records = self.repository.query(
+            constraint={'ast': ast}, sortby=sortby, maxrecords=limit,
+            startposition=offset)
 
         if facets_requested:
             LOGGER.debug('Running facet query')