Merge pull request #258 from IATI/master

Merge master to live

docs/index.rst

@@ -33,6 +33,74 @@ Are there any limitations on the Datastore?
 
 In its current format the store allows you to filter IATI activities by publisher, organisation type, sector, or country as well as by the date of the most recent update. In future all fields will be queryable.
 
-In its current CSV format the store allows three different row outputs: where each row represents an activity, transaction or budget item. In future sub-national geographic information and results reporting will also be available.
-
++---------------------+------+------+------+
+| Query               |  XML | JSON |  CSV |
++---------------------+------+------+------+
+|iati-identifier      | yes  | yes  | yes  |
++---------------------+------+------+------+
+|reporting-org        | yes  | yes  | yes  |
++---------------------+------+------+------+
+|title                | yes  | yes  | yes  |
++---------------------+------+------+------+
+|description          | yes  | yes  | yes  |
++---------------------+------+------+------+
+|participating-org    | yes  | yes  | yes  |
++---------------------+------+------+------+
+|other-identifier     | yes  | yes  | no   |
++---------------------+------+------+------+
+|activity-status      | yes  | yes  | yes  |
++---------------------+------+------+------+
+|activity-date        | yes  | yes  | yes  |
++---------------------+------+------+------+
+|contact-info         | yes  | yes  | no   |
++---------------------+------+------+------+
+|activity-scope       | yes  | yes  | no   |
++---------------------+------+------+------+
+|recipient-country    | yes  | yes  | yes  |
++---------------------+------+------+------+
+|recipient-region     | yes  | yes  | yes  |
++---------------------+------+------+------+
+|location             | yes  | yes  | no   |
++---------------------+------+------+------+
+|sector               | yes  | yes  | yes  |
++---------------------+------+------+------+
+|country-budget-items | yes  | yes  | no   |
++---------------------+------+------+------+
+|humanitarian-scope   | yes  | yes  | no   |
++---------------------+------+------+------+
+|policy-marker        | yes  | yes  | no   |
++---------------------+------+------+------+
+|collaboration-type   | yes  | yes  | yes  |
++---------------------+------+------+------+
+|default-flow-type    | yes  | yes  | yes  |
++---------------------+------+------+------+
+|default-finance-type | yes  | yes  | yes  |
++---------------------+------+------+------+
+|default-aid-type     | yes  | yes  | yes  |
++---------------------+------+------+------+
+|default-tied-status  | yes  | yes  | yes  |
++---------------------+------+------+------+
+|budget               | yes  | yes  | no   |
++---------------------+------+------+------+
+|planned-disbursement | yes  | yes  | no   |
++---------------------+------+------+------+
+|capital-spend        | yes  | yes  | no   |
++---------------------+------+------+------+
+|transaction          | yes  | yes  | no   |
++---------------------+------+------+------+
+|document-link        | yes  | yes  | no   |
++---------------------+------+------+------+
+|related-activity     | yes  | yes  | no   |
++---------------------+------+------+------+
+|legacy-data          | yes  | yes  | no   |
++---------------------+------+------+------+
+|conditions           | yes  | yes  | no   |
++---------------------+------+------+------+
+|result               | yes  | yes  | no   |
++---------------------+------+------+------+
+|crs-add              | yes  | yes  | no   |
++---------------------+------+------+------+
+|fss                  | no   | no   | no   |
++---------------------+------+------+------+
 
+In its current CSV format the store allows three different row outputs: where each row represents an activity, transaction or budget item. In future sub-national geographic information and results reporting will also be available.

iati_datastore/iatilib/crawler.py

@@ -17,7 +17,7 @@
 log = logging.getLogger("crawler")
 
 CKAN_WEB_BASE = 'https://www.iatiregistry.org/dataset/%s'
-CKAN_API = 'https://www.iatiregistry.org/'
+CKAN_API = 'https://www.iatiregistry.org'
 
 registry = ckanapi.RemoteCKAN(CKAN_API)
 

iati_datastore/iatilib/frontend/api1.py

@@ -223,7 +223,7 @@ def get(self, format):
 
 class DataStoreCSVView(DataStoreView):
     def get(self, format=".csv"):
-        if not request.path.endswith("csv"):
+        if format != ".csv":
             abort(404)
         return self.get_response()
 

requirements.txt

@@ -12,7 +12,7 @@ iso8601==0.1.4
 lxml==3.4.1
 psycopg2==2.4.6
 python-dateutil==2.1
-six==1.2.0
+six==1.10.0
 unicodecsv==0.9.4
 voluptuous==0.7.1
 Flask-Script==0.5.3