From: Alex Sadleir <maxious@lambdacomplex.org>
Date: Wed, 15 Jan 2014 23:39:40 +0000
Subject: disable harvesting fields, fix spatial XML metadata link
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-agls.git&a=commitdiff&h=9ed643373d24ad11a8c2813cca266a5b89524638
---
disable harvesting fields, fix spatial XML metadata link
---


--- a/ckanext/agls/plugin.py
+++ b/ckanext/agls/plugin.py
@@ -95,7 +95,16 @@
             'data_state': [tk.get_converter('convert_from_extras'),
                            tk.get_validator('ignore_empty')],
             'update_freq': [tk.get_converter('convert_from_extras'),
-                            tk.get_validator('ignore_empty')]
+                            tk.get_validator('ignore_empty')],
+            #harvesting fields
+            #'spatial_harvester': [tk.get_converter('convert_from_extras'),
+            #                   tk.get_validator('ignore_missing')],
+            #'harvest_object_id': [tk.get_converter('convert_from_extras'),
+            #                   tk.get_validator('ignore_missing')],
+            #'harvest_source_id': [tk.get_converter('convert_from_extras'),
+            #                   tk.get_validator('ignore_missing')],
+            #'harvest_source_title': [tk.get_converter('convert_from_extras'),
+            #                   tk.get_validator('ignore_missing')],
         })
         return schema
 
@@ -121,7 +130,17 @@
             'data_state': [tk.get_converter('convert_to_extras'),
                            tk.get_validator('not_empty')],
             'update_freq': [tk.get_converter('convert_to_extras'),
-                            tk.get_validator('not_empty')]
+                            tk.get_validator('not_empty')],
+            #harvesting fields
+            #'spatial_harvester': [tk.get_validator('ignore_missing'),
+            #                   tk.get_converter('convert_to_extras')],
+            #'harvest_object_id': [tk.get_validator('ignore_missing'),
+            #                   tk.get_converter('convert_to_extras')],
+            #'harvest_source_id': [tk.get_validator('ignore_missing'),
+            #                   tk.get_converter('convert_to_extras')],
+            #'harvest_source_title': [tk.get_validator('ignore_missing'),
+            #                   tk.get_converter('convert_to_extras')],
+
         })
         return schema
 

--- a/ckanext/agls/templates/package/read.html
+++ b/ckanext/agls/templates/package/read.html
@@ -42,6 +42,13 @@
             <th scope="row" class="dataset-label">{{ _('Source') }}</th>
             <td class="dataset-details" property="dct:source">{{ h.link_to(pkg.get('url'),
                 pkg.get('url'), rel='dct:source', target='_blank') }}
+            </td>
+        </tr>
+        {% endif %}
+        {% if  h.get_pkg_dict_extra(c.pkg_dict, 'spatial_harvester','') != '' %}
+        <tr>
+            <th scope="row" class="dataset-label">XML Metadata Document</th>
+            <td class="dataset-details">{{ h.link_to("View",h.url_for(controller='HarvestMetadataApi', action='display_xml_original', id=h.get_pkg_dict_extra(c.pkg_dict, 'harvest_object_id'))) }}
             </td>
         </tr>
         {% endif %}