[ckan-changes] commit/ckanext-harvest: amercader: Ensure the correct configuration is used on each stage

Tue Jun 14 14:59:24 UTC 2011

1 new changeset in ckanext-harvest:

http://bitbucket.org/okfn/ckanext-harvest/changeset/d0ef16194d66/
changeset:   d0ef16194d66
user:        amercader
date:        2011-06-14 16:59:13
summary:     Ensure the correct configuration is used on each stage
affected #:  1 file (95 bytes)

--- a/ckanext/harvest/harvesters/ckanharvester.py	Tue Jun 14 12:59:48 2011 +0100
+++ b/ckanext/harvest/harvesters/ckanharvester.py	Tue Jun 14 15:59:13 2011 +0100
@@ -70,8 +70,7 @@
         get_all_packages = True
         package_ids = []
 
-        if not self.config:
-            self._set_config(harvest_job.source.config)
+        self._set_config(harvest_job.source.config)
 
         # Check if this source has been harvested before
         previous_job = Session.query(HarvestJob) \
@@ -157,8 +156,7 @@
     def fetch_stage(self,harvest_object):
         log.debug('In CKANHarvester fetch_stage')
 
-        if not self.config:
-            self._set_config(harvest_object.job.source.config)
+        self._set_config(harvest_object.job.source.config)
 
         # Get source URL
         url = harvest_object.source.url.rstrip('/')
@@ -188,8 +186,7 @@
                     harvest_object, 'Import')
             return False
 
-        if not self.config:
-           self._set_config(harvest_object.job.source.config)
+        self._set_config(harvest_object.job.source.config)
 
         try:
             package_dict = json.loads(harvest_object.content)

Repository URL: https://bitbucket.org/okfn/ckanext-harvest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


