CatalogueRevamping
/
spatial-d4science
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'FuhuXia-master'

This commit is contained in:
amercader 2013-09-10 11:08:51 +01:00
parent dc587356c1 f7f1a72df8
commit 949599bbfd
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ckanext/spatial/harvesters/base.py
View File

@ -238,6 +238,10 @@ class SpatialHarvester(HarvesterBase):
]: ]:
extras[name] = iso_values[name] extras[name] = iso_values[name]
if len(iso_values.get('progress', [])):
extras['progress'] = iso_values['progress'][0]
else:
extras['progress'] = ''
if len(iso_values.get('resource-type', [])): if len(iso_values.get('resource-type', [])):
extras['resource-type'] = iso_values['resource-type'][0] extras['resource-type'] = iso_values['resource-type'][0]

5
ckanext/spatial/harvesters/gemini.py
View File

@ -204,6 +204,11 @@ class GeminiHarvester(SpatialHarvester):
]: ]:
extras[name] = gemini_values[name] extras[name] = gemini_values[name]
if len(iso_values.get('progress', [])):
extras['progress'] = iso_values['progress'][0]
else:
extras['progress'] = ''
extras['resource-type'] = gemini_values['resource-type'][0] extras['resource-type'] = gemini_values['resource-type'][0]
# Use-constraints can contain values which are: # Use-constraints can contain values which are:

10
ckanext/spatial/model/harvested_metadata.py
View File

@ -481,6 +481,16 @@ class ISODocument(MappedXmlDocument):
], ],
multiplicity="0..1", multiplicity="0..1",
), ),
ISOElement(
name="progress",
search_paths=[
"gmd:identificationInfo/gmd:MD_DataIdentification/gmd:status/gmd:MD_ProgressCode/@codeListValue",
"gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:status/gmd:MD_ProgressCode/@codeListValue",
"gmd:identificationInfo/gmd:MD_DataIdentification/gmd:status/gmd:MD_ProgressCode/text()",
"gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:status/gmd:MD_ProgressCode/text()",
],
multiplicity="*",
),
ISOElement( ISOElement(
name="keyword-inspire-theme", name="keyword-inspire-theme",
search_paths=[ search_paths=[