diff --git a/pycsw/core/config.py b/pycsw/core/config.py
index 35734b3f9..9c57a7b56 100644
--- 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
index 4c73ce99f..f4db68dc7 100644
--- 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
index f5d37cdef..050f732f7 100644
--- 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
index b8f8f6a2e..2d54cf8b1 100644
--- 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 @@
+ csw30:Record
csw:Record
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
index 0bf0d3145..a02408b38 100644
--- 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 @@
+ csw30:Record
csw:Record
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
index b8f8f6a2e..2d54cf8b1 100644
--- 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 @@
+ csw30:Record
csw:Record
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
index b8f8f6a2e..2d54cf8b1 100644
--- 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 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/cite/expected/get_c4ea754f-c158-4d8d-8253-dc8f86021b52.xml b/tests/functionaltests/suites/cite/expected/get_c4ea754f-c158-4d8d-8253-dc8f86021b52.xml
index b8f8f6a2e..42a76d4fd 100644
--- a/tests/functionaltests/suites/cite/expected/get_c4ea754f-c158-4d8d-8253-dc8f86021b52.xml
+++ b/tests/functionaltests/suites/cite/expected/get_c4ea754f-c158-4d8d-8253-dc8f86021b52.xml
@@ -1,545 +1,7 @@
-
-
- pycsw Geospatial Catalogue
- pycsw is an OGC CSW server implementation written in Python
-
- catalogue
- discovery
- theme
-
- CSW
- 2.0.2
- 3.0.0
- None
- None
-
-
- pycsw
-
-
- Kralidis, Tom
- Senior Systems Scientist
-
-
- +01-416-xxx-xxxx
- +01-416-xxx-xxxx
-
-
- TBA
- Toronto
- Ontario
- M9C 3Z9
- Canada
- tomkralidis@gmail.com
-
-
- 0800h - 1600h EST
- During hours of service. Off on weekends.
-
- pointOfContact
-
-
-
-
-
-
-
-
-
-
-
-
- application/xml
- text/xml
-
-
-
-
- 2.0.2
- 3.0.0
-
-
-
-
- All
- Filter_Capabilities
- OperationsMetadata
- ServiceIdentification
- ServiceProvider
-
-
-
-
-
-
-
-
-
-
-
-
- GetCapabilities.acceptFormats
- GetCapabilities.acceptVersions
- GetCapabilities.sections
- GetRecordById.ElementSetName
- GetRecordById.outputFormat
- GetRecordById.outputSchema
- GetRecords.CONSTRAINTLANGUAGE
- GetRecords.ElementSetName
- GetRecords.outputFormat
- GetRecords.outputSchema
- GetRecords.typeNames
- Harvest.ResourceType
- Transaction.TransactionSchemas
-
-
-
-
-
-
-
-
-
-
-
-
- CQL_TEXT
- FILTER
-
-
-
-
- brief
- full
- summary
-
-
-
-
- application/atom+xml
- application/json
- application/xml
-
-
-
-
- http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/
- http://www.interlis.ch/INTERLIS2.3
- http://www.opengis.net/cat/csw/3.0
- http://www.opengis.net/cat/csw/csdgm
- http://www.w3.org/2005/Atom
-
-
-
-
- csw:Record
-
-
-
-
- 10
-
-
-
-
- http://localhost/pycsw/csw.py?config=tests/suites/cite/default.cfg?mode=opensearch&service=CSW&version=3.0.0&request=GetCapabilities
-
-
-
-
- http://geo.data.gov/geoportal/csw/discovery
-
-
-
-
-
-
-
-
-
-
-
-
- brief
- full
- summary
-
-
-
-
- application/atom+xml
- application/json
- application/xml
-
-
-
-
- http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/
- http://www.interlis.ch/INTERLIS2.3
- http://www.opengis.net/cat/csw/3.0
- http://www.opengis.net/cat/csw/csdgm
- http://www.w3.org/2005/Atom
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- http://www.isotc211.org/2005/gmi
- http://www.opengis.net/cat/csw/2.0.2
- http://www.opengis.net/cat/csw/3.0
- http://www.opengis.net/sos/1.0
- http://www.opengis.net/sos/2.0
- http://www.opengis.net/wcs
- http://www.opengis.net/wfs
- http://www.opengis.net/wfs/2.0
- http://www.opengis.net/wms
- http://www.opengis.net/wmts/1.0
- http://www.opengis.net/wps/1.0.0
- urn:geoss:waf
-
-
-
-
-
-
-
-
-
-
-
- http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/
- http://www.interlis.ch/INTERLIS2.3
- http://www.isotc211.org/2005/gmi
- http://www.opengis.net/cat/csw/2.0.2
- http://www.opengis.net/cat/csw/3.0
- http://www.opengis.net/cat/csw/csdgm
- http://www.opengis.net/sos/1.0
- http://www.opengis.net/sos/2.0
- http://www.opengis.net/wcs
- http://www.opengis.net/wfs
- http://www.opengis.net/wfs/2.0
- http://www.opengis.net/wms
- http://www.opengis.net/wmts/1.0
- http://www.opengis.net/wps/1.0.0
- http://www.w3.org/2005/Atom
- urn:geoss:waf
-
-
-
-
-
- CSW
-
-
-
-
- 2.0.2
- 3.0.0
-
-
-
-
- csw:AnyText
- dc:contributor
- dc:creator
- dc:date
- dc:format
- dc:identifier
- dc:language
- dc:publisher
- dc:relation
- dc:rights
- dc:source
- dc:subject
- dc:title
- dc:type
- dct:abstract
- dct:alternative
- dct:modified
- dct:spatial
- ows:BoundingBox
-
-
-
-
- http://geo.data.gov/geoportal/csw/discovery
-
-
-
-
- 10
-
-
-
-
- SOAP
- XML
-
-
-
-
- allowed
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- http://www.opengis.net/gml
-
-
-
-
- TRUE
-
-
-
-
- en
-
-
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- xs:string
-
-
- xs:string
-
-
- xs:string
-
-
- xs:string
-
-
- xs:string
-
-
- xs:string
-
-
-
-
+
+
+ Missing keyword: service
+
+
diff --git a/tests/functionaltests/suites/csw30/expected/get_0bdf8457-971e-4ed1-be4a-5feca4dcd8fa.xml b/tests/functionaltests/suites/csw30/expected/get_0bdf8457-971e-4ed1-be4a-5feca4dcd8fa.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_0bdf8457-971e-4ed1-be4a-5feca4dcd8fa.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_0bdf8457-971e-4ed1-be4a-5feca4dcd8fa.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_1869e495-1a61-4713-8285-76d1336ee1a6.xml b/tests/functionaltests/suites/csw30/expected/get_1869e495-1a61-4713-8285-76d1336ee1a6.xml
index c5cb70e29..42a76d4fd 100644
--- a/tests/functionaltests/suites/csw30/expected/get_1869e495-1a61-4713-8285-76d1336ee1a6.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_1869e495-1a61-4713-8285-76d1336ee1a6.xml
@@ -1,493 +1,7 @@
-
-
- pycsw Geospatial Catalogue
- pycsw is an OGC CSW server implementation written in Python
-
- catalogue
- discovery
- theme
-
- CSW
- 2.0.2
- 3.0.0
- None
- None
-
-
- pycsw
-
-
- Kralidis, Tom
- Senior Systems Scientist
-
-
- +01-416-xxx-xxxx
- +01-416-xxx-xxxx
-
-
- TBA
- Toronto
- Ontario
- M9C 3Z9
- Canada
- tomkralidis@gmail.com
-
-
- 0800h - 1600h EST
- During hours of service. Off on weekends.
-
- pointOfContact
-
-
-
-
-
-
-
-
-
-
-
-
- application/xml
- text/xml
-
-
-
-
- 2.0.2
- 3.0.0
-
-
-
-
- All
- Filter_Capabilities
- OperationsMetadata
- ServiceIdentification
- ServiceProvider
-
-
-
-
-
-
-
-
-
-
-
-
- GetCapabilities.acceptFormats
- GetCapabilities.acceptVersions
- GetCapabilities.sections
- GetRecordById.ElementSetName
- GetRecordById.outputFormat
- GetRecordById.outputSchema
- GetRecords.CONSTRAINTLANGUAGE
- GetRecords.ElementSetName
- GetRecords.outputFormat
- GetRecords.outputSchema
- GetRecords.typeNames
-
-
-
-
-
-
-
-
-
-
-
-
- CQL_TEXT
- FILTER
-
-
-
-
- brief
- full
- summary
-
-
-
-
- application/atom+xml
- application/json
- application/xml
-
-
-
-
- http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/
- http://www.interlis.ch/INTERLIS2.3
- http://www.opengis.net/cat/csw/3.0
- http://www.opengis.net/cat/csw/csdgm
- http://www.w3.org/2005/Atom
-
-
-
-
- csw:Record
-
-
-
-
- 10
-
-
-
-
- http://localhost/pycsw/csw.py?config=tests/suites/csw30/default.cfg?mode=opensearch&service=CSW&version=3.0.0&request=GetCapabilities
-
-
-
-
- http://demo.pycsw.org/gisdata/csw
-
-
-
-
-
-
-
-
-
-
-
-
- brief
- full
- summary
-
-
-
-
- application/atom+xml
- application/json
- application/xml
-
-
-
-
- http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/
- http://www.interlis.ch/INTERLIS2.3
- http://www.opengis.net/cat/csw/3.0
- http://www.opengis.net/cat/csw/csdgm
- http://www.w3.org/2005/Atom
-
-
-
-
-
-
-
-
-
-
-
-
- CSW
-
-
-
-
- 2.0.2
- 3.0.0
-
-
-
-
- csw:AnyText
- dc:contributor
- dc:creator
- dc:date
- dc:format
- dc:identifier
- dc:language
- dc:publisher
- dc:relation
- dc:rights
- dc:source
- dc:subject
- dc:title
- dc:type
- dct:abstract
- dct:alternative
- dct:modified
- dct:spatial
- ows:BoundingBox
-
-
-
-
- http://demo.pycsw.org/gisdata/csw
-
-
-
-
- 10
-
-
-
-
- SOAP
- XML
-
-
-
-
- allowed
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- TRUE
-
-
-
-
- http://www.opengis.net/gml
-
-
-
-
- TRUE
-
-
-
-
- en
-
-
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
- TRUE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- xs:string
-
-
- xs:string
-
-
- xs:string
-
-
- xs:string
-
-
- xs:string
-
-
- xs:string
-
-
-
-
+
+
+ Missing keyword: service
+
+
diff --git a/tests/functionaltests/suites/csw30/expected/get_22f44168-2ccf-4801-ad96-204212566d56.xml b/tests/functionaltests/suites/csw30/expected/get_22f44168-2ccf-4801-ad96-204212566d56.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_22f44168-2ccf-4801-ad96-204212566d56.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_22f44168-2ccf-4801-ad96-204212566d56.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_2499a9c9-8d33-449c-bc92-d494adfcc84d.xml b/tests/functionaltests/suites/csw30/expected/get_2499a9c9-8d33-449c-bc92-d494adfcc84d.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_2499a9c9-8d33-449c-bc92-d494adfcc84d.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_2499a9c9-8d33-449c-bc92-d494adfcc84d.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_27f4f39c-d92a-4e3c-b961-c6aa8c24e513.xml b/tests/functionaltests/suites/csw30/expected/get_27f4f39c-d92a-4e3c-b961-c6aa8c24e513.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_27f4f39c-d92a-4e3c-b961-c6aa8c24e513.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_27f4f39c-d92a-4e3c-b961-c6aa8c24e513.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_2b06a5c8-0df2-4af1-8d2e-a425de11c845.xml b/tests/functionaltests/suites/csw30/expected/get_2b06a5c8-0df2-4af1-8d2e-a425de11c845.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_2b06a5c8-0df2-4af1-8d2e-a425de11c845.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_2b06a5c8-0df2-4af1-8d2e-a425de11c845.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_43cd6471-6ac7-45bd-8ff9-148cb2de9a52.xml b/tests/functionaltests/suites/csw30/expected/get_43cd6471-6ac7-45bd-8ff9-148cb2de9a52.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_43cd6471-6ac7-45bd-8ff9-148cb2de9a52.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_43cd6471-6ac7-45bd-8ff9-148cb2de9a52.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_5e9e67dc-18d6-4645-8111-c6263c88a61f.xml b/tests/functionaltests/suites/csw30/expected/get_5e9e67dc-18d6-4645-8111-c6263c88a61f.xml
index 2037f14f0..af7b63f04 100644
--- a/tests/functionaltests/suites/csw30/expected/get_5e9e67dc-18d6-4645-8111-c6263c88a61f.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_5e9e67dc-18d6-4645-8111-c6263c88a61f.xml
@@ -92,6 +92,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_6a9d0558-9d87-495b-b999-b49a3ef1cf99.xml b/tests/functionaltests/suites/csw30/expected/get_6a9d0558-9d87-495b-b999-b49a3ef1cf99.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_6a9d0558-9d87-495b-b999-b49a3ef1cf99.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_6a9d0558-9d87-495b-b999-b49a3ef1cf99.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_6e9cba43-5e27-415d-adbd-a92851c2c173.xml b/tests/functionaltests/suites/csw30/expected/get_6e9cba43-5e27-415d-adbd-a92851c2c173.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_6e9cba43-5e27-415d-adbd-a92851c2c173.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_6e9cba43-5e27-415d-adbd-a92851c2c173.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_7e82446a-b5dc-43fe-9a73-4cc1f2f2f0bf.xml b/tests/functionaltests/suites/csw30/expected/get_7e82446a-b5dc-43fe-9a73-4cc1f2f2f0bf.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_7e82446a-b5dc-43fe-9a73-4cc1f2f2f0bf.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_7e82446a-b5dc-43fe-9a73-4cc1f2f2f0bf.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_8025978e-1a35-4d70-80c2-e8329e0c7864.xml b/tests/functionaltests/suites/csw30/expected/get_8025978e-1a35-4d70-80c2-e8329e0c7864.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_8025978e-1a35-4d70-80c2-e8329e0c7864.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_8025978e-1a35-4d70-80c2-e8329e0c7864.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_GetCapabilities-base-url.xml b/tests/functionaltests/suites/csw30/expected/get_GetCapabilities-base-url.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_GetCapabilities-base-url.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_GetCapabilities-base-url.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_GetCapabilities-no-version.xml b/tests/functionaltests/suites/csw30/expected/get_GetCapabilities-no-version.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_GetCapabilities-no-version.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_GetCapabilities-no-version.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_GetCapabilities.xml b/tests/functionaltests/suites/csw30/expected/get_GetCapabilities.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_GetCapabilities.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_GetCapabilities.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_c03d173a-3f42-4956-89c8-1fe02c3a0873.xml b/tests/functionaltests/suites/csw30/expected/get_c03d173a-3f42-4956-89c8-1fe02c3a0873.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_c03d173a-3f42-4956-89c8-1fe02c3a0873.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_c03d173a-3f42-4956-89c8-1fe02c3a0873.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/get_e67ca935-d65d-4d8c-8302-1405333dded0.xml b/tests/functionaltests/suites/csw30/expected/get_e67ca935-d65d-4d8c-8302-1405333dded0.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/get_e67ca935-d65d-4d8c-8302-1405333dded0.xml
+++ b/tests/functionaltests/suites/csw30/expected/get_e67ca935-d65d-4d8c-8302-1405333dded0.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record
diff --git a/tests/functionaltests/suites/csw30/expected/post_GetCapabilities.xml b/tests/functionaltests/suites/csw30/expected/post_GetCapabilities.xml
index c5cb70e29..a68d7f234 100644
--- a/tests/functionaltests/suites/csw30/expected/post_GetCapabilities.xml
+++ b/tests/functionaltests/suites/csw30/expected/post_GetCapabilities.xml
@@ -132,6 +132,7 @@
+ csw30:Record
csw:Record