Merge branch 'master' of github.com:okfn/ckan

ckan/config/routing.py

@@ -25,7 +25,7 @@ def make_map():
     DELETE = dict(method=['DELETE'])
     GET_POST = dict(method=['GET', 'POST'])
     PUT_POST = dict(method=['PUT','POST'])
-    GET_POST_DELETE = dict(method=['GET', 'POST', 'DELETE'])
+    PUT_POST_DELETE = dict(method=['PUT', 'POST', 'DELETE'])
     OPTIONS = dict(method=['OPTIONS'])
 
     from ckan.lib.plugins import register_package_plugins
@@ -139,7 +139,7 @@ def make_map():
             m.connect('datastore_read', '/api/data/{id}{url:(/.*)?}',
                       action='read', url='', conditions=GET)
             m.connect('datastore_write', '/api/data/{id}{url:(/.*)?}',
-                      action='write', url='', conditions=GET_POST_DELETE)
+                      action='write', url='', conditions=PUT_POST_DELETE)
 
 
     map.redirect('/packages', '/dataset')

ckan/lib/dictization/__init__.py

@@ -46,6 +46,11 @@ def table_dictize(obj, context, **kw):
 
     result_dict.update(kw)
 
+    ##HACK For optimisation to get metadata_modified created faster.
+
+    context['metadata_modified'] = max(result_dict.get('revision_timestamp', ''),
+                                       context.get('metadata_modified', ''))
+
     return result_dict
 
 

ckan/lib/dictization/model_dictize.py

@@ -40,9 +40,10 @@ def resource_list_dictize(res_list, context):
     active = context.get('active', True)
     result_list = []
     for res in res_list:
+        resource_dict = resource_dictize(res, context)
         if active and res.state not in ('active', 'pending'):
             continue
-        result_list.append(resource_dictize(res, context))
+        result_list.append(resource_dict)
 
     return sorted(result_list, key=lambda x: x["position"])
 
@@ -65,9 +66,9 @@ def extras_list_dictize(extras_list, context):
     result_list = []
     active = context.get('active', True)
     for extra in extras_list:
+        dictized = d.table_dictize(extra, context)
         if active and extra.state not in ('active', 'pending'):
             continue
-        dictized = d.table_dictize(extra, context)
         value = dictized["value"]
         if not(context.get("extras_as_string") and isinstance(value, basestring)):
             dictized["value"] = h.json.dumps(value)
@@ -205,11 +206,10 @@ def package_dictize(pkg, context):
         result_dict['license_title']= pkg.license_id
 
     # creation and modification date
-    result_dict['metadata_modified'] = pkg.metadata_modified.isoformat() \
-        if pkg.metadata_modified else None
+    result_dict['metadata_modified'] = context.pop('metadata_modified')
     result_dict['metadata_created'] = pkg.metadata_created.isoformat() \
         if pkg.metadata_created else None
-
+        
     if context.get('for_view'):
         for item in plugins.PluginImplementations(plugins.IPackageController):
             result_dict = item.before_view(result_dict)
@@ -366,14 +366,6 @@ def package_to_api(pkg, context):
     if site_url:
         dictized['ckan_url'] = '%s/dataset/%s' % (site_url, pkg.name)
 
-    metadata_modified = pkg.metadata_modified
-    dictized['metadata_modified'] = metadata_modified.isoformat() \
-        if metadata_modified else None
-
-    metadata_created = pkg.metadata_created
-    dictized['metadata_created'] = metadata_created.isoformat() \
-        if metadata_created else None
-
     for resource in dictized["resources"]:
         resource_dict_to_api(resource, pkg.id, context)
 

ckan/model/package.py

@@ -584,12 +584,12 @@ def get_groups(self, group_type=None, capacity=None):
     @property
     def metadata_created(self):
         import ckan.model as model
-        q = model.Session.query(model.PackageRevision)\
+        q = model.Session.query(model.PackageRevision.revision_timestamp)\
             .filter(model.PackageRevision.id == self.id)\
             .order_by(model.PackageRevision.revision_timestamp.asc())
         ts = q.first()
-        if ts is not None:
-            return ts.revision_timestamp
+        if ts:
+            return ts[0]
 
     @staticmethod
     def get_fields(core_only=False, fields_to_ignore=None):