diff --git a/app.py b/app.py index 5c9884e..7d6738c 100644 --- a/app.py +++ b/app.py @@ -2,7 +2,6 @@ # See DSpace Solr docs for tips about parameters # https://wiki.duraspace.org/display/DSPACE/Solr -from config import SOLR_CORE from database import database_connection_ro import falcon from solr import solr_connection diff --git a/config.py b/config.py index b4f4fb4..b2ed17b 100644 --- a/config.py +++ b/config.py @@ -2,7 +2,6 @@ import os # Check if Solr connection information was provided in the environment SOLR_SERVER = os.environ.get('SOLR_SERVER', 'http://localhost:8080/solr') -SOLR_CORE = os.environ.get('SOLR_CORE', 'statistics') SQLITE_DB = os.environ.get('SQLITE_DB', 'statistics.db') diff --git a/contrib/dspace-statistics-api.service b/contrib/dspace-statistics-api.service index d075098..fc3d070 100644 --- a/contrib/dspace-statistics-api.service +++ b/contrib/dspace-statistics-api.service @@ -4,7 +4,6 @@ After=network.target [Service] Environment=SOLR_SERVER=http://localhost:8081/solr -Environment=SOLR_CORE=statistics User=nobody Group=nogroup WorkingDirectory=/opt/ilri/dspace-statistics-api diff --git a/contrib/dspace-statistics-indexer.service b/contrib/dspace-statistics-indexer.service index 49d0b1b..cccaff1 100644 --- a/contrib/dspace-statistics-indexer.service +++ b/contrib/dspace-statistics-indexer.service @@ -4,7 +4,6 @@ After=tomcat7.target [Service] Environment=SOLR_SERVER=http://localhost:8081/solr -Environment=SOLR_CORE=statistics User=nobody Group=nogroup WorkingDirectory=/opt/ilri/cgspace-statistics-api diff --git a/indexer.py b/indexer.py index c1a0b42..242316d 100755 --- a/indexer.py +++ b/indexer.py @@ -4,7 +4,6 @@ # See DSpace Solr docs for tips about parameters # https://wiki.duraspace.org/display/DSPACE/Solr -from config import SOLR_CORE from database import database_connection_rw from solr import solr_connection @@ -12,7 +11,7 @@ def index_views(): print("Populating database with item views.") # determine the total number of items with views (aka Solr's numFound) - res = solr.query(SOLR_CORE, { + res = solr.query('statistics', { 'q':'type:2', 'fq':'isBot:false AND statistics_type:view', 'facet':True, @@ -28,7 +27,7 @@ def index_views(): while results_current_page <= results_num_pages: print('Page {0} of {1}.'.format(results_current_page, results_num_pages)) - res = solr.query(SOLR_CORE, { + res = solr.query('statistics', { 'q':'type:2', 'fq':'isBot:false AND statistics_type:view', 'facet':True, @@ -53,7 +52,7 @@ def index_downloads(): print("Populating database with item downloads.") # determine the total number of items with downloads (aka Solr's numFound) - res = solr.query(SOLR_CORE, { + res = solr.query('statistics', { 'q':'type:0', 'fq':'isBot:false AND statistics_type:view AND bundleName:ORIGINAL', 'facet':True, @@ -69,7 +68,7 @@ def index_downloads(): while results_current_page <= results_num_pages: print('Page {0} of {1}.'.format(results_current_page, results_num_pages)) - res = solr.query(SOLR_CORE, { + res = solr.query('statistics', { 'q':'type:0', 'fq':'isBot:false AND statistics_type:view AND bundleName:ORIGINAL', 'facet':True,