make Repository init simpler

Author: tomkralidis

docs/repofilters.rst

@@ -58,9 +58,9 @@ The same CSW `GetRecords` filter as per above then yields the following results:
 
 Another example:
 
-.. code-block:: text
+.. code-block:: yaml
 
-  repository:0
+  repository:
       database: sqlite:///records.db
       filter: "pycsw:ParentIdentifier != '33'"
 

pycsw/core/repository.py

@@ -89,14 +89,15 @@ def connect(dbapi_connection, connection_rec):
         return clazz._engines[url]
 
     ''' Class to interact with underlying repository '''
-    def __init__(self, database, context, app_root=None, table='records', repo_filter=None):
+    def __init__(self, repo_object, context, app_root=None):
         ''' Initialize repository '''
 
         self.context = context
-        self.filter = repo_filter
+        self.filter = repo_object.get('filter')
         self.fts = False
-        self.database = database
-        self.table = table
+        self.database = repo_object['database']
+        self.table = repo_object['table']
+        self.facets = repo_object.get('facets', [])
 
         # Don't use relative paths, this is hack to get around
         # most wsgi restriction...
@@ -112,7 +113,7 @@ def __init__(self, database, context, app_root=None, table='records', repo_filte
 
         self.postgis_geometry_column = None
 
-        schema_name, table_name = table.rpartition(".")[::2]
+        schema_name, table_name = self.table.rpartition(".")[::2]
 
         default_table_args = {
             "autoload": True,
@@ -465,7 +466,7 @@ def query(self, ast=None, sortby=None, typenames=None,
         return [total, self._get_repo_filter(query).limit(
             maxrecords).offset(startposition).all()]
 
-    def get_facets(self, facets=[], ast=None) -> dict:
+    def get_facets(self, ast=None) -> dict:
         """
         Gets all facets for a given query
 
@@ -474,7 +475,7 @@ def get_facets(self, facets=[], ast=None) -> dict:
 
         facets_results = {}
 
-        for facet in facets:
+        for facet in self.facets:
             LOGGER.debug(f'Running facet for {facet}')
             facetq = self.session.query(self.query_mappings[facet], self.func.count(facet)).group_by(facet)
 
@@ -506,7 +507,6 @@ def get_facets(self, facets=[], ast=None) -> dict:
 
         return facets_results
 
-
     def insert(self, record, source, insert_date):
         ''' Insert a record into the repository '''
 

pycsw/ogc/api/records.py

@@ -42,7 +42,6 @@
 from pycsw.core import log
 from pycsw.core.config import StaticContext
 from pycsw.core.metadata import parse_record
-from pycsw.core.pygeofilter_evaluate import to_filter
 from pycsw.core.util import bind_url, get_today_and_now, jsonify_links, load_custom_repo_mappings, str2bool, wkt2geom
 from pycsw.ogc.api.oapi import gen_oapi
 from pycsw.ogc.api.util import match_env_var, render_j2_template, to_json, to_rfc3339
@@ -112,8 +111,6 @@ def __init__(self, config: dict):
             self.limit = 10
         LOGGER.debug(f'limit: {self.limit}')
 
-        repo_filter = self.config['repository'].get('filter')
-
         custom_mappings_path = self.config['repository'].get('mappings')
         if custom_mappings_path is not None:
             md_core_model = load_custom_repo_mappings(custom_mappings_path)
@@ -139,7 +136,7 @@ def __init__(self, config: dict):
                 max_retries = self.config['repository'].get('maxretries', 5)
                 while not connection_done and max_attempts <= max_retries:
                     try:
-                        self.repository = rs_cls(self.context, repo_filter)
+                        self.repository = rs_cls(self.repository['repository'], self.context)
                         LOGGER.debug('Custom repository %s loaded (%s)', rs, self.repository.dbtype)
                         connection_done = True
                     except Exception as err:
@@ -156,12 +153,7 @@ def __init__(self, config: dict):
         else:
             try:
                 LOGGER.info('Loading default repository')
-                self.repository = repository.Repository(
-                    self.config['repository']['database'],
-                    self.context,
-                    table=self.config['repository']['table'],
-                    repo_filter=repo_filter
-                )
+                self.repository = repository.Repository(self.config['repository'], self.context)
                 LOGGER.debug(f'Repository loaded {self.repository.dbtype}')
             except Exception as err:
                 msg = f'Could not load repository {err}'
@@ -771,7 +763,7 @@ def items(self, headers_, json_post_data, args, collection='metadata:main'):
 
         if facets_requested:
             LOGGER.debug('Running facet query')
-            response['facets'] = self.repository.get_facets(self.facets, ast)
+            response['facets'] = self.repository.get_facets(ast)
 
         returned = len(records)