CHANGELOG.md: Release version 0.2.1

This comment was added when I first began the application and the
testing status is documented in the README now.

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.1] - 2018-09-24
+### Changed
+- Environment settings in example systemd unit files
+- Use psycopg2.extras.DictCursor for PostgreSQL connection
+
 ## [0.2.0] - 2018-09-24
 ### Changed
 - Use PostgreSQL instead of SQLite because UPSERT support needs a very new libsqlite3 whereas it's already in PostgreSQL 9.5+

app.py

@@ -1,7 +1,3 @@
-# Tested with Python 3.6
-# See DSpace Solr docs for tips about parameters
-# https://wiki.duraspace.org/display/DSPACE/Solr
-
 from database import database_connection
 import falcon
 from solr import solr_connection
@@ -25,7 +21,7 @@ class AllItemsResource:
         pages = round(cursor.fetchone()[0] / limit)
 
         # get statistics, ordered by id, and use limit and offset to page through results
-        cursor.execute('SELECT id, views, downloads FROM items ORDER BY id ASC LIMIT {0} OFFSET {1}'.format(limit, offset))
+        cursor.execute('SELECT id, views, downloads FROM items ORDER BY id ASC LIMIT {} OFFSET {}'.format(limit, offset))
         results = cursor.fetchmany(limit)
         cursor.close()
 
@@ -50,7 +46,7 @@ class ItemResource:
         """Handles GET requests"""
 
         cursor = db.cursor()
-        cursor.execute('SELECT views, downloads FROM items WHERE id={0}'.format(item_id))
+        cursor.execute('SELECT views, downloads FROM items WHERE id={}'.format(item_id))
         results = cursor.fetchone()
         cursor.close()
 

contrib/dspace-statistics-api.service

@@ -3,7 +3,10 @@ Description=DSpace Statistics API
 After=network.target
 
 [Service]
-Environment=SOLR_SERVER=http://localhost:8081/solr
+Environment=DATABASE_NAME=dspacestatistics
+Environment=DATABASE_USER=dspacestatistics
+Environment=DATABASE_PASS=dspacestatistics
+Environment=DATABASE_HOST=localhost
 User=nobody
 Group=nogroup
 WorkingDirectory=/opt/ilri/dspace-statistics-api

contrib/dspace-statistics-indexer.service

@@ -4,6 +4,10 @@ After=tomcat7.target
 
 [Service]
 Environment=SOLR_SERVER=http://localhost:8081/solr
+Environment=DATABASE_NAME=dspacestatistics
+Environment=DATABASE_USER=dspacestatistics
+Environment=DATABASE_PASS=dspacestatistics
+Environment=DATABASE_HOST=localhost
 User=nobody
 Group=nogroup
 WorkingDirectory=/opt/ilri/dspace-statistics-api

database.py

@@ -3,9 +3,10 @@ from config import DATABASE_USER
 from config import DATABASE_PASS
 from config import DATABASE_HOST
 import psycopg2
+import psycopg2.extras
 
 def database_connection():
-    connection = psycopg2.connect("dbname={} user={} password={} host='{}'".format(DATABASE_NAME, DATABASE_USER, DATABASE_PASS, DATABASE_HOST))
+    connection = psycopg2.connect("dbname={} user={} password={} host='{}'".format(DATABASE_NAME, DATABASE_USER, DATABASE_PASS, DATABASE_HOST), cursor_factory=psycopg2.extras.DictCursor)
 
     return connection
 

indexer.py

@@ -55,7 +55,7 @@ def index_views():
     cursor = db.cursor()
 
     while results_current_page <= results_num_pages:
-        print('Page {0} of {1}.'.format(results_current_page, results_num_pages))
+        print('Page {} of {}.'.format(results_current_page, results_num_pages))
 
         res = solr.query('statistics', {
             'q':'type:2',
@@ -102,7 +102,7 @@ def index_downloads():
     cursor = db.cursor()
 
     while results_current_page <= results_num_pages:
-        print('Page {0} of {1}.'.format(results_current_page, results_num_pages))
+        print('Page {} of {}.'.format(results_current_page, results_num_pages))
 
         res = solr.query('statistics', {
             'q':'type:0',