Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/VERSION.txt
+++ b/VERSION.txt
-2.4.0
+2.4.1
--- a/debian/changelog
+++ b/debian/changelog
+pycsw (2.4.1+dfsg-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Refresh patches.
+  * Drop removal of empty directories removed upstream.
+  * Add patch to not require exact versions of dependencies.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 01 Sep 2019 07:38:37 +0200
+
 pycsw (2.4.0+dfsg-2) unstable; urgency=medium

  * Team upload.

--- a/debian/patches/0002-Remove-externally-linked-files.patch
+++ b/debian/patches/0002-Remove-externally-linked-files.patch
@@ -18,7 +18,7 @@ W3C and jquery
         <script type="text/javascript">
             $(document).ready(function() {
                 $('.xml').change(function() {
-@@ -843,8 +843,6 @@
+@@ -449,8 +449,6 @@
             </ul>
         <hr/>
         <footer>

--- a/debian/patches/series
+++ b/debian/patches/series
 0001-Remove-google-analytics.patch
 0002-Remove-externally-linked-files.patch
 0006-Don-t-include-external-references-to-images.patch
+version-requirements.patch
--- a/debian/patches/version-requirements.patch
+++ b/debian/patches/version-requirements.patch
+Description: Don't require exact versions.
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/requirements-dev.txt
+++ b/requirements-dev.txt
+@@ -1,11 +1,11 @@
+ -r requirements.txt
+ -r requirements-standalone.txt
+ 
+-apipkg==1.4
+-mock==2.0.0
+-Paver==1.2.4
+-pytest==3.0.3
+-pytest-cov==2.4.0
+-pytest-flake8==0.8.1
+-pytest-timeout==1.2.0
+apipkg>=1.4
+mock>=2.0.0
+Paver>=1.2.4
+pytest>=3.0.3
+pytest-cov>=2.4.0
+pytest-flake8>=0.8.1
+pytest-timeout>=1.2.0
+ sphinx
+--- a/requirements-standalone.txt
+++ b/requirements-standalone.txt
+@@ -1 +1 @@
+-SQLAlchemy==1.3.8
+SQLAlchemy>=1.3.8
+--- a/requirements.txt
+++ b/requirements.txt
+@@ -1,7 +1,7 @@
+-geolinks==0.2.0
+-lxml==4.4.0
+-OWSLib==0.18.0
+-pyproj==2.2.1
+-Shapely==1.6.4.post2
+-six==1.12.0
+-xmltodict==0.12.0
+\ No newline at end of file
+geolinks>=0.2.0
+lxml>=4.4.0
+OWSLib>=0.18.0
+pyproj>=2.2.1
+Shapely>=1.6.4
+six>=1.12.0
+xmltodict>=0.11.0
--- a/debian/rules
+++ b/debian/rules
@@ -39,10 +39,6 @@ override_dh_install:
 	$(RM) -r debian/*/usr/share/pycsw/tests/unittests/__pycache__/

 	# Remove empty directories
-	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/apiso/export/
-	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/duplicatefileid/export/
-	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/idswithpaths/export/
-
 	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/harvesting/data/
 	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/manager/data/


--- a/pycsw/core/metadata.py
+++ b/pycsw/core/metadata.py
@@ -1242,8 +1242,11 @@ def _parse_iso(context, repos, exml):
    _set(context, recobj, 'pycsw:Modified', md.datestamp)
    _set(context, recobj, 'pycsw:Source', md.dataseturi)
    if md.referencesystem is not None:
-        _set(context, recobj, 'pycsw:CRS','urn:ogc:def:crs:EPSG:6.11:%s' %
-        md.referencesystem.code)
+        try:
+            code_ = 'urn:ogc:def:crs:EPSG::%d' % int(md.referencesystem.code)
+        except ValueError:
+            code_ = md.referencesystem.code
+        _set(context, recobj, 'pycsw:CRS', code_)

    if hasattr(md, 'identification'):
        _set(context, recobj, 'pycsw:Title', md.identification.title)

--- a/requirements-standalone.txt
+++ b/requirements-standalone.txt
-SQLAlchemy
+SQLAlchemy==1.3.8
--- a/requirements.txt
+++ b/requirements.txt
-geolinks
-lxml
-OWSLib
-pyproj
-Shapely
-six
-xmltodict
\ No newline at end of file
+geolinks==0.2.0
+lxml==4.4.0
+OWSLib==0.18.0
+pyproj==2.2.1
+Shapely==1.6.4.post2
+six==1.12.0
+xmltodict==0.12.0
\ No newline at end of file
--- a/setup.py
+++ b/setup.py
@@ -91,6 +91,7 @@ setup(
        'Programming Language :: Python :: 3.4',
        'Programming Language :: Python :: 3.5',
        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
        'Topic :: Scientific/Engineering :: GIS',
    ]
 )
--- a/tests/functionaltests/suites/apiso-inspire/default.cfg
+++ b/tests/functionaltests/suites/apiso-inspire/default.cfg
@@ -29,7 +29,7 @@

 [server]
 home=.
-url=http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg
+url=http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg
 mimetype=application/xml; charset=UTF-8
 encoding=UTF-8
 language=en-US
@@ -73,7 +73,7 @@ contact_role=pointOfContact

 [repository]
 # sqlite
-database=sqlite:///tests/suites/cite/data/records.db
+database=sqlite:///tests/functionaltests/suites/cite/data/cite.db
 # postgres
 #database=postgres://username:password@localhost/pycsw
 table=records

--- a/tests/functionaltests/suites/apiso-inspire/expected/get_GetCapabilities-lang.xml
+++ b/tests/functionaltests/suites/apiso-inspire/expected/get_GetCapabilities-lang.xml
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- PYCSW_VERSION -->
-<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" updateSequence="PYCSW_UPDATESEQUENCE" version="2.0.2" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
+<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" version="2.0.2" updateSequence="PYCSW_UPDATESEQUENCE" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
  <ows:ServiceIdentification>
    <ows:Title>pycsw Geospatial Catalogue</ows:Title>
    <ows:Abstract>pycsw is an OGC CSW server implementation written in Python</ows:Abstract>
@@ -45,8 +45,8 @@
    <ows:Operation name="GetCapabilities">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="sections">
@@ -59,8 +59,8 @@
    <ows:Operation name="DescribeRecord">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="outputFormat">
@@ -80,8 +80,8 @@
    <ows:Operation name="GetDomain">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="ParameterName">
@@ -103,8 +103,8 @@
    <ows:Operation name="GetRecords">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="CONSTRAINTLANGUAGE">
@@ -214,8 +214,8 @@
    <ows:Operation name="GetRecordById">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="ElementSetName">
@@ -239,7 +239,7 @@
    <ows:Operation name="GetRepositoryItem">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
    </ows:Operation>
@@ -265,7 +265,7 @@
    </ows:Constraint>
    <inspire_ds:ExtendedCapabilities xsi:schemaLocation="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0 http://inspire.ec.europa.eu/schemas/inspire_ds/1.0/inspire_ds.xsd">
      <inspire_common:ResourceLocator>
-        <inspire_common:URL>http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg&amp;service=CSW&amp;version=2.0.2&amp;request=GetCapabilities</inspire_common:URL>
+        <inspire_common:URL>http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg&amp;service=CSW&amp;version=2.0.2&amp;request=GetCapabilities</inspire_common:URL>
        <inspire_common:MediaType>application/xml</inspire_common:MediaType>
      </inspire_common:ResourceLocator>
      <inspire_common:ResourceType>service</inspire_common:ResourceType>

--- a/tests/functionaltests/suites/apiso-inspire/expected/get_GetCapabilities.xml
+++ b/tests/functionaltests/suites/apiso-inspire/expected/get_GetCapabilities.xml
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- PYCSW_VERSION -->
-<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" updateSequence="PYCSW_UPDATESEQUENCE" version="2.0.2" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
+<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" version="2.0.2" updateSequence="PYCSW_UPDATESEQUENCE" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
  <ows:ServiceIdentification>
    <ows:Title>pycsw Geospatial Catalogue</ows:Title>
    <ows:Abstract>pycsw is an OGC CSW server implementation written in Python</ows:Abstract>
@@ -45,8 +45,8 @@
    <ows:Operation name="GetCapabilities">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="sections">
@@ -59,8 +59,8 @@
    <ows:Operation name="DescribeRecord">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="outputFormat">
@@ -80,8 +80,8 @@
    <ows:Operation name="GetDomain">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="ParameterName">
@@ -103,8 +103,8 @@
    <ows:Operation name="GetRecords">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="CONSTRAINTLANGUAGE">
@@ -214,8 +214,8 @@
    <ows:Operation name="GetRecordById">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="ElementSetName">
@@ -239,7 +239,7 @@
    <ows:Operation name="GetRepositoryItem">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
    </ows:Operation>
@@ -265,7 +265,7 @@
    </ows:Constraint>
    <inspire_ds:ExtendedCapabilities xsi:schemaLocation="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0 http://inspire.ec.europa.eu/schemas/inspire_ds/1.0/inspire_ds.xsd">
      <inspire_common:ResourceLocator>
-        <inspire_common:URL>http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg&amp;service=CSW&amp;version=2.0.2&amp;request=GetCapabilities</inspire_common:URL>
+        <inspire_common:URL>http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg&amp;service=CSW&amp;version=2.0.2&amp;request=GetCapabilities</inspire_common:URL>
        <inspire_common:MediaType>application/xml</inspire_common:MediaType>
      </inspire_common:ResourceLocator>
      <inspire_common:ResourceType>service</inspire_common:ResourceType>

--- a/tests/functionaltests/suites/apiso/default.cfg
+++ b/tests/functionaltests/suites/apiso/default.cfg
@@ -29,7 +29,7 @@

 [server]
 home=.
-url=http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg
+url=http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg
 mimetype=application/xml; charset=UTF-8
 encoding=UTF-8
 language=en-US
@@ -73,7 +73,7 @@ contact_role=pointOfContact

 [repository]
 # sqlite
-database=sqlite:///tests/suites/apiso/data/records.db
+database=sqlite:///tests/functionaltests/suites/apiso/data/records.db
 # postgres
 #database=postgres://username:password@localhost/pycsw
 table=records

--- a/tests/functionaltests/suites/apiso/expected/post_DescribeRecord.xml
+++ b/tests/functionaltests/suites/apiso/expected/post_DescribeRecord.xml
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- PYCSW_VERSION -->
 <csw:DescribeRecordResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
-  <csw:SchemaComponent parentSchema="gmd.xsd" schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd">
+  <csw:SchemaComponent schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd" parentSchema="gmd.xsd">
    <xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1">
 	<!-- ================================= Annotation ================================ -->
 	<xs:annotation>
@@ -350,7 +350,7 @@
 	<!-- =========================================================================== -->
 </xs:schema>
  </csw:SchemaComponent>
-  <csw:SchemaComponent parentSchema="gmd.xsd" schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd">
+  <csw:SchemaComponent schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd" parentSchema="gmd.xsd">
    <xs:schema targetNamespace="http://www.isotc211.org/2005/srv" elementFormDefault="qualified" version="0.1">
 	<!-- ================================= Annotation ================================ -->
 	<xs:annotation>

--- a/tests/functionaltests/suites/apiso/expected/post_GetCapabilities.xml
+++ b/tests/functionaltests/suites/apiso/expected/post_GetCapabilities.xml
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- PYCSW_VERSION -->
-<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" updateSequence="PYCSW_UPDATESEQUENCE" version="2.0.2" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
+<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.2" updateSequence="PYCSW_UPDATESEQUENCE" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
  <ows:ServiceIdentification>
    <ows:Title>pycsw Geospatial Catalogue</ows:Title>
    <ows:Abstract>pycsw is an OGC CSW server implementation written in Python</ows:Abstract>
@@ -45,8 +45,8 @@
    <ows:Operation name="GetCapabilities">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="sections">
@@ -59,8 +59,8 @@
    <ows:Operation name="DescribeRecord">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="outputFormat">
@@ -80,8 +80,8 @@
    <ows:Operation name="GetDomain">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="ParameterName">
@@ -103,8 +103,8 @@
    <ows:Operation name="GetRecords">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="CONSTRAINTLANGUAGE">
@@ -214,8 +214,8 @@
    <ows:Operation name="GetRecordById">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
-          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
+          <ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
      <ows:Parameter name="ElementSetName">
@@ -239,7 +239,7 @@
    <ows:Operation name="GetRepositoryItem">
      <ows:DCP>
        <ows:HTTP>
-          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg"/>
+          <ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg"/>
        </ows:HTTP>
      </ows:DCP>
    </ows:Operation>

--- a/tests/functionaltests/suites/apiso/expected/post_GetRecordById-brief.xml
+++ b/tests/functionaltests/suites/apiso/expected/post_GetRecordById-brief.xml
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- PYCSW_VERSION -->
-<csw:GetRecordByIdResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
+<csw:GetRecordByIdResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gco="http://www.isotc211.org/2005/gco" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
  <gmd:MD_Metadata xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://schemas.opengis.net/csw/2.0.2/profiles/apiso/1.0.0/apiso.xsd">
    <gmd:fileIdentifier>
      <gco:CharacterString>de53e931-778a-4792-94ad-9fe507aca483</gco:CharacterString>
    </gmd:fileIdentifier>
    <gmd:hierarchyLevel>
-      <gmd:MD_ScopeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="dataset" codeSpace="ISOTC211/19115">dataset</gmd:MD_ScopeCode>
+      <gmd:MD_ScopeCode codeSpace="ISOTC211/19115" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="dataset">dataset</gmd:MD_ScopeCode>
    </gmd:hierarchyLevel>
    <gmd:identificationInfo>
      <gmd:MD_DataIdentification id="de53e931-778a-4792-94ad-9fe507aca483">
@@ -21,7 +21,7 @@
                  <gco:Date>2000-01-01</gco:Date>
                </gmd:date>
                <gmd:dateType>
-                  <gmd:CI_DateTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="publication" codeSpace="ISOTC211/19115">publication</gmd:CI_DateTypeCode>
+                  <gmd:CI_DateTypeCode codeSpace="ISOTC211/19115" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="publication">publication</gmd:CI_DateTypeCode>
                </gmd:dateType>
              </gmd:CI_Date>
            </gmd:date>

--- a/tests/functionaltests/suites/apiso/expected/post_GetRecordById-full.xml
+++ b/tests/functionaltests/suites/apiso/expected/post_GetRecordById-full.xml
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- PYCSW_VERSION -->
-<csw:GetRecordByIdResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
+<csw:GetRecordByIdResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gco="http://www.isotc211.org/2005/gco" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
  <gmd:MD_Metadata xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://schemas.opengis.net/iso/19139/20060504/gmd/gmd.xsd">
 	<gmd:fileIdentifier><gco:CharacterString>de53e931-778a-4792-94ad-9fe507aca483</gco:CharacterString></gmd:fileIdentifier>
 	<gmd:language><gmd:LanguageCode codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#LanguageCode" codeListValue="eng">eng</gmd:LanguageCode></gmd:language>

--- a/tests/functionaltests/suites/apiso/expected/post_GetRecordById-srv-brief.xml
+++ b/tests/functionaltests/suites/apiso/expected/post_GetRecordById-srv-brief.xml
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- PYCSW_VERSION -->
-<csw:GetRecordByIdResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
+<csw:GetRecordByIdResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:srv="http://www.isotc211.org/2005/srv" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
  <gmd:MD_Metadata xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://schemas.opengis.net/csw/2.0.2/profiles/apiso/1.0.0/apiso.xsd">
    <gmd:fileIdentifier>
      <gco:CharacterString>3e9a8c05</gco:CharacterString>
    </gmd:fileIdentifier>
    <gmd:hierarchyLevel>
-      <gmd:MD_ScopeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="service" codeSpace="ISOTC211/19115">service</gmd:MD_ScopeCode>
+      <gmd:MD_ScopeCode codeSpace="ISOTC211/19115" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="service">service</gmd:MD_ScopeCode>
    </gmd:hierarchyLevel>
    <gmd:identificationInfo>
      <srv:SV_ServiceIdentification id="3e9a8c05">
@@ -21,7 +21,7 @@
                  <gco:Date>2011-04-19</gco:Date>
                </gmd:date>
                <gmd:dateType>
-                  <gmd:CI_DateTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation" codeSpace="ISOTC211/19115">creation</gmd:CI_DateTypeCode>
+                  <gmd:CI_DateTypeCode codeSpace="ISOTC211/19115" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation">creation</gmd:CI_DateTypeCode>
                </gmd:dateType>
              </gmd:CI_Date>
            </gmd:date>

--- a/tests/functionaltests/suites/apiso/expected/post_GetRecords-all-csw-output.xml
+++ b/tests/functionaltests/suites/apiso/expected/post_GetRecords-all-csw-output.xml
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- PYCSW_VERSION -->
-<csw:GetRecordsResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.2" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
+<csw:GetRecordsResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:srv="http://www.isotc211.org/2005/srv" version="2.0.2" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
  <csw:SearchStatus timestamp="PYCSW_TIMESTAMP"/>
-  <csw:SearchResults nextRecord="6" numberOfRecordsMatched="17" numberOfRecordsReturned="5" recordSchema="http://www.isotc211.org/2005/gmd" elementSet="full">
+  <csw:SearchResults numberOfRecordsMatched="17" numberOfRecordsReturned="5" nextRecord="6" recordSchema="http://www.isotc211.org/2005/gmd" elementSet="full">
    <gmd:MD_Metadata xsi:schemaLocation="http://www.isotc211.org/2005/srv http://schemas.opengis.net/iso/19139/20060504/srv/srv.xsd">
 <gmd:fileIdentifier>
 <gco:CharacterString>3e9a8c05</gco:CharacterString>