fix CSW 3 GetRecords POST handling (#543) (#545)

fix CSW 3 GetRecords parameter handling (#543) (#544)
geopython · Nov 10, 2017 · 4c29f5a · 4c29f5a
1 parent e63f2e4
commit 4c29f5a
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 1,039 deletions.
diff --git a/pycsw/core/config.py b/pycsw/core/config.py
@@ -363,7 +363,7 @@ def __init__(self, prefix='csw30'):
                         },
                         'parameters': {
                             'typeNames': {
-                                'values': ['csw:Record']
+                                'values': ['csw:Record', 'csw30:Record']
                             },
                             'outputSchema': {
                                 'values': ['http://www.opengis.net/cat/csw/3.0']

diff --git a/pycsw/ogc/csw/csw3.py b/pycsw/ogc/csw/csw3.py
@@ -613,7 +613,7 @@ def getrecords(self):
                 'elementsetname',
                 'Missing one of ElementSetName or ElementName parameter(s)')
 
-        if 'elementsetname' in self.parent.kvp and 'elementname' in self.parent.kvp:
+        if 'elementsetname' in self.parent.kvp and 'elementname' in self.parent.kvp and self.parent.kvp['elementname']:
             # mutually exclusive required
             return self.exceptionreport('NoApplicableCode',
             'elementsetname',
@@ -645,7 +645,7 @@ def getrecords(self):
                     if ofmt.split('/')[0] in self.parent.kvp['outputformat']:
                         LOGGER.debug('FOUND OUTPUT MATCH')
                         formats_match = True
-                if not formats_match:
+                if not formats_match and self.parent.environ['HTTP_ACCEPT'] != '*/*':
                     return self.exceptionreport('InvalidParameterValue',
                     'outputformat', 'HTTP Accept header (%s) and outputformat (%s) must agree' %
                     (self.parent.environ['HTTP_ACCEPT'], self.parent.kvp['outputformat']))
@@ -930,7 +930,8 @@ def getrecords(self):
                 try:
                     if (self.parent.kvp['outputschema'] ==
                         'http://www.opengis.net/cat/csw/3.0' and
-                        'csw:Record' in self.parent.kvp['typenames']):
+                        ('csw:Record' in self.parent.kvp['typenames'] or
+                         'csw30:Record' in self.parent.kvp['typenames'])):
                         # serialize csw:Record inline
                         searchresults.append(self._write_record(
                         res, self.parent.repository.queryables['_all']))

diff --git a/pycsw/server.py b/pycsw/server.py
@@ -460,7 +460,7 @@ def dispatch(self, writer=sys.stdout, write_headers=True):
                 self.request_version)
             if self.request_version == '2.0.2':
                 basic_options.append('version')
-            if self.request_version == '3.0.0' and 'version' not in self.kvp:
+            if self.request_version == '3.0.0' and 'version' not in self.kvp and self.requesttype == 'POST':
                 if 'service' not in self.kvp:
                     self.kvp['service'] = 'CSW'
                     basic_options.append('service')

diff --git a/tests/functionaltests/suites/cite/expected/get_477b23a3-baa9-47c8-9541-5fe27735ed49.xml b/tests/functionaltests/suites/cite/expected/get_477b23a3-baa9-47c8-9541-5fe27735ed49.xml
@@ -134,6 +134,7 @@
       </ows20:Parameter>
       <ows20:Parameter name="typeNames">
         <ows20:AllowedValues>
+          <ows20:Value>csw30:Record</ows20:Value>
           <ows20:Value>csw:Record</ows20:Value>
         </ows20:AllowedValues>
       </ows20:Parameter>

diff --git a/tests/functionaltests/suites/cite/expected/get_55c38f00-2553-42c1-99ab-33edbb561ad7.xml b/tests/functionaltests/suites/cite/expected/get_55c38f00-2553-42c1-99ab-33edbb561ad7.xml
@@ -108,6 +108,7 @@
       </ows20:Parameter>
       <ows20:Parameter name="typeNames">
         <ows20:AllowedValues>
+          <ows20:Value>csw30:Record</ows20:Value>
           <ows20:Value>csw:Record</ows20:Value>
         </ows20:AllowedValues>
       </ows20:Parameter>

diff --git a/tests/functionaltests/suites/cite/expected/get_80f31def-4185-48b9-983a-960566918eae.xml b/tests/functionaltests/suites/cite/expected/get_80f31def-4185-48b9-983a-960566918eae.xml
@@ -134,6 +134,7 @@
       </ows20:Parameter>
       <ows20:Parameter name="typeNames">
         <ows20:AllowedValues>
+          <ows20:Value>csw30:Record</ows20:Value>
           <ows20:Value>csw:Record</ows20:Value>
         </ows20:AllowedValues>
       </ows20:Parameter>

diff --git a/tests/functionaltests/suites/cite/expected/get_9697f0aa-3b6a-4125-83a5-61e8826127c4.xml b/tests/functionaltests/suites/cite/expected/get_9697f0aa-3b6a-4125-83a5-61e8826127c4.xml
@@ -134,6 +134,7 @@
       </ows20:Parameter>
       <ows20:Parameter name="typeNames">
         <ows20:AllowedValues>
+          <ows20:Value>csw30:Record</ows20:Value>
           <ows20:Value>csw:Record</ows20:Value>
         </ows20:AllowedValues>
       </ows20:Parameter>