Support for ISO 19115 Part 3 XML

pycsw/core/config.py

@@ -82,6 +82,7 @@ def __init__(self, prefix='csw30'):
             'gmd': 'http://www.isotc211.org/2005/gmd',
             'gml': 'http://www.opengis.net/gml',
             'gml32': 'http://www.opengis.net/gml/3.2',
+            'mdb': 'http://standards.iso.org/iso/19115/-3/mdb/2.0',
             'ogc': 'http://www.opengis.net/ogc',
             'os': 'http://a9.com/-/spec/opensearch/1.1/',
             'ows': 'http://www.opengis.net/ows',
@@ -118,7 +119,7 @@ def __init__(self, prefix='csw30'):
                 'pycsw:Metadata': 'metadata',
                 # raw metadata payload type, xml as default for now
                 'pycsw:MetadataType': 'metadata_type',
-                # bag of metadata element and attributes ONLY, no XML tages
+                # bag of metadata element and attributes ONLY, no XML tags
                 'pycsw:AnyText': 'anytext',
                 'pycsw:Language': 'language',
                 'pycsw:Title': 'title',
@@ -134,6 +135,8 @@ def __init__(self, prefix='csw30'):
                 'pycsw:Type': 'type',
                 # geometry, specified in OGC WKT
                 'pycsw:BoundingBox': 'wkt_geometry',
+                'pycsw:VertExtentMin': 'vert_extent_min',
+                'pycsw:VertExtentMax': 'vert_extent_max',
                 'pycsw:CRS': 'crs',
                 'pycsw:AlternateTitle': 'title_alternate',
                 'pycsw:RevisionDate': 'date_revision',
@@ -170,6 +173,7 @@ def __init__(self, prefix='csw30'):
                 'pycsw:Creator': 'creator',
                 'pycsw:Publisher': 'publisher',
                 'pycsw:Contributor': 'contributor',
+                'pycsw:Funder': 'funder',
                 'pycsw:Relation': 'relation',
                 'pycsw:Platform': 'platform',
                 'pycsw:Instrument': 'instrument',

pycsw/core/metadata.py

@@ -162,6 +162,9 @@ def _parse_metadata(context, repos, record):
         return [_parse_dc(context, repos, exml)]
     elif root == '{%s}DIF' % context.namespaces['dif']:  # DIF
         pass  # TODO
+    elif root == '{%s}MD_Metadata' % context.namespaces['mdb']:
+        # ISO 19115p3 XML
+        return [_parse_iso(context, repos, exml)]
     else:
         raise RuntimeError('Unsupported metadata format')
 
@@ -1361,23 +1364,29 @@ def get_value_by_language(pt_group, language, pt_type='text'):
     return recobj
 
 def _parse_iso(context, repos, exml):
+    """ Parses ISO 19139, ISO 19115p3 """
 
     from owslib.iso import MD_ImageDescription, MD_Metadata, SV_ServiceIdentification
     from owslib.iso_che import CHE_MD_Metadata
 
     recobj = repos.dataset()
     bbox = None
     links = []
+    mdmeta_ns = 'gmd'
 
     if exml.tag == '{http://www.geocat.ch/2008/che}CHE_MD_Metadata':
         md = CHE_MD_Metadata(exml)
+    elif exml.tag == '{http://standards.iso.org/iso/19115/-3/mdb/2.0}MD_Metadata':
+        from owslib.iso3 import MD_Metadata
+        md = MD_Metadata(exml)
+        mdmeta_ns = 'mdb'
     else:
         md = MD_Metadata(exml)
 
     md_identification = md.identification[0]
 
     _set(context, recobj, 'pycsw:Identifier', md.identifier)
-    _set(context, recobj, 'pycsw:Typename', 'gmd:MD_Metadata')
+    _set(context, recobj, 'pycsw:Typename', f'{mdmeta_ns}:MD_Metadata')
     _set(context, recobj, 'pycsw:Schema', context.namespaces['gmd'])
     _set(context, recobj, 'pycsw:MdSource', 'local')
     _set(context, recobj, 'pycsw:InsertDate', util.get_today_and_now())
@@ -1391,7 +1400,7 @@ 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:
+    if md.referencesystem is not None and md.referencesystem.code is not None:
         try:
             code_ = 'urn:ogc:def:crs:EPSG::%d' % int(md.referencesystem.code)
         except ValueError:
@@ -1418,11 +1427,21 @@ def _parse_iso(context, repos, exml):
         elif len(md_identification.resourcelanguagecode) > 0:
             _set(context, recobj, 'pycsw:ResourceLanguage', md_identification.resourcelanguagecode[0])
 
+        # Geographic bounding box
         if hasattr(md_identification, 'bbox'):
             bbox = md_identification.bbox
         else:
             bbox = None
 
+        # Vertical extent of a bounding box
+        if hasattr(md_identification, 'extent'):
+            if hasattr(md_identification.extent, 'vertExtMin') and \
+                md_identification.extent.vertExtMin is not None:
+                _set(context, recobj, 'pycsw:VertExtentMin', md_identification.extent.vertExtMin)
+            if hasattr(md_identification.extent, 'vertExtMax') and \
+                md_identification.extent.vertExtMax is not None:
+                _set(context, recobj, 'pycsw:VertExtentMax', md_identification.extent.vertExtMax)
+
         if (hasattr(md_identification, 'keywords') and
             len(md_identification.keywords) > 0):
             all_keywords = [item for sublist in md_identification.keywords for item in sublist.keywords if item is not None]
