From: Maxious <maxious@lambdacomplex.org>
Date: Wed, 17 Apr 2013 07:46:58 +0000
Subject: Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=f1ec192eebc80cee172262e75f02ce0a084e699b
---
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr


Former-commit-id: 49a3d73556fe6378d4b2863cbfa4d74190523969
---


--- a/admin/refreshDesignDoc.php
+++ b/admin/refreshDesignDoc.php
@@ -42,6 +42,7 @@
 $obj->views->byWebServer->map = "function(doc) {\n  emit(doc.web_server, doc);\n}";
 
 $obj->views->datasets->map = "function(doc) {\nif (doc.fieldName == \"data\") {\n  emit(doc._id, doc);\n}\n}";
+$obj->views->datasetGroups->map = "function(doc) {\nif (doc.fieldName == \"data\") {\n  doc.metadata[\"data.gov.au Category\"] && doc.metadata[\"data.gov.au Category\"].forEach(function(tag) {\n emit(tag, doc.url); \n  });\n}\n}";
 $obj->views->getValidationRequired->map = "function(doc) {\nif (doc.mime_type == \"text/html\" \n&& typeof(doc.validation) == \"undefined\") {\n  emit(doc._id, doc._attachments);\n}\n}";
 $docdb->save($obj, true);
 

--- /dev/null
+++ b/disclosr.iml
@@ -1,1 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Python" name="Python">
+      <configuration sdkName="" />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
 
+

--- /dev/null
+++ b/documents/datagov-export-groups.py
@@ -1,1 +1,79 @@
+import ckanclient
+import couchdb
+from ckanclient import CkanApiError
+import re
 
+
+class LoaderError(Exception):
+    pass
+
+# Instantiate the CKAN client.
+#ckan = ckanclient.CkanClient(base_location='http://localhost:5000/api',    api_key='b47b24cd-591d-40c1-8677-d73101d56d1b')
+api_key = 'b3ab75e4-afbb-465b-a09d-8171c8c69a7a'
+ckan = ckanclient.CkanClient(base_location='http://data.disclosurelo.gs/api',
+                             api_key=api_key)
+couch = couchdb.Server('http://127.0.0.1:5984/')
+#couch = couchdb.Server('http://192.168.1.113:5984/')
+
+# https://github.com/okfn/ckanext-importlib
+def munge(name):
+    # convert spaces to underscores
+    name = re.sub(' ', '_', name).lower()
+    # convert symbols to dashes
+    name = re.sub('[:]', '_-', name).lower()
+    name = re.sub('[/]', '-', name).lower()
+    # take out not-allowed characters
+    name = re.sub('[^a-zA-Z0-9-_]', '', name).lower()
+    # remove double underscores
+    name = re.sub('__', '_', name).lower()
+    return name
+
+
+def name_munge(input_name):
+    return munge(input_name.replace(' ', '').replace('.', '_').replace('&', 'and'))
+
+
+docsdb = couch['disclosr-documents']
+
+if __name__ == "__main__":
+    groups = {}
+    for doc in docsdb.view('app/datasetGroups'):
+            group_name = doc.key
+            pkg_name = filter(lambda x: x in '0123456789abcdefghijklmnopqrstuvwxyz-_',
+                              doc.value.replace("http://data.gov.au/dataset/", '').replace('/', '')[:100]);
+            if group_name in groups.keys():
+                groups[group_name] = list(set(groups[group_name] + [pkg_name]))
+            else:
+                groups[group_name] = [pkg_name]
+
+    # add dataset to group(s)
+    for group_name in groups.keys():
+        group_url = name_munge(group_name[:100])
+        print group_name
+        print groups[group_name]
+        try:
+            # Update the group details
+            group_entity = ckan.group_entity_get(group_url)
+            print "group "+group_name+" exists"
+            if 'packages' in group_entity.keys():
+                group_entity['packages'] = list(set(group_entity['packages'] + groups[group_name]))
+            else:
+                group_entity['packages'] = groups[group_name]
+            ckan.group_entity_put(group_entity)
+        except CkanApiError, e:
+            if ckan.last_status == 404:
+                print "group "+group_name+" does not exist, creating"
+                group_entity = {
+                    'name': group_url,
+                    'title': group_name,
+                    'description': group_name,
+                    'packages': groups[group_name]
+                }
+                #print group_entity
+                ckan.group_register_post(group_entity)
+            elif ckan.last_status == 409:
+                print "group already exists"
+            else:
+                raise LoaderError('Unexpected status %s adding to group under \'%s\': %r' % (
+                    ckan.last_status, pkg_name, e.args))
+

--- a/documents/datagov-export.py
+++ b/documents/datagov-export.py
@@ -194,43 +194,6 @@
                         ckan.last_status, pkg_name, e.args))
             pkg = ckan.package_entity_get(pkg_name)
 
-            # add dataset to group(s)
-            groups = []
-            if 'data.gov.au Category' in doc.value['metadata'].keys() and len(
-                    doc.value['metadata']['data.gov.au Category']) > 0:
-                if hasattr(doc.value['metadata']['data.gov.au Category'], '__iter__'):
-                    groups = groups + doc.value['metadata']['data.gov.au Category']
-                else:
-                    groups = groups + [doc.value['metadata']['data.gov.au Category']]
-
-            for group_name in groups:
-                group_url = name_munge(group_name[:100])
-                try:
-                    # Update the group details
-                    group_entity = ckan.group_entity_get(group_url)
-                    print "group "+group_name+" exists"
-                    if 'packages' in group_entity.keys():
-                        group_entity['packages'] = list(set(group_entity['packages'] + [pkg_name]))
-                    else:
-                        group_entity['packages'] = [pkg_name]
-                    ckan.group_entity_put(group_entity)
-                except CkanApiError, e:
-                    if ckan.last_status == 404:
-                        print "group "+group_name+" does not exist, creating"
-                        group_entity = {
-                            'name': group_url,
-                            'title': group_name,
-                            'description': group_name,
-                            'packages': [pkg_name]
-                        }
-                        #print group_entity
-                        ckan.group_register_post(group_entity)
-                    elif ckan.last_status == 409:
-                        print "group already exists"
-                    else:
-                        raise LoaderError('Unexpected status %s adding to group under \'%s\': %r' % (
-                            ckan.last_status, pkg_name, e.args))
-
             # add resources (downloadable data files)
             if 'Download' in doc.value['metadata'].keys():
                 try: