overriding FES parsing

Author: tomkralidis

pycsw/core/pygeofilter_ext.py

@@ -45,7 +45,8 @@
 
 
 class PycswFilterEvaluator(SQLAlchemyFilterEvaluator):
-    def __init__(self, field_mapping=None, dbtype='sqlite', undefined_as_null=None):
+    def __init__(self, field_mapping=None, dbtype='sqlite',
+                 undefined_as_null=None):
         super().__init__(field_mapping, undefined_as_null=undefined_as_null)
         self._pycsw_dbtype = dbtype
 
@@ -85,9 +86,10 @@ def ilike(self, node, lhs):
 def to_filter(ast, dbtype, field_mapping=None):
     return PycswFilterEvaluator(field_mapping, dbtype).evaluate(ast)
 
+
 class PycswCSWFES11Parser(FES11Parser):
-#    def __init__(self):
-#        super().__init__()
+    def parse(self, input_):
+        return FES11Parser().parse(input_)
 
     @fhandle('BBOX')
     def geometry_bbox(self, node: Element, lhs, rhs, crs=None):

pycsw/ogc/csw/csw2.py

@@ -33,7 +33,6 @@
 import os
 
 from pygeofilter.parsers.ecql.parser import parse as ecql_parse
-from pygeofilter.parsers.fes.v11 import parse as fes1_parse
 from pycsw.core.pygeofilter_ext import PycswCSWFES11Parser
 
 from pycsw.core.etree import etree
@@ -771,8 +770,9 @@ def getrecords(self):
                             self.parent.context.namespaces, self.parent.orm, self.parent.language['text'], self.parent.repository.fts)
                             self.parent.kvp['constraint']['_dict'] = xml2dict(etree.tostring(doc), self.parent.context.namespaces)
                         else:
+                            pc = PycswCSWFES11Parser()
                             self.parent.kvp['constraint'] = {
-                                'ast': fes1_parse(tmp)
+                                'ast': pc.parse(tmp)
                             }
                     except Exception as err:
                         errortext = \
@@ -1602,8 +1602,8 @@ def _parse_constraint(self, element):
                     self.parent.context.namespaces, self.parent.orm, self.parent.language['text'], self.parent.repository.fts)
                     query['_dict'] = xml2dict(etree.tostring(tmp), self.parent.context.namespaces)
                 else:
-                    #query['ast'] = PycswCSWFES11Parser().parse(etree.tostring(tmp))
-                    query['ast'] = fes1_parse(etree.tostring(tmp))
+                    pc = PycswCSWFES11Parser()
+                    query['ast'] = pc.parse(tmp)
             except Exception as err:
                 return 'Invalid Filter request: %s' % err
 

pycsw/ogc/csw/csw3.py

@@ -32,13 +32,13 @@
 from time import time
 
 from pygeofilter.parsers.ecql.parser import parse as ecql_parse
-from pygeofilter.parsers.fes.v11 import parse as fes1_parse
 
 from pycsw.core.etree import etree
 from pycsw.ogc.csw.cql import cql2fes
 from pycsw import opensearch
 from pycsw.core import metadata, util
 from pycsw.core.formats.fmt_json import xml2dict
+from pycsw.core.pygeofilter_ext import PycswCSWFES11Parser
 from pycsw.ogc.fes import fes1, fes2
 import logging
 
@@ -797,8 +797,9 @@ def getrecords(self):
                             self.parent.context.namespaces, self.parent.orm, self.parent.language['text'], self.parent.repository.fts)
                             self.parent.kvp['constraint']['_dict'] = xml2dict(etree.tostring(doc), self.parent.context.namespaces)
                         else:
+                            pc = PycswCSWFES11Parser()
                             self.parent.kvp['constraint'] = {
-                                'ast': fes1_parse(etree.tostring(self.parent.kvp['constraint']))
+                                'ast': pc.parse(self.parent.kvp['constraint'])
                             }
                     except Exception as err:
                         errortext = \
@@ -1672,7 +1673,8 @@ def _parse_constraint(self, element):
                     self.parent.context.namespaces, self.parent.orm, self.parent.language['text'], self.parent.repository.fts)
                     query['_dict'] = xml2dict(etree.tostring(tmp), self.parent.context.namespaces)
                 else:
-                    query['ast'] = fes1_parse(etree.tostring(tmp))
+                    pc = PycswCSWFES11Parser()
+                    query['ast'] = pc.parse(tmp)
             except Exception as err:
                 return 'Invalid Filter request: %s' % err