CatalogueRevamping
/
harvester-d4science
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pysolr-compatibility'

This commit is contained in:
amercader 2016-05-11 10:10:33 +01:00
parent 67bd5046df 623fca5f80
commit 45513c1a38
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ckanext/harvest/logic/action/update.py
View File

@ -5,7 +5,6 @@ import logging
import datetime import datetime
from pylons import config from pylons import config
from paste.deploy.converters import asbool
from sqlalchemy import and_, or_ from sqlalchemy import and_, or_
from ckan.lib.search.index import PackageSearchIndex from ckan.lib.search.index import PackageSearchIndex
@ -249,15 +248,26 @@ def harvest_source_index_clear(context, data_dict):
conn = make_connection() conn = make_connection()
query = ''' +%s:"%s" +site_id:"%s" ''' % ( query = ''' +%s:"%s" +site_id:"%s" ''' % (
'harvest_source_id', harvest_source_id, config.get('ckan.site_id')) 'harvest_source_id', harvest_source_id, config.get('ckan.site_id'))
solr_commit = toolkit.asbool(config.get('ckan.search.solr_commit', 'true'))
if toolkit.check_ckan_version(max_version='2.5.99'):
# conn is solrpy
try: try:
conn.delete_query(query) conn.delete_query(query)
if asbool(config.get('ckan.search.solr_commit', 'true')): if solr_commit:
conn.commit() conn.commit()
except Exception, e: except Exception, e:
log.exception(e) log.exception(e)
raise SearchIndexError(e) raise SearchIndexError(e)
finally: finally:
conn.close() conn.close()
else:
# conn is pysolr
try:
conn.delete(q=query, commit=solr_commit)
except Exception, e:
log.exception(e)
raise SearchIndexError(e)
return {'id': harvest_source_id} return {'id': harvest_source_id}