From: root <root@ip-172-31-18-206.ap-southeast-2.compute.internal>
Date: Wed, 28 May 2014 01:25:29 +0000
Subject: default to inactive
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-datagovau.git&a=commitdiff&h=d77421edf80fc49da65da3f5f248245eef432b38
---
default to inactive
---


--- a/admin/autoupdate.py
+++ b/admin/autoupdate.py
@@ -1,17 +1,18 @@
 import requests
 import ckanapi
+# copy (select id,url,format,extras from resource where extras like '%"autoupdate": "active"%') TO STDOUT WITH CSV;
+# f759e4b6-723c-4863-8a26-1529d689cad8,http://data.gov.au/geoserver/geelong-roofprints-kml/wms?request=GetCapabilities,wms,"{""autoupdate"": ""active""}"
+import fileinput
 import csv
-import sys
-import psycopg2
-import json
-from subprocess import Popen, PIPE
 
-def updateresource(resource_id, dataset_id):
-    print ' --- '
-    ckan = ckanapi.RemoteCKAN(api_url,api_key)
+def updateresource(resource_id):
+    url = 'http://data.disclosurelo.gs'
+    api_key = ''
+    db_credentials = ''
+    print resource_id
+    ckan = ckanapi.RemoteCKAN('http://data.disclosurelo.gs')
     #ckan = ckanapi.RemoteCKAN('http://demo.ckan.org')
     resource = ckan.action.resource_show(id=resource_id)
-    print 'updating '+resource['name']+'('+resource_id+', '+dataset_id+')'
     print resource
     url = resource['url'] 
     #last_modified= 'Mon, 24 Feb 2014 01:48:29 GMT'
@@ -21,7 +22,6 @@
         headers['If-None-Match'] = resource['etag']
     if 'file_last_modified' in resource:
         headers["If-Modified-Since"] = resource['file_last_modified']
-    print headers
     r = requests.head(url, headers=headers)
     if r.status_code == 304:
         print 'not modified'
@@ -34,42 +34,20 @@
         if 'etag' in r.headers:
             resource['etag'] = r.headers['etag']
         #save updated resource
-        print resource
-        result = ckan.call_action('resource_update',resource)
-        if resource['format'].lower() == 'shp' or resource['format'].lower() == 'kml':
-            print "geoingest!" 
-            pargs= ['dga-spatialingestor.py', db_settings_json, api_url, api_key, dataset_id]
-            print pargs
-            p = Popen(pargs)#, stdout=PIPE, stderr=PIPE)
-            p.communicate()
+#    result = ckan.action.resource_update(id,resource)
+        if 'format' == 'shp':
+            print "geoingest!" db_settings_json, api_url, api_key, resource['dataset_id']
         else:
-            print "datapusher!"
-            # https://github.com/ckan/ckan/blob/master/ckanext/datapusher/logic/action.py#L19
-            ckan.action.datapusher_submit(resource_id=resource_id)
+            ckan.action.datapusher_submit(resource_id=id)
         
-if len(sys.argv) != 4:
-    print "autoupdate ingester. command line: postgis_url api_url api_key"
-    sys.exit(-1)
+if len(sys.argv) != 5:
+    print "spatial ingester. command line: postgis_url api_url api_key"
+    sys.exit(errno.EACCES)
 else:
     (path, db_settings_json, api_url, api_key) = sys.argv
     db_settings = json.loads(db_settings_json)
-    datastore_db_settings = dict(db_settings)
-    datastore_db_settings['dbname'] = db_settings['datastore_dbname']
-    datastore_db_settings_json = json.dumps(datastore_db_settings)
 
-try:
-    conn = psycopg2.connect(dbname=db_settings['dbname'], user=db_settings['user'], password=db_settings['password'], host=db_settings['host'])
-except:
-    failure("I am unable to connect to the database.")
-# Open a cursor to perform database operations
-cur = conn.cursor()
-conn.set_isolation_level(0)
-cur.execute('select resource.id resource_id, package.id dataset_id  from resource inner join resource_group on resource.resource_group_id = resource_group.id inner join package on resource_group.package_id = package.id where resource.extras like \'%"autoupdate": "active"%\';')
-row = cur.fetchone() 
-while row is not None:
-    updateresource(row[0],row[1])
-    # process
-    row = cur.fetchone()
-cur.close()
-conn.close()
+for line in fileinput.input():
+    row = csv.reader(line)
+    updateresource(line.replace("\n",""))
 

--- a/ckanext/datagovau/templates/package/snippets/resource_form.html
+++ b/ckanext/datagovau/templates/package/snippets/resource_form.html
@@ -21,7 +21,7 @@
 
   {% call form.input(field_url, label=url_label, id='field-image-url', placeholder=placeholder, value=data.get(field_url), error=errors.get(field_url), classes=['control-full']) %}
 <span id="autoupdate_form">
-      {% call form.select('autoupdate', label=_('Generate API from this Link'), options= [{'value': 'active', 'text': 'Active'}, {'value': 'inactive', 'text': 'Inactive'}], selected='Active', error=errors.autoupdate) %}
+      {% call form.select('autoupdate', label=_('Generate API from this Link'), options= [{'value': 'active', 'text': 'Active'}, {'value': 'inactive', 'text': 'Inactive'}], selected='Inactive', error=errors.autoupdate) %}
 <br/>
 Where a file is compatible with either CKAN or GeoServer we will attempt to make a functional end-point for this resource. The link provided above will also be checked for a new version based on the update frequency as set at the dataset level.
 </span>