Merge branch 'ODPSH-27_spatial_uri'

ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po

@@ -87,7 +87,7 @@ msgstr "Beschreibung eingeben"
 msgid "Enter tags"
 msgstr "Stichwörter eingeben"
 
-msgid "Enter spatial extension"
+msgid "Enter spatial uri"
 msgstr "Orte eingeben"
 
 msgid "Enter data"
@@ -159,9 +159,15 @@ msgstr "Letzte Änderung"
 msgid "Files"
 msgstr "Dateien"
 
-msgid "Spatial extension"
+msgid "Spatial uri"
 msgstr "Raumbezug"
 
+msgid "Spatial uri: The specified URI is not known"
+msgstr "Der räumliche Bezug is ungültig"
+
+msgid "Spatial uri: Fehlender Wert"
+msgstr "Bitte geben Sie einen räumlichen Bezug an"
+
 msgid "Beginn des Zeitraumes: Fehlender Wert"
 msgstr "Bitte wählen Sie einen Beginn des Zeitraumes aus"
 
@@ -189,9 +195,6 @@ msgstr "Bitte geben Sie einen Titel ein"
 msgid "odsh_publish_date_error_label"
 msgstr "Bitte wählen Sie ein Veröffentlichungsdatum"
 
-msgid "odsh_spatial_extension_error_label"
-msgstr "Bitte geben sie einen räumlichen Bezug an"
-
 msgid "Tag string: Fehlender Wert"
 msgstr "Bitte wählen Sie geeignete Schlagwörter"
 

ckanext/odsh/plugin.py

@@ -8,6 +8,9 @@ from ckanext.odsh.lib.uploader import ODSHResourceUpload
 import ckan.lib.helpers as helpers
 import helpers as odsh_helpers
 from routes.mapper import SubMapper
+from pylons import config
+import urllib2
+import csv
 
 import logging
 
@@ -52,6 +55,7 @@ def odsh_convert_groups_string(value,context):
 def odsh_now():
     return helpers.render_datetime(datetime.datetime.now(),"%Y-%m-%d")
 
+
 def odsh_group_id_selected(selected, group_id):
     if type(selected) is not list:
         selected=[selected]
@@ -62,6 +66,40 @@ def odsh_group_id_selected(selected, group_id):
     return False
 
 
+def known_spatial_uri(key, data, errors, context):
+    mapping_file = config.get('ckanext.odsh.spatial.mapping')
+    try:
+        mapping_file = urllib2.urlopen(mapping_file)
+    except Exception:
+        raise Exception("Could not load spatial mapping file!")
+
+    not_found = True
+    spatial_text = str()
+    spatial = str()
+    cr = csv.reader(mapping_file, delimiter="\t")
+    for row in cr:
+        if row[0] == data[key]:
+            not_found = False
+            spatial_text = row[1]
+            loaded = json.loads(row[2])
+            spatial = json.dumps(loaded['geometry'])
+            print spatial
+            break
+    if not_found:
+        raise toolkit.Invalid("The specified URI is not known")
+
+    # Get the current extras index
+    current_indexes = [k[1] for k in data.keys()
+                       if len(k) > 1 and k[0] == 'extras']
+
+    new_index = max(current_indexes) + 1 if current_indexes else 0
+
+    data[('extras', new_index, 'key')] = 'spatial_text'
+    data[('extras', new_index, 'value')] = spatial_text
+    data[('extras', new_index+1, 'key')] = 'spatial'
+    data[('extras', new_index+1, 'value')] = spatial
+
+
 class OdshIcapPlugin(plugins.SingletonPlugin):
     plugins.implements(plugins.IUploader, inherit=True)
 
@@ -165,19 +203,22 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
         return ['title','notes']
 
     def _extraFields(self):
-        ##return ['publish_date','access_constraints','temporal_start','temporal_end','spatial_extension']
-        return ['publish_date','temporal_start','temporal_end','spatial_extension']
+        return ['publish_date', 'temporal_start', 'temporal_end', 'spatial_uri']
+
     def _extraFieldsOptional(self):
         return ['access_constraints']
 
     def _update_schema(self,schema):
         for field in self._extraFields():
+            if field == 'spatial_uri':
                 schema.update({field: [
                     toolkit.get_converter('not_empty'),
                     toolkit.get_validator('ignore_missing'),
+                    toolkit.get_converter('known_spatial_uri'),
                     toolkit.get_converter('convert_to_extras')]})
-        for field in self._extraFieldsOptional():
+            else:
                 schema.update({field: [
+                    toolkit.get_converter('not_empty'),
                     toolkit.get_validator('ignore_missing'),
                     toolkit.get_converter('convert_to_extras')]})
         for field in self._fields():
@@ -220,5 +261,6 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
         return []
 
     def get_validators(self): 
-        return { 'odsh_convert_groups_string': odsh_convert_groups_string}
+        return { 'odsh_convert_groups_string': odsh_convert_groups_string,
+                 'known_spatial_uri': known_spatial_uri}
     

ckanext/odsh/templates/package/snippets/info.html

@@ -35,8 +35,8 @@ Example:
 
             {% block spatial %}
             <div class="spatial-detail info-detail">
-                <div>{{ _('Spatial extension') }}:</div>
-                {%set ext=pkg.spatial_extension if pkg.spatial_extension else '-'%}
+                <div>{{ _('Spatial uri') }}:</div>
+                {%set ext=pkg.spatial_uri if pkg.spatial_uri else '-'%}
                 <p>{{ ext }}</p>
             </div>
             {% endblock %}

ckanext/odsh/templates/package/snippets/package_basic_fields.html

@@ -155,12 +155,12 @@ is_required=true,placeholder=_('Enter title')) }}
     </div>
     {% endblock %}
 
-    <!-- field spatial_extension -->
-    {% set error_string = _('odsh_spatial_extension_error_label') if errors.spatial_extension %}
-    {{ form.input('spatial_extension', id='field-spatial-extension', label=_('Spatial extension'),
-    value=data.spatial_extension,
+    <!-- field spatial_uri -->
+    {% set error_string = _('Spatial uri' + ': '+errors.spatial_uri[0]) if errors.spatial_uri%}
+    {{ form.input('spatial_uri', id='field-spatial-uri', label=_('Spatial uri'),
+    value=data.spatial_uri,
     error=error_string, classes=['control-full'],type='text',is_required=true,
-    placeholder=_('Enter spatial extension')) }}
+    placeholder=_('Enter spatial uri')) }}
 
     <!-- field private -->
     <div class="control-group">