Merge branch 'master' into enh-1726-harvesting-model-update
This commit is contained in:
commit
50537a6738
|
@ -151,6 +151,11 @@ field. The currently supported configuration options are:
|
||||||
created from this harvesting source. Logged in users and visitors will be
|
created from this harvesting source. Logged in users and visitors will be
|
||||||
only able to read them.
|
only able to read them.
|
||||||
|
|
||||||
|
* force_all: By default, after the first harvesting, the harvester will gather
|
||||||
|
only the modified packages from the remote site since the last harvesting.
|
||||||
|
Setting this property to true will force the harvester to gather all remote
|
||||||
|
packages regardless of the modification date. Default is False.
|
||||||
|
|
||||||
Here is an example of a configuration object (the one that must be entered in
|
Here is an example of a configuration object (the one that must be entered in
|
||||||
the configuration field)::
|
the configuration field)::
|
||||||
|
|
||||||
|
|
|
@ -99,6 +99,11 @@ class CKANHarvester(HarvesterBase):
|
||||||
except NotFound,e:
|
except NotFound,e:
|
||||||
raise ValueError('User not found')
|
raise ValueError('User not found')
|
||||||
|
|
||||||
|
for key in ('read_only','force_all'):
|
||||||
|
if key in config_obj:
|
||||||
|
if not isinstance(config_obj[key],bool):
|
||||||
|
raise ValueError('%s must be boolean' % key)
|
||||||
|
|
||||||
except ValueError,e:
|
except ValueError,e:
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
|
@ -125,7 +130,8 @@ class CKANHarvester(HarvesterBase):
|
||||||
base_rest_url = base_url + self._get_rest_api_offset()
|
base_rest_url = base_url + self._get_rest_api_offset()
|
||||||
base_search_url = base_url + self._get_search_api_offset()
|
base_search_url = base_url + self._get_search_api_offset()
|
||||||
|
|
||||||
if previous_job and not previous_job.gather_errors and not len(previous_job.objects) == 0:
|
if (previous_job and not previous_job.gather_errors and not len(previous_job.objects) == 0) \
|
||||||
|
or not self.config.get('force_all',False):
|
||||||
get_all_packages = False
|
get_all_packages = False
|
||||||
|
|
||||||
# Request only the packages modified since last harvest job
|
# Request only the packages modified since last harvest job
|
||||||
|
|
Loading…
Reference in New Issue