[pycsw] 03/07: Imported Upstream version 1.10.3+dfsg
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Jan 24 20:32:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pycsw.
commit 9b4e94498123ff9c048e5b966001784775bf7a82
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Oct 31 21:21:23 2015 +0100
Imported Upstream version 1.10.3+dfsg
---
VERSION.txt | 2 +-
docs/administration.rst | 2 +-
docs/conf.py | 2 +-
pycsw/__init__.py | 2 +-
pycsw/admin.py | 2 +-
pycsw/config.py | 3 +++
pycsw/metadata.py | 15 +++++++++++----
pycsw/plugins/outputschemas/atom.py | 2 +-
pycsw/plugins/outputschemas/dif.py | 2 +-
pycsw/plugins/outputschemas/fgdc.py | 2 +-
pycsw/plugins/profiles/apiso/apiso.py | 18 +++++++++++-------
pycsw/plugins/profiles/ebrim/ebrim.py | 12 +++++++-----
pycsw/server.py | 14 +++++++-------
pycsw/util.py | 6 ++++--
...ite_get_9bfd17fa-15dc-4a10-8fa7-b3cff7013dd7.xml | 2 +-
...te_post_225f455a-0035-486b-a94e-fee7ae881b2b.xml | 4 ++--
...te_post_418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml | 2 +-
...te_post_420b745e-0c4b-404e-9f2d-61fa580ff05a.xml | 6 +++---
...te_post_5c5861bc-f742-40a5-9998-5342615d674b.xml | 2 +-
...te_post_73f1551c-e269-4ef9-9dae-e535b5eebfc7.xml | 2 +-
...te_post_87f2f670-9cd6-4907-b82c-1b46a7dd2a78.xml | 6 +++---
...te_post_928c1896-52d4-4ac7-9832-f98e3eb65f02.xml | 4 ++--
...te_post_948b39d5-bb4f-45b8-a8f2-4ff9501aaedd.xml | 8 ++++----
...te_post_c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml | 6 +++---
...te_post_dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml | 6 +++---
.../suites_default_get_GetRecords-sortby-asc.xml | 6 +++---
.../suites_default_get_GetRecords-sortby-desc.xml | 8 ++++----
.../suites_default_post_GetRecords-all-json.xml | 2 +-
...ites_default_post_GetRecords-all-sortby-bbox.xml | 4 ++--
.../expected/suites_default_post_GetRecords-all.xml | 2 +-
...es_default_post_GetRecords-distributedsearch.xml | 2 +-
.../expected/suites_default_post_GetRecords-end.xml | 2 +-
...default_post_GetRecords-filter-and-nested-or.xml | 2 +-
...uites_default_post_GetRecords-filter-between.xml | 4 ++--
...default_post_GetRecords-filter-or-nested-and.xml | 4 ++--
...ult_post_GetRecords-filter-or-title-abstract.xml | 2 +-
.../suites_default_post_GetRecords-requestid.xml | 2 +-
tests/expected/suites_oaipmh_get_ListRecords_dc.xml | 6 +++---
.../suites_oaipmh_get_ListRecords_oai_dc.xml | 6 +++---
.../suites_repofilter_post_GetRecords-all.xml | 4 ++--
.../Record_784e2afd-a9fd-44a6-9a92-a3848371c8ec.xml | 4 ++--
.../Record_94bc9c83-97f6-4b40-9eb8-a8e8787a5c63.xml | 4 ++--
.../Record_9a669547-b69b-469f-a11f-2d875366bbdc.xml | 4 ++--
.../Record_e9330592-0932-474b-be34-c3a3bb67c7db.xml | 4 ++--
tests/suites/cite/data/records.db | Bin 82944 -> 82944 bytes
.../post/225f455a-0035-486b-a94e-fee7ae881b2b.xml | 2 +-
.../post/418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml | 2 +-
.../post/420b745e-0c4b-404e-9f2d-61fa580ff05a.xml | 2 +-
.../post/928c1896-52d4-4ac7-9832-f98e3eb65f02.xml | 2 +-
.../post/c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml | 2 +-
.../post/dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml | 2 +-
51 files changed, 117 insertions(+), 99 deletions(-)
diff --git a/VERSION.txt b/VERSION.txt
index 5ad2491..587c5f0 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.10.2
+1.10.3
diff --git a/docs/administration.rst b/docs/administration.rst
index 573b74a..e7a5068 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -74,7 +74,7 @@ Loading Records
$ pycsw-admin.py -c load_records -f default.cfg -p /path/to/records
-This will import all ``*.xml`` records from ``/path/to/records`` into the database specified in ``default.cfg`` (``repository.database``). Passing ``-r`` to the script will process ``/path/to/records`` recursively.
+This will import all ``*.xml`` records from ``/path/to/records`` into the database specified in ``default.cfg`` (``repository.database``). Passing ``-r`` to the script will process ``/path/to/records`` recursively. Passing ``-y`` to the script will force overwrite existing metadata with the same identifier.
.. note::
Records can also be imported using CSW-T (see :ref:`transactions`).
diff --git a/docs/conf.py b/docs/conf.py
index 6b18ed4..0b46ad3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -92,7 +92,7 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-html_theme = 'default'
+html_theme = 'classic'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
diff --git a/pycsw/__init__.py b/pycsw/__init__.py
index 51b9e2d..8aba495 100644
--- a/pycsw/__init__.py
+++ b/pycsw/__init__.py
@@ -28,4 +28,4 @@
#
# =================================================================
-__version__ = '1.10.2'
+__version__ = '1.10.3'
diff --git a/pycsw/admin.py b/pycsw/admin.py
index d1206c4..c3422cd 100644
--- a/pycsw/admin.py
+++ b/pycsw/admin.py
@@ -329,7 +329,7 @@ def load_records(context, database, table, xml_dirpath, recursive=False, force_u
LOGGER.info('Processing file %s (%d of %d)', recfile, counter, total)
# read document
try:
- exml = etree.parse(recfile)
+ exml = etree.parse(recfile, context.parser)
except Exception as err:
LOGGER.warn('XML document is not well-formed: %s', str(err))
continue
diff --git a/pycsw/config.py b/pycsw/config.py
index 80ca43e..0300b6c 100644
--- a/pycsw/config.py
+++ b/pycsw/config.py
@@ -29,6 +29,7 @@
# =================================================================
import logging
+from lxml import etree
from pycsw import __version__
LOGGER = logging.getLogger(__name__)
@@ -44,6 +45,8 @@ class StaticContext(object):
self.ogc_schemas_base = 'http://schemas.opengis.net'
+ self.parser = etree.XMLParser(resolve_entities=False)
+
self.languages = {
'en': 'english',
'fr': 'french',
diff --git a/pycsw/metadata.py b/pycsw/metadata.py
index e2de548..6c0ac09 100644
--- a/pycsw/metadata.py
+++ b/pycsw/metadata.py
@@ -64,7 +64,7 @@ def parse_record(context, record, repos=None,
content = util.http_request('GET', record)
except Exception as err:
raise RuntimeError('HTTP error: %s' % str(err))
- return [_parse_dc(context, repos, etree.fromstring(content))]
+ return [_parse_dc(context, repos, etree.fromstring(content, context.parser))]
elif mtype == 'urn:geoss:waf': # WAF
LOGGER.debug('WAF detected, fetching via HTTP')
@@ -109,7 +109,7 @@ def _parse_metadata(context, repos, record):
"""parse metadata formats"""
if isinstance(record, str):
- exml = etree.fromstring(record)
+ exml = etree.fromstring(record, context.parser)
else: # already serialized to lxml
if hasattr(record, 'getroot'): # standalone document
exml = record.getroot()
@@ -221,9 +221,9 @@ def _parse_csw(context, repos, record, identifier, pagesize=10):
raise RuntimeError(md.response)
for k, v in md.records.iteritems():
if csw_typenames == 'gmd:MD_Metadata':
- recobjs.append(_parse_iso(context, repos, etree.fromstring(v.xml)))
+ recobjs.append(_parse_iso(context, repos, etree.fromstring(v.xml, context.parser)))
else:
- recobjs.append(_parse_dc(context, repos, etree.fromstring(v.xml)))
+ recobjs.append(_parse_dc(context, repos, etree.fromstring(v.xml, context.parser)))
return recobjs
@@ -945,6 +945,13 @@ def _parse_iso(context, repos, exml):
_set(context, recobj, 'pycsw:CouplingType', md.serviceidentification.couplingtype)
+ service_types = []
+ for smd in md.identificationinfo:
+ if smd.identtype == 'service' and smd.type is not None:
+ service_types.append(smd.type)
+
+ _set(context, recobj, 'pycsw:ServiceType', ','.join(service_types))
+
#if len(md.serviceidentification.operateson) > 0:
# _set(context, recobj, 'pycsw:operateson = VARCHAR(32),
#_set(context, recobj, 'pycsw:operation VARCHAR(32),
diff --git a/pycsw/plugins/outputschemas/atom.py b/pycsw/plugins/outputschemas/atom.py
index cd1b7d1..28c4d12 100644
--- a/pycsw/plugins/outputschemas/atom.py
+++ b/pycsw/plugins/outputschemas/atom.py
@@ -55,7 +55,7 @@ def write_record(result, esn, context, url=None):
if esn == 'full' and typename == 'atom:entry':
# dump record as is and exit
- return etree.fromstring(util.getqattr(result, context.md_core_model['mappings']['pycsw:XML']))
+ return etree.fromstring(util.getqattr(result, context.md_core_model['mappings']['pycsw:XML']), context.parser)
node = etree.Element(util.nspath_eval('atom:entry', NAMESPACES), nsmap=NAMESPACES)
node.attrib[util.nspath_eval('xsi:schemaLocation', context.namespaces)] = \
diff --git a/pycsw/plugins/outputschemas/dif.py b/pycsw/plugins/outputschemas/dif.py
index 46583e5..ad38aaa 100644
--- a/pycsw/plugins/outputschemas/dif.py
+++ b/pycsw/plugins/outputschemas/dif.py
@@ -58,7 +58,7 @@ def write_record(result, esn, context, url=None):
if esn == 'full' and typename == 'dif:DIF':
# dump record as is and exit
- return etree.fromstring(util.getqattr(result, context.md_core_model['mappings']['pycsw:XML']))
+ return etree.fromstring(util.getqattr(result, context.md_core_model['mappings']['pycsw:XML']), context.parser)
node = etree.Element(util.nspath_eval('dif:DIF', NAMESPACES))
node.attrib[util.nspath_eval('xsi:schemaLocation', context.namespaces)] = \
diff --git a/pycsw/plugins/outputschemas/fgdc.py b/pycsw/plugins/outputschemas/fgdc.py
index e14fb76..d16da44 100644
--- a/pycsw/plugins/outputschemas/fgdc.py
+++ b/pycsw/plugins/outputschemas/fgdc.py
@@ -59,7 +59,7 @@ def write_record(recobj, esn, context, url=None):
typename = util.getqattr(recobj, context.md_core_model['mappings']['pycsw:Typename'])
if esn == 'full' and typename == 'fgdc:metadata':
# dump record as is and exit
- return etree.fromstring(util.getqattr(recobj, context.md_core_model['mappings']['pycsw:XML']))
+ return etree.fromstring(util.getqattr(recobj, context.md_core_model['mappings']['pycsw:XML']), context.parser)
node = etree.Element('metadata')
node.attrib[util.nspath_eval('xsi:noNamespaceSchemaLocation', context.namespaces)] = \
diff --git a/pycsw/plugins/profiles/apiso/apiso.py b/pycsw/plugins/profiles/apiso/apiso.py
index fde8b63..e0307ea 100644
--- a/pycsw/plugins/profiles/apiso/apiso.py
+++ b/pycsw/plugins/profiles/apiso/apiso.py
@@ -351,9 +351,11 @@ class APISO(profile.Profile):
schemaLanguage='XMLSCHEMA', targetNamespace=self.namespace,
parentSchema='gmd.xsd')
- schema = etree.parse(os.path.join(self.context.pycsw_home,
- 'plugins', 'profiles', 'apiso', 'schemas', 'ogc', 'iso',
- '19139', '20060504', 'gmd', 'identification.xsd')).getroot()
+ schema_file = os.path.join(self.context.pycsw_home,
+ 'plugins', 'profiles', 'apiso', 'schemas', 'ogc', 'iso',
+ '19139', '20060504', 'gmd', 'identification.xsd')
+
+ schema = etree.parse(schema_file, self.context.parser).getroot()
node1.append(schema)
@@ -362,9 +364,11 @@ class APISO(profile.Profile):
schemaLanguage='XMLSCHEMA', targetNamespace=self.namespace,
parentSchema='gmd.xsd')
- schema = etree.parse(os.path.join(self.context.pycsw_home, 'plugins',
- 'profiles', 'apiso', 'schemas', 'ogc', 'iso', '19139',
- '20060504', 'srv', 'serviceMetadata.xsd')).getroot()
+ schema_file = os.path.join(self.context.pycsw_home, 'plugins',
+ 'profiles', 'apiso', 'schemas', 'ogc', 'iso', '19139',
+ '20060504', 'srv', 'serviceMetadata.xsd')
+
+ schema = etree.parse(schema_file, self.context.parser).getroot()
node2.append(schema)
@@ -385,7 +389,7 @@ class APISO(profile.Profile):
if (esn == 'full' and (typename == 'gmd:MD_Metadata' or is_iso_anyway)):
# dump record as is and exit
- return etree.fromstring(xml_blob)
+ return etree.fromstring(xml_blob, self.context.parser)
if typename == 'csw:Record': # transform csw:Record -> gmd:MD_Metadata model mappings
util.transform_mappings(queryables, self.repository['mappings']['csw:Record'])
diff --git a/pycsw/plugins/profiles/ebrim/ebrim.py b/pycsw/plugins/profiles/ebrim/ebrim.py
index 3c5dd05..3a3bd20 100644
--- a/pycsw/plugins/profiles/ebrim/ebrim.py
+++ b/pycsw/plugins/profiles/ebrim/ebrim.py
@@ -103,10 +103,12 @@ class EBRIM(profile.Profile):
util.nspath_eval('csw:SchemaComponent', self.context.namespaces),
schemaLanguage='XMLSCHEMA', targetNamespace=self.namespace)
- schema = etree.parse(os.path.join(self.context.pycsw_home,
- 'plugins', 'profiles', 'ebrim',
- 'schemas', 'ogc', 'csw', '2.0.2',
- 'profiles', 'ebrim', '1.0', 'csw-ebrim.xsd')).getroot()
+ schema_file = os.path.join(self.context.pycsw_home,
+ 'plugins', 'profiles', 'ebrim',
+ 'schemas', 'ogc', 'csw', '2.0.2',
+ 'profiles', 'ebrim', '1.0', 'csw-ebrim.xsd')
+
+ schema = etree.parse(schema_file, self.context.parser).getroot()
node.append(schema)
@@ -124,7 +126,7 @@ class EBRIM(profile.Profile):
if esn == 'full' and typename == 'rim:RegistryObject':
# dump record as is and exit
- return etree.fromstring(util.getqattr(result, queryables['pycsw:XML']['dbcol']))
+ return etree.fromstring(util.getqattr(result, queryables['pycsw:XML']['dbcol']), self.context.parser)
if typename == 'csw:Record': # transform csw:Record -> rim:RegistryObject model mappings
util.transform_mappings(queryables, self.repository['mappings']['csw:Record'])
diff --git a/pycsw/server.py b/pycsw/server.py
index 4418e48..8f2a1aa 100644
--- a/pycsw/server.py
+++ b/pycsw/server.py
@@ -1018,7 +1018,7 @@ class Csw(object):
path = os.path.join(self.config.get('server', 'home'),
'schemas', 'ogc', 'csw', '2.0.2', 'record.xsd')
- dublincore = etree.parse(path).getroot()
+ dublincore = etree.parse(path, self.context.parser).getroot()
schemacomponent.append(dublincore)
@@ -1509,7 +1509,7 @@ class Csw(object):
if isinstance(resultset, etree._Comment):
searchresults.append(resultset)
for rec in resultset:
- searchresults.append(etree.fromstring(resultset[rec].xml))
+ searchresults.append(etree.fromstring(resultset[rec].xml, self.context.parser))
if 'responsehandler' in self.kvp: # process the handler
self._process_responsehandler(etree.tostring(node,
@@ -1572,7 +1572,7 @@ class Csw(object):
LOGGER.debug('GetRepositoryItem request.')
if len(results) > 0:
return etree.fromstring(util.getqattr(results[0],
- self.context.md_core_model['mappings']['pycsw:XML']))
+ self.context.md_core_model['mappings']['pycsw:XML']), self.context.parser)
for result in results:
if (util.getqattr(result,
@@ -1937,7 +1937,7 @@ class Csw(object):
request = {}
try:
LOGGER.debug('Parsing %s.' % postdata)
- doc = etree.fromstring(postdata)
+ doc = etree.fromstring(postdata, self.context.parser)
except Exception as err:
errortext = \
'Exception: document not well-formed.\nError: %s.' % str(err)
@@ -1985,7 +1985,7 @@ class Csw(object):
doc = etree.fromstring(postdata, parser)
LOGGER.debug('Request is valid XML.')
else: # parse Transaction without validation
- doc = etree.fromstring(postdata)
+ doc = etree.fromstring(postdata, self.context.parser)
except Exception as err:
errortext = \
'Exception: the document is not valid.\nError: %s' % str(err)
@@ -2288,7 +2288,7 @@ class Csw(object):
['pycsw:Type']) != 'service'):
# dump record as is and exit
return etree.fromstring(util.getqattr(recobj,
- self.context.md_core_model['mappings']['pycsw:XML']))
+ self.context.md_core_model['mappings']['pycsw:XML']), self.context.parser)
etree.SubElement(record,
util.nspath_eval('dc:identifier', self.context.namespaces)).text = \
@@ -2533,7 +2533,7 @@ class Csw(object):
node1 = etree.SubElement(node, util.nspath_eval('csw:EchoedRequest',
self.context.namespaces))
if self.requesttype == 'POST':
- node1.append(etree.fromstring(self.request))
+ node1.append(etree.fromstring(self.request, self.context.parser))
else: # GET
node2 = etree.SubElement(node1, util.nspath_eval('ows:Get',
self.context.namespaces))
diff --git a/pycsw/util.py b/pycsw/util.py
index 718938e..8360328 100644
--- a/pycsw/util.py
+++ b/pycsw/util.py
@@ -44,6 +44,8 @@ ranking_enabled = False
ranking_pass = False
ranking_query_geometry = ''
+PARSER = etree.XMLParser(resolve_entities=False)
+
def get_today_and_now():
"""Get the date, right now, in ISO8601"""
return time.strftime('%Y-%m-%dT%H:%M:%SZ', time.localtime())
@@ -262,7 +264,7 @@ def update_xpath(nsmap, xml, recprop):
"""Update XML document XPath values"""
if isinstance(xml, unicode): # not lxml serialized yet
- xml = etree.fromstring(xml)
+ xml = etree.fromstring(xml, PARSER)
recprop = eval(recprop)
nsmap = eval(nsmap)
@@ -304,7 +306,7 @@ def get_anytext(bag):
return ' '.join(filter(None, bag)).strip()
else: # xml
if isinstance(bag, unicode) or isinstance(bag, str): # not serialized yet
- bag = etree.fromstring(bag)
+ bag = etree.fromstring(bag, PARSER)
# get all XML element content
return ' '.join([value.strip() for value in bag.xpath('//text()')])
diff --git a/tests/expected/suites_cite_get_9bfd17fa-15dc-4a10-8fa7-b3cff7013dd7.xml b/tests/expected/suites_cite_get_9bfd17fa-15dc-4a10-8fa7-b3cff7013dd7.xml
index 6b16462..df48ff9 100644
--- a/tests/expected/suites_cite_get_9bfd17fa-15dc-4a10-8fa7-b3cff7013dd7.xml
+++ b/tests/expected/suites_cite_get_9bfd17fa-15dc-4a10-8fa7-b3cff7013dd7.xml
@@ -5,7 +5,7 @@
<dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:title>Fuscé vitae ligulä</dc:title>
- <dc:date>2003-05-09Z</dc:date>
+ <dc:date>2003-05-09</dc:date>
<dc:subject>Land titles</dc:subject>
<dc:format>text/rtf</dc:format>
<dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
diff --git a/tests/expected/suites_cite_post_225f455a-0035-486b-a94e-fee7ae881b2b.xml b/tests/expected/suites_cite_post_225f455a-0035-486b-a94e-fee7ae881b2b.xml
index d11aacf..357e058 100644
--- a/tests/expected/suites_cite_post_225f455a-0035-486b-a94e-fee7ae881b2b.xml
+++ b/tests/expected/suites_cite_post_225f455a-0035-486b-a94e-fee7ae881b2b.xml
@@ -6,12 +6,12 @@
<csw:Record>
<dc:identifier>urn:uuid:94bc9c83-97f6-4b40-9eb8-a8e8787a5c63</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:784e2afd-a9fd-44a6-9a92-a3848371c8ec</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
</csw:Record>
</csw:SearchResults>
</csw:GetRecordsResponse>
diff --git a/tests/expected/suites_cite_post_418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml b/tests/expected/suites_cite_post_418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml
index 7adeba6..c3d4faf 100644
--- a/tests/expected/suites_cite_post_418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml
+++ b/tests/expected/suites_cite_post_418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml
@@ -5,7 +5,7 @@
<csw:SearchResults nextRecord="0" numberOfRecordsMatched="1" numberOfRecordsReturned="1" recordSchema="http://www.opengis.net/cat/csw/2.0.2">
<csw:Record>
<dc:identifier>urn:uuid:94bc9c83-97f6-4b40-9eb8-a8e8787a5c63</dc:identifier>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
<ows:LowerCorner>47.59 -4.1</ows:LowerCorner>
<ows:UpperCorner>51.22 0.89</ows:UpperCorner>
diff --git a/tests/expected/suites_cite_post_420b745e-0c4b-404e-9f2d-61fa580ff05a.xml b/tests/expected/suites_cite_post_420b745e-0c4b-404e-9f2d-61fa580ff05a.xml
index e4f64c8..f0a54b5 100644
--- a/tests/expected/suites_cite_post_420b745e-0c4b-404e-9f2d-61fa580ff05a.xml
+++ b/tests/expected/suites_cite_post_420b745e-0c4b-404e-9f2d-61fa580ff05a.xml
@@ -6,17 +6,17 @@
<csw:Record>
<dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:94bc9c83-97f6-4b40-9eb8-a8e8787a5c63</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:784e2afd-a9fd-44a6-9a92-a3848371c8ec</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
</csw:Record>
</csw:SearchResults>
</csw:GetRecordsResponse>
diff --git a/tests/expected/suites_cite_post_5c5861bc-f742-40a5-9998-5342615d674b.xml b/tests/expected/suites_cite_post_5c5861bc-f742-40a5-9998-5342615d674b.xml
index b5bea4f..d99a831 100644
--- a/tests/expected/suites_cite_post_5c5861bc-f742-40a5-9998-5342615d674b.xml
+++ b/tests/expected/suites_cite_post_5c5861bc-f742-40a5-9998-5342615d674b.xml
@@ -25,7 +25,7 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
diff --git a/tests/expected/suites_cite_post_73f1551c-e269-4ef9-9dae-e535b5eebfc7.xml b/tests/expected/suites_cite_post_73f1551c-e269-4ef9-9dae-e535b5eebfc7.xml
index 1067478..878206b 100644
--- a/tests/expected/suites_cite_post_73f1551c-e269-4ef9-9dae-e535b5eebfc7.xml
+++ b/tests/expected/suites_cite_post_73f1551c-e269-4ef9-9dae-e535b5eebfc7.xml
@@ -8,7 +8,7 @@
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
<dc:title>Ñunç elementum</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>44.792 -6.171</ows:LowerCorner>
<ows:UpperCorner>51.126 -2.228</ows:UpperCorner>
diff --git a/tests/expected/suites_cite_post_87f2f670-9cd6-4907-b82c-1b46a7dd2a78.xml b/tests/expected/suites_cite_post_87f2f670-9cd6-4907-b82c-1b46a7dd2a78.xml
index fb246b2..d42e882 100644
--- a/tests/expected/suites_cite_post_87f2f670-9cd6-4907-b82c-1b46a7dd2a78.xml
+++ b/tests/expected/suites_cite_post_87f2f670-9cd6-4907-b82c-1b46a7dd2a78.xml
@@ -22,7 +22,7 @@
<csw:Record>
<dc:identifier>urn:uuid:784e2afd-a9fd-44a6-9a92-a3848371c8ec</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:829babb0-b2f1-49e1-8cd5-7b489fe71a1e</dc:identifier>
@@ -35,12 +35,12 @@
<csw:Record>
<dc:identifier>urn:uuid:94bc9c83-97f6-4b40-9eb8-a8e8787a5c63</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:a06af396-3105-442d-8b40-22b57a90d2f2</dc:identifier>
diff --git a/tests/expected/suites_cite_post_928c1896-52d4-4ac7-9832-f98e3eb65f02.xml b/tests/expected/suites_cite_post_928c1896-52d4-4ac7-9832-f98e3eb65f02.xml
index 6fcf294..db055c9 100644
--- a/tests/expected/suites_cite_post_928c1896-52d4-4ac7-9832-f98e3eb65f02.xml
+++ b/tests/expected/suites_cite_post_928c1896-52d4-4ac7-9832-f98e3eb65f02.xml
@@ -6,12 +6,12 @@
<csw:Record>
<dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
- <dc:date>2003-05-09Z</dc:date>
+ <dc:date>2003-05-09</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
</csw:Record>
</csw:SearchResults>
</csw:GetRecordsResponse>
diff --git a/tests/expected/suites_cite_post_948b39d5-bb4f-45b8-a8f2-4ff9501aaedd.xml b/tests/expected/suites_cite_post_948b39d5-bb4f-45b8-a8f2-4ff9501aaedd.xml
index b8ced64..e2faa4c 100644
--- a/tests/expected/suites_cite_post_948b39d5-bb4f-45b8-a8f2-4ff9501aaedd.xml
+++ b/tests/expected/suites_cite_post_948b39d5-bb4f-45b8-a8f2-4ff9501aaedd.xml
@@ -6,22 +6,22 @@
<csw:Record>
<dc:identifier>urn:uuid:784e2afd-a9fd-44a6-9a92-a3848371c8ec</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:94bc9c83-97f6-4b40-9eb8-a8e8787a5c63</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
- <dc:date>2003-05-09Z</dc:date>
+ <dc:date>2003-05-09</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:ab42a8c4-95e8-4630-bf79-33e59241605a</dc:identifier>
diff --git a/tests/expected/suites_cite_post_c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml b/tests/expected/suites_cite_post_c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml
index 63e128a..4f6e4af 100644
--- a/tests/expected/suites_cite_post_c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml
+++ b/tests/expected/suites_cite_post_c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml
@@ -5,11 +5,11 @@
<csw:SearchResults nextRecord="0" numberOfRecordsMatched="3" numberOfRecordsReturned="3" recordSchema="http://www.opengis.net/cat/csw/2.0.2">
<csw:Record>
<dc:identifier>urn:uuid:784e2afd-a9fd-44a6-9a92-a3848371c8ec</dc:identifier>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:94bc9c83-97f6-4b40-9eb8-a8e8787a5c63</dc:identifier>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
<ows:LowerCorner>47.59 -4.1</ows:LowerCorner>
<ows:UpperCorner>51.22 0.89</ows:UpperCorner>
@@ -17,7 +17,7 @@
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
<ows:LowerCorner>44.79 -6.17</ows:LowerCorner>
<ows:UpperCorner>51.13 -2.23</ows:UpperCorner>
diff --git a/tests/expected/suites_cite_post_dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml b/tests/expected/suites_cite_post_dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml
index 1e08613..1135a17 100644
--- a/tests/expected/suites_cite_post_dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml
+++ b/tests/expected/suites_cite_post_dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml
@@ -6,17 +6,17 @@
<csw:Record>
<dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
- <dc:date>2003-05-09Z</dc:date>
+ <dc:date>2003-05-09</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:94bc9c83-97f6-4b40-9eb8-a8e8787a5c63</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
</csw:Record>
</csw:SearchResults>
</csw:GetRecordsResponse>
diff --git a/tests/expected/suites_default_get_GetRecords-sortby-asc.xml b/tests/expected/suites_default_get_GetRecords-sortby-asc.xml
index 315a1a2..d8910e3 100644
--- a/tests/expected/suites_default_get_GetRecords-sortby-asc.xml
+++ b/tests/expected/suites_default_get_GetRecords-sortby-asc.xml
@@ -32,14 +32,14 @@
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:subject>Hydrography--Dictionaries</dc:subject>
<dc:format>application/pdf</dc:format>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
<dct:abstract>Vestibulum quis ipsum sit amet metus imperdiet vehicula. Nulla scelerisque cursus mi.</dct:abstract>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:title>Fuscé vitae ligulä</dc:title>
- <dc:date>2003-05-09Z</dc:date>
+ <dc:date>2003-05-09</dc:date>
<dc:subject>Land titles</dc:subject>
<dc:format>text/rtf</dc:format>
<dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
@@ -74,7 +74,7 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
diff --git a/tests/expected/suites_default_get_GetRecords-sortby-desc.xml b/tests/expected/suites_default_get_GetRecords-sortby-desc.xml
index 7c5dc7f..6a9ff42 100644
--- a/tests/expected/suites_default_get_GetRecords-sortby-desc.xml
+++ b/tests/expected/suites_default_get_GetRecords-sortby-desc.xml
@@ -8,7 +8,7 @@
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
<dc:title>Ñunç elementum</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>44.792 -6.171</ows:LowerCorner>
<ows:UpperCorner>51.126 -2.228</ows:UpperCorner>
@@ -34,7 +34,7 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
@@ -68,7 +68,7 @@
<dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:title>Fuscé vitae ligulä</dc:title>
- <dc:date>2003-05-09Z</dc:date>
+ <dc:date>2003-05-09</dc:date>
<dc:subject>Land titles</dc:subject>
<dc:format>text/rtf</dc:format>
<dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
@@ -79,7 +79,7 @@
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:subject>Hydrography--Dictionaries</dc:subject>
<dc:format>application/pdf</dc:format>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
<dct:abstract>Vestibulum quis ipsum sit amet metus imperdiet vehicula. Nulla scelerisque cursus mi.</dct:abstract>
</csw:Record>
<csw:Record>
diff --git a/tests/expected/suites_default_post_GetRecords-all-json.xml b/tests/expected/suites_default_post_GetRecords-all-json.xml
index db4fa92..f38da6e 100644
--- a/tests/expected/suites_default_post_GetRecords-all-json.xml
+++ b/tests/expected/suites_default_post_GetRecords-all-json.xml
@@ -168,7 +168,7 @@
"tag": "dc:format"
},
{
- "text": "2006-05-12Z",
+ "text": "2006-05-12",
"tag": "dc:date"
},
{
diff --git a/tests/expected/suites_default_post_GetRecords-all-sortby-bbox.xml b/tests/expected/suites_default_post_GetRecords-all-sortby-bbox.xml
index 6d61528..31e38d7 100644
--- a/tests/expected/suites_default_post_GetRecords-all-sortby-bbox.xml
+++ b/tests/expected/suites_default_post_GetRecords-all-sortby-bbox.xml
@@ -17,7 +17,7 @@
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
<dc:title>Ñunç elementum</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>44.792 -6.171</ows:LowerCorner>
<ows:UpperCorner>51.126 -2.228</ows:UpperCorner>
@@ -29,7 +29,7 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
diff --git a/tests/expected/suites_default_post_GetRecords-all.xml b/tests/expected/suites_default_post_GetRecords-all.xml
index 0e44641..f2037f4 100644
--- a/tests/expected/suites_default_post_GetRecords-all.xml
+++ b/tests/expected/suites_default_post_GetRecords-all.xml
@@ -42,7 +42,7 @@
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:subject>Hydrography--Dictionaries</dc:subject>
<dc:format>application/pdf</dc:format>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
<dct:abstract>Vestibulum quis ipsum sit amet metus imperdiet vehicula. Nulla scelerisque cursus mi.</dct:abstract>
</csw:Record>
</csw:SearchResults>
diff --git a/tests/expected/suites_default_post_GetRecords-distributedsearch.xml b/tests/expected/suites_default_post_GetRecords-distributedsearch.xml
index 856274d..20c6177 100644
--- a/tests/expected/suites_default_post_GetRecords-distributedsearch.xml
+++ b/tests/expected/suites_default_post_GetRecords-distributedsearch.xml
@@ -4,7 +4,7 @@
<csw:SearchStatus timestamp="PYCSW_TIMESTAMP"/>
<csw:SearchResults nextRecord="0" numberOfRecordsMatched="1" numberOfRecordsReturned="1" recordSchema="http://www.opengis.net/cat/csw/2.0.2" elementSet="brief">
<!-- 1 result from http://demo.pycsw.org/gisdata/csw -->
- <csw:BriefRecord xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:wrs="http://www.opengis.net/cat/wrs/1.0">
+ <csw:BriefRecord xmlns:csw30="http://www.opengis.net/cat/csw/3.0" xmlns:fes20="http://www.opengis.net/fes/2.0" xmlns:ows11="http://www.opengis.net/ows/1.1" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0" xmlns:ows20="http://www.opengis.net/ows/2.0" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" xmlns:ebrim="http://www.opengis.net/cat/wrs/1.0" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:srv="h [...]
<dc:identifier>urn:uuid:b0a1c48a-f765-11e1-bf69-aa0000ae6bfc</dc:identifier>
<dc:title>Aquifers</dc:title>
<dc:type>vector digital data</dc:type>
diff --git a/tests/expected/suites_default_post_GetRecords-end.xml b/tests/expected/suites_default_post_GetRecords-end.xml
index c414a81..c5f0e68 100644
--- a/tests/expected/suites_default_post_GetRecords-end.xml
+++ b/tests/expected/suites_default_post_GetRecords-end.xml
@@ -21,7 +21,7 @@
<dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:title>Fuscé vitae ligulä</dc:title>
- <dc:date>2003-05-09Z</dc:date>
+ <dc:date>2003-05-09</dc:date>
<dc:subject>Land titles</dc:subject>
<dc:format>text/rtf</dc:format>
<dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
diff --git a/tests/expected/suites_default_post_GetRecords-filter-and-nested-or.xml b/tests/expected/suites_default_post_GetRecords-filter-and-nested-or.xml
index d24c0a1..d78674f 100644
--- a/tests/expected/suites_default_post_GetRecords-filter-and-nested-or.xml
+++ b/tests/expected/suites_default_post_GetRecords-filter-and-nested-or.xml
@@ -9,7 +9,7 @@
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:subject>Hydrography--Dictionaries</dc:subject>
<dc:format>application/pdf</dc:format>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
<dct:abstract>Vestibulum quis ipsum sit amet metus imperdiet vehicula. Nulla scelerisque cursus mi.</dct:abstract>
</csw:Record>
</csw:SearchResults>
diff --git a/tests/expected/suites_default_post_GetRecords-filter-between.xml b/tests/expected/suites_default_post_GetRecords-filter-between.xml
index ecf6c67..714098f 100644
--- a/tests/expected/suites_default_post_GetRecords-filter-between.xml
+++ b/tests/expected/suites_default_post_GetRecords-filter-between.xml
@@ -9,14 +9,14 @@
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:subject>Hydrography--Dictionaries</dc:subject>
<dc:format>application/pdf</dc:format>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
<dct:abstract>Vestibulum quis ipsum sit amet metus imperdiet vehicula. Nulla scelerisque cursus mi.</dct:abstract>
</csw:Record>
<csw:Record>
<dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:title>Fuscé vitae ligulä</dc:title>
- <dc:date>2003-05-09Z</dc:date>
+ <dc:date>2003-05-09</dc:date>
<dc:subject>Land titles</dc:subject>
<dc:format>text/rtf</dc:format>
<dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
diff --git a/tests/expected/suites_default_post_GetRecords-filter-or-nested-and.xml b/tests/expected/suites_default_post_GetRecords-filter-or-nested-and.xml
index 3d9cac6..9097cea 100644
--- a/tests/expected/suites_default_post_GetRecords-filter-or-nested-and.xml
+++ b/tests/expected/suites_default_post_GetRecords-filter-or-nested-and.xml
@@ -32,7 +32,7 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
@@ -43,7 +43,7 @@
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
<dc:title>Ñunç elementum</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>44.792 -6.171</ows:LowerCorner>
<ows:UpperCorner>51.126 -2.228</ows:UpperCorner>
diff --git a/tests/expected/suites_default_post_GetRecords-filter-or-title-abstract.xml b/tests/expected/suites_default_post_GetRecords-filter-or-title-abstract.xml
index 25b13ee..f9c551d 100644
--- a/tests/expected/suites_default_post_GetRecords-filter-or-title-abstract.xml
+++ b/tests/expected/suites_default_post_GetRecords-filter-or-title-abstract.xml
@@ -9,7 +9,7 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
diff --git a/tests/expected/suites_default_post_GetRecords-requestid.xml b/tests/expected/suites_default_post_GetRecords-requestid.xml
index b2de9d8..751cef1 100644
--- a/tests/expected/suites_default_post_GetRecords-requestid.xml
+++ b/tests/expected/suites_default_post_GetRecords-requestid.xml
@@ -43,7 +43,7 @@
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:subject>Hydrography--Dictionaries</dc:subject>
<dc:format>application/pdf</dc:format>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
<dct:abstract>Vestibulum quis ipsum sit amet metus imperdiet vehicula. Nulla scelerisque cursus mi.</dct:abstract>
</csw:Record>
</csw:SearchResults>
diff --git a/tests/expected/suites_oaipmh_get_ListRecords_dc.xml b/tests/expected/suites_oaipmh_get_ListRecords_dc.xml
index 490be0a..e053a29 100644
--- a/tests/expected/suites_oaipmh_get_ListRecords_dc.xml
+++ b/tests/expected/suites_oaipmh_get_ListRecords_dc.xml
@@ -86,7 +86,7 @@
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:subject>Hydrography--Dictionaries</dc:subject>
<dc:format>application/pdf</dc:format>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
<dct:abstract>Vestibulum quis ipsum sit amet metus imperdiet vehicula. Nulla scelerisque cursus mi.</dct:abstract>
</csw:Record>
</oai:metadata>
@@ -136,7 +136,7 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
@@ -156,7 +156,7 @@
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
<dc:title>Ñunç elementum</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>44.792 -6.171</ows:LowerCorner>
<ows:UpperCorner>51.126 -2.228</ows:UpperCorner>
diff --git a/tests/expected/suites_oaipmh_get_ListRecords_oai_dc.xml b/tests/expected/suites_oaipmh_get_ListRecords_oai_dc.xml
index c2a756b..5135cc1 100644
--- a/tests/expected/suites_oaipmh_get_ListRecords_oai_dc.xml
+++ b/tests/expected/suites_oaipmh_get_ListRecords_oai_dc.xml
@@ -86,7 +86,7 @@
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:subject>Hydrography--Dictionaries</dc:subject>
<dc:format>application/pdf</dc:format>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
<dct:abstract>Vestibulum quis ipsum sit amet metus imperdiet vehicula. Nulla scelerisque cursus mi.</dct:abstract>
</oai_dc:dc>
</oai:metadata>
@@ -136,7 +136,7 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
@@ -156,7 +156,7 @@
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
<dc:title>Ñunç elementum</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>44.792 -6.171</ows:LowerCorner>
<ows:UpperCorner>51.126 -2.228</ows:UpperCorner>
diff --git a/tests/expected/suites_repofilter_post_GetRecords-all.xml b/tests/expected/suites_repofilter_post_GetRecords-all.xml
index 4cfd900..a374050 100644
--- a/tests/expected/suites_repofilter_post_GetRecords-all.xml
+++ b/tests/expected/suites_repofilter_post_GetRecords-all.xml
@@ -16,7 +16,7 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
@@ -27,7 +27,7 @@
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
<dc:title>Ñunç elementum</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>44.792 -6.171</ows:LowerCorner>
<ows:UpperCorner>51.126 -2.228</ows:UpperCorner>
diff --git a/tests/suites/cite/data/Record_784e2afd-a9fd-44a6-9a92-a3848371c8ec.xml b/tests/suites/cite/data/Record_784e2afd-a9fd-44a6-9a92-a3848371c8ec.xml
index 098b126..cb2d08b 100644
--- a/tests/suites/cite/data/Record_784e2afd-a9fd-44a6-9a92-a3848371c8ec.xml
+++ b/tests/suites/cite/data/Record_784e2afd-a9fd-44a6-9a92-a3848371c8ec.xml
@@ -9,6 +9,6 @@
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:subject>Hydrography--Dictionaries</dc:subject>
<dc:format>application/pdf</dc:format>
- <dc:date>2006-05-12Z</dc:date>
+ <dc:date>2006-05-12</dc:date>
<dct:abstract>Vestibulum quis ipsum sit amet metus imperdiet vehicula. Nulla scelerisque cursus mi.</dct:abstract>
-</csw:Record>
\ No newline at end of file
+</csw:Record>
diff --git a/tests/suites/cite/data/Record_94bc9c83-97f6-4b40-9eb8-a8e8787a5c63.xml b/tests/suites/cite/data/Record_94bc9c83-97f6-4b40-9eb8-a8e8787a5c63.xml
index e2ba906..ccf590f 100644
--- a/tests/suites/cite/data/Record_94bc9c83-97f6-4b40-9eb8-a8e8787a5c63.xml
+++ b/tests/suites/cite/data/Record_94bc9c83-97f6-4b40-9eb8-a8e8787a5c63.xml
@@ -9,9 +9,9 @@
<dc:title>Mauris sed neque</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Vegetation-Cropland</dc:subject>
<dct:abstract>Curabitur lacinia, ante non porta tempus, mi lorem feugiat odio, eget suscipit eros pede ac velit.</dct:abstract>
- <dc:date>2006-03-26Z</dc:date>
+ <dc:date>2006-03-26</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>47.595 -4.097</ows:LowerCorner>
<ows:UpperCorner>51.217 0.889</ows:UpperCorner>
</ows:BoundingBox>
-</csw:Record>
\ No newline at end of file
+</csw:Record>
diff --git a/tests/suites/cite/data/Record_9a669547-b69b-469f-a11f-2d875366bbdc.xml b/tests/suites/cite/data/Record_9a669547-b69b-469f-a11f-2d875366bbdc.xml
index 117fef6..577f2c4 100644
--- a/tests/suites/cite/data/Record_9a669547-b69b-469f-a11f-2d875366bbdc.xml
+++ b/tests/suites/cite/data/Record_9a669547-b69b-469f-a11f-2d875366bbdc.xml
@@ -8,9 +8,9 @@
<dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
<dc:title>Ñunç elementum</dc:title>
<dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
- <dc:date>2005-10-24Z</dc:date>
+ <dc:date>2005-10-24</dc:date>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
<ows:LowerCorner>44.792 -6.171</ows:LowerCorner>
<ows:UpperCorner>51.126 -2.228</ows:UpperCorner>
</ows:BoundingBox>
-</csw:Record>
\ No newline at end of file
+</csw:Record>
diff --git a/tests/suites/cite/data/Record_e9330592-0932-474b-be34-c3a3bb67c7db.xml b/tests/suites/cite/data/Record_e9330592-0932-474b-be34-c3a3bb67c7db.xml
index 64cb24b..1e6bdc2 100644
--- a/tests/suites/cite/data/Record_e9330592-0932-474b-be34-c3a3bb67c7db.xml
+++ b/tests/suites/cite/data/Record_e9330592-0932-474b-be34-c3a3bb67c7db.xml
@@ -7,8 +7,8 @@
<dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
<dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
<dc:title>Fuscé vitae ligulä</dc:title>
- <dc:date>2003-05-09Z</dc:date>
+ <dc:date>2003-05-09</dc:date>
<dc:subject>Land titles</dc:subject>
<dc:format>text/rtf</dc:format>
<dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
-</csw:Record>
\ No newline at end of file
+</csw:Record>
diff --git a/tests/suites/cite/data/records.db b/tests/suites/cite/data/records.db
index 9e37584..6bbd3f1 100644
Binary files a/tests/suites/cite/data/records.db and b/tests/suites/cite/data/records.db differ
diff --git a/tests/suites/cite/post/225f455a-0035-486b-a94e-fee7ae881b2b.xml b/tests/suites/cite/post/225f455a-0035-486b-a94e-fee7ae881b2b.xml
index c7dc542..d83d488 100644
--- a/tests/suites/cite/post/225f455a-0035-486b-a94e-fee7ae881b2b.xml
+++ b/tests/suites/cite/post/225f455a-0035-486b-a94e-fee7ae881b2b.xml
@@ -8,7 +8,7 @@
<ogc:Filter>
<ogc:PropertyIsGreaterThanOrEqualTo>
<ogc:PropertyName>dc:date</ogc:PropertyName>
- <ogc:Literal>2006-03-26Z</ogc:Literal>
+ <ogc:Literal>2006-03-26</ogc:Literal>
</ogc:PropertyIsGreaterThanOrEqualTo>
</ogc:Filter>
</csw:Constraint>
diff --git a/tests/suites/cite/post/418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml b/tests/suites/cite/post/418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml
index 0afeddf..84a7fc7 100644
--- a/tests/suites/cite/post/418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml
+++ b/tests/suites/cite/post/418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml
@@ -16,7 +16,7 @@
</ogc:BBOX>
<ogc:PropertyIsGreaterThan>
<ogc:PropertyName>dc:date</ogc:PropertyName>
- <ogc:Literal>2006-01-01Z</ogc:Literal>
+ <ogc:Literal>2006-01-01</ogc:Literal>
</ogc:PropertyIsGreaterThan>
</ogc:And>
</ogc:Filter>
diff --git a/tests/suites/cite/post/420b745e-0c4b-404e-9f2d-61fa580ff05a.xml b/tests/suites/cite/post/420b745e-0c4b-404e-9f2d-61fa580ff05a.xml
index 3b741e0..f31dca0 100644
--- a/tests/suites/cite/post/420b745e-0c4b-404e-9f2d-61fa580ff05a.xml
+++ b/tests/suites/cite/post/420b745e-0c4b-404e-9f2d-61fa580ff05a.xml
@@ -8,7 +8,7 @@
<ogc:Filter>
<ogc:PropertyIsGreaterThan>
<ogc:PropertyName>dc:date</ogc:PropertyName>
- <ogc:Literal>2004-01-01Z</ogc:Literal>
+ <ogc:Literal>2004-01-01</ogc:Literal>
</ogc:PropertyIsGreaterThan>
</ogc:Filter>
</csw:Constraint>
diff --git a/tests/suites/cite/post/928c1896-52d4-4ac7-9832-f98e3eb65f02.xml b/tests/suites/cite/post/928c1896-52d4-4ac7-9832-f98e3eb65f02.xml
index 08dd22f..d1d69e9 100644
--- a/tests/suites/cite/post/928c1896-52d4-4ac7-9832-f98e3eb65f02.xml
+++ b/tests/suites/cite/post/928c1896-52d4-4ac7-9832-f98e3eb65f02.xml
@@ -8,7 +8,7 @@
<ogc:Filter>
<ogc:PropertyIsLessThanOrEqualTo>
<ogc:PropertyName>dc:date</ogc:PropertyName>
- <ogc:Literal>2005-10-24Z</ogc:Literal>
+ <ogc:Literal>2005-10-24</ogc:Literal>
</ogc:PropertyIsLessThanOrEqualTo>
</ogc:Filter>
</csw:Constraint>
diff --git a/tests/suites/cite/post/c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml b/tests/suites/cite/post/c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml
index 961e505..b58e172 100644
--- a/tests/suites/cite/post/c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml
+++ b/tests/suites/cite/post/c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml
@@ -16,7 +16,7 @@
</ogc:BBOX>
<ogc:PropertyIsGreaterThan>
<ogc:PropertyName>dc:date</ogc:PropertyName>
- <ogc:Literal>2006-01-01Z</ogc:Literal>
+ <ogc:Literal>2006-01-01</ogc:Literal>
</ogc:PropertyIsGreaterThan>
</ogc:Or>
</ogc:Filter>
diff --git a/tests/suites/cite/post/dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml b/tests/suites/cite/post/dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml
index ecf6b3a..de0ae7a 100644
--- a/tests/suites/cite/post/dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml
+++ b/tests/suites/cite/post/dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml
@@ -8,7 +8,7 @@
<ogc:Filter>
<ogc:PropertyIsLessThan>
<ogc:PropertyName>dc:date</ogc:PropertyName>
- <ogc:Literal>2006-05-01Z</ogc:Literal>
+ <ogc:Literal>2006-05-01</ogc:Literal>
</ogc:PropertyIsLessThan>
</ogc:Filter>
</csw:Constraint>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.git
More information about the Pkg-grass-devel
mailing list