be permissive with datagov resource file size
Former-commit-id: c0a71c3c09369965e8748c2a8f7062eb2abbe01a
--- a/admin/refreshDesignDoc.php
+++ b/admin/refreshDesignDoc.php
@@ -42,7 +42,6 @@
$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);
--- a/disclosr.iml
+++ /dev/null
@@ -1,16 +1,1 @@
-<?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>
-
--- a/documents/datagov-export-groups.py
+++ /dev/null
@@ -1,81 +1,1 @@
-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
- if group_name != "Not specified":
- 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():
- if group_name != "Not specified":
- 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
@@ -10,8 +10,7 @@
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'
+api_key = 'ff34526e-f794-4068-8235-fcbba38cd8bc'
ckan = ckanclient.CkanClient(base_location='http://data.disclosurelo.gs/api',
api_key=api_key)
ckandirect = ckanapi.RemoteCKAN('http://data.disclosurelo.gs', api_key=api_key)
@@ -57,6 +56,9 @@
...
ValueError: can't interpret '12 foo'
"""
+ if s == None:
+ return 0
+ s = s.replace(',', '')
init = s
num = ""
while s and s[0:1].isdigit() or s[0:1] == '.':
@@ -133,26 +135,15 @@
doc.value['url'].replace("http://data.gov.au/dataset/", '').replace('/', '')[:100]);
print pkg_name
#add to or create organization using direct API
- agency = doc.value['metadata']["Agency"]
- if agency == "APS":
- agency = "Australian Public Service Commission"
- if agency == "Shared Services, Treasury Directorate":
- agency = "Shared Services Procurement, Treasury Directorate"
- if agency == "Treasury - Shared Services":
- agency = "Shared Services Procurement, Treasury Directorate"
- if agency == "Territory and Municipal Services (TAMS)":
- agency = "Territory and Municipal Services Directorate"
- if agency == "State Library of NSW":
- agency = "State Library of New South Wales"
- org_name = name_munge(agency[:100])
+ org_name = name_munge(doc.value['metadata']["Agency"][:100])
if org_name not in orgs_list:
orgs_list = ckandirect.action.organization_list()['result']
#print orgs_list
if org_name not in orgs_list:
try:
print "org not found, creating " + org_name
- ckandirect.action.organization_create(name=org_name, title=agency,
- description=agency)
+ ckandirect.action.organization_create(name=org_name, title=doc.value['metadata']["Agency"],
+ description=doc.value['metadata']["Agency"])
orgs_list.append(org_name)
except ckanapi.ValidationError, e:
print e
@@ -167,7 +158,6 @@
org_id = orgs_ids[org_name]
print "org id is "+org_id
tags = []
- creator = doc.value['metadata']["DCTERMS.Creator"]
if doc.value['agencyID'] == "AGIMO":
if len(doc.value['metadata']["Keywords / Tags"]) > 0:
if hasattr(doc.value['metadata']["Keywords / Tags"], '__iter__'):
@@ -177,25 +167,20 @@
tags = [re.sub('[^a-zA-Z0-9-_.]', '', tag.replace('&', 'and')).lower() for tag in tags if tag]
#print tags
- extras = []
-
- for extra_key in doc.value['metadata'].keys():
- if extra_key != "Keywords / Tags" and extra_key != "data.gov.au Category" and extra_key != "Download" :
- extras.append({'key':extra_key, 'value':doc.value['metadata'][extra_key]})
-
package_entity = {
'name': pkg_name,
'title': doc.value['metadata']['DCTERMS.Title'],
'url': doc.value['metadata']['DCTERMS.Source.URI'],
'tags': tags, #tags are mandatory?
- 'author': creator,
- 'maintainer': creator,
+ 'author': doc.value['metadata']["DCTERMS.Creator"],
+ 'maintainer': doc.value['metadata']["DCTERMS.Creator"],
'licence_id': get_licence_id(doc.value['metadata']['DCTERMS.License']),
'notes': html2text.html2text(doc.value['metadata']['Description']),
- 'owner_org': org_id,
- 'extras': extras
+ 'owner_org': org_id
+ #todo add missing key values like jurasdiction
}
-
+ if doc.value['agencyID'] == "qld":
+ package_entity = doc.value['metadata']
try:
#print package_entity
@@ -209,6 +194,42 @@
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():
@@ -225,13 +246,17 @@
format = 'xml'
if resource['format'] == '(CSV/XLS)':
format = 'csv'
+ if resource['format'] == '(Shapefile)':
+ format = 'shp'
+ if resource['format'] == '(KML/KMZ)':
+ format = 'kml'
name = resource['href']
if 'name' in resource.keys():
name = resource['name']
print resource
ckan.add_package_resource(pkg_name, resource['href'], name=name, resource_type='data',
format=format,
- size=human2bytes(resource['size'].replace(',', '')))
+ size=human2bytes(resource.get('size','0B')))
else:
print "resources already exist"
except CkanApiError, e:
--- a/documents/datagov.py
+++ b/documents/datagov.py
@@ -39,7 +39,9 @@
link = item.find("a")
format = item.find(property="dc:format")
linkobj = {"href":link['href'].replace("/bye?","").strip(),
- "format": format.string.strip(), "size": format.next_sibling.string.strip()}
+ "format": format.string.strip()}
+ if format.next_sibling.string != None:
+ linkobj["size"] = format.next_sibling.string.strip()
if link.string != None:
linkobj["name"] = link.string.strip()
doc['metadata'][last_title].append(linkobj)