@@ -1432,18 +1451,27 @@ def _parse_iso(context, repos, exml):
                  json.dumps([t for t in md_identification.keywords if t.thesaurus is not None], 
                             default=lambda o: o.__dict__))
 
+        # Creator
         if (hasattr(md_identification, 'creator') and
             len(md_identification.creator) > 0):
             all_orgs = set([item.organization for item in md_identification.creator if hasattr(item, 'organization') and item.organization is not None])
             _set(context, recobj, 'pycsw:Creator', ';'.join(all_orgs))
+        # Publisher
         if (hasattr(md_identification, 'publisher') and
             len(md_identification.publisher) > 0):
             all_orgs = set([item.organization for item in md_identification.publisher if hasattr(item, 'organization') and item.organization is not None])
             _set(context, recobj, 'pycsw:Publisher', ';'.join(all_orgs))
+        # Contributor
         if (hasattr(md_identification, 'contributor') and
             len(md_identification.contributor) > 0):
             all_orgs = set([item.organization for item in md_identification.contributor if hasattr(item, 'organization') and item.organization is not None])
             _set(context, recobj, 'pycsw:Contributor', ';'.join(all_orgs))
+        # Funder
+        if (hasattr(md_identification, 'funder') and
+            len(md_identification.funder) > 0):
+            all_orgs = set([item.organization for item in md_identification.funder if hasattr(item, 'organization') and item.organization is not None])
+            _set(context, recobj, 'pycsw:Funder', ';'.join(all_orgs))
+
 
         if (hasattr(md_identification, 'contact') and
             len(md_identification.contact) > 0):
@@ -1524,18 +1552,18 @@ def _parse_iso(context, repos, exml):
 
                     _set(context, recobj, 'pycsw:Keywords', keywords)
 
-            bands = []
-            for band in ci.bands:
-                band_info = {
-                    'id': band.id,
-                    'units': band.units,
-                    'min': band.min,
-                    'max': band.max
-                }
-                bands.append(band_info)
+                bands = []
+                for band in ci.bands:
+                    band_info = {
+                        'id': band.id,
+                        'units': band.units,
+                        'min': band.min,
+                        'max': band.max
+                    }
+                    bands.append(band_info)
 
-            if len(bands) > 0:
-                _set(context, recobj, 'pycsw:Bands', json.dumps(bands))
+                if len(bands) > 0:
+                    _set(context, recobj, 'pycsw:Bands', json.dumps(bands))
 
     if hasattr(md, 'acquisition') and md.acquisition is not None:
         platform = md.acquisition.platforms[0]
@@ -1554,10 +1582,10 @@ def _parse_iso(context, repos, exml):
     if hasattr(md, 'distribution'):
         dist_links = []
         if hasattr(md.distribution, 'online'):
-            LOGGER.debug('Scanning for gmd:transferOptions element(s)')
+            LOGGER.debug(f'Scanning for {mdmeta_ns}:transferOptions element(s)')
             dist_links.extend(md.distribution.online)
         if hasattr(md.distribution, 'distributor'):
-            LOGGER.debug('Scanning for gmd:distributorTransferOptions element(s)')
+            LOGGER.debug(f'Scanning for {mdmeta_ns}:distributorTransferOptions element(s)')
             for dist_member in md.distribution.distributor:
                 dist_links.extend(dist_member.online)
         for link in dist_links:

pycsw/core/repository.py

@@ -221,7 +221,6 @@ def __init__(self, database, context, app_root=None, table='records', repo_filte
         LOGGER.info('setting repository queryables')
         # generate core queryables db and obj bindings
         self.queryables = {}
-
         for tname in self.context.model['typenames']:
             for qname in self.context.model['typenames'][tname]['queryables']:
                 self.queryables[qname] = {}
@@ -234,7 +233,8 @@ def __init__(self, database, context, app_root=None, table='records', repo_filte
         # TODO smarter way of doing this
         self.queryables['_all'] = {}
         for qbl in self.queryables:
-            self.queryables['_all'].update(self.queryables[qbl])
+            if qbl != '_all':
+                self.queryables['_all'].update(self.queryables[qbl])
 
         self.queryables['_all'].update(self.context.md_core_model['mappings'])
 
@@ -707,6 +707,7 @@ def setup(database, table, create_sfsql_tables=True, postgis_geometry_column='wk
     """Setup database tables and indexes"""
     from sqlalchemy import Column, create_engine, Integer, MetaData, \
         Table, Text, Unicode
+    from sqlalchemy.types import Float
     from sqlalchemy.orm import create_session
 
     LOGGER.info('Creating database %s', database)
@@ -816,6 +817,7 @@ def setup(database, table, create_sfsql_tables=True, postgis_geometry_column='wk
         Column('publisher', Text, index=True),
         Column('contributor', Text, index=True),
         Column('organization', Text, index=True),
+        Column('funder', Text, index=True),
 
         # security
         Column('securityconstraints', Text, index=True),
@@ -839,6 +841,8 @@ def setup(database, table, create_sfsql_tables=True, postgis_geometry_column='wk
         Column('distancevalue', Text, index=True),
         Column('distanceuom', Text, index=True),
         Column('wkt_geometry', Text),
+        Column('vert_extent_min', Float, index=True),
+        Column('vert_extent_max', Float, index=True),
 
         # service
         Column('servicetype', Text, index=True),

pycsw/plugins/profiles/iso19115p3/__init__.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# =================================================================
+#
+# Authors: Tom Kralidis <tomkralidis@gmail.com>
+#
+# Copyright (c) 2015 Tom Kralidis
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# =================================================================