Commit Graph

776 Commits

Author SHA1 Message Date
David Read be3e88086a Generating unique names improved
* Harvesters that change the name when the title changes have had a
  problem when the change is small and a number was unnecessarily
  appended. e.g. "Trees "->"Trees" meant _gen_new_name("Trees") returned
  "trees1". Now you can specify the existing value and it will return
  that if it still holds.
* Maximum dataset name length is now adhered to.
* To make a name unique, a sequential number is now added, since for
  users that is more understandable and pleasant. However hex digits are
  still an option, for those that want to harvest concurrently.
2015-10-01 17:53:03 +01:00
David Read 1a6dca7c00 [#148] Catch a more specific exception. 2015-10-01 12:30:40 +01:00
Adrià Mercader 89b6ad2ce1 Merge pull request #150 from raphaelstolt/templates_new-fix
[#103] Include templates_new directory
2015-09-09 11:32:57 +01:00
Raphael Stolt d9fc9bdfc6 [#103] Include fanstatic styles directory 2015-08-19 14:58:16 +02:00
Florian Mayer a6cdda0a14 set max version to 2.4.99 2015-08-19 08:41:42 +00:00
florianm 1905caa961 upgrade harvest_source_clear to not delete from authz models removed in migration 078 2015-08-19 10:25:20 +08:00
Raphael Stolt a77b62c25a [#103] Include templates_new directory 2015-08-17 12:11:45 +02:00
David Read de17e0ae8c Catch, record and recover from temporary db problems. 2015-07-22 10:25:11 +01:00
David Read 46f7b32b04 Merge branch 'master' of github.com:okfn/ckanext-harvest into migration-states 2015-07-22 10:13:55 +01:00
David Read 2da918c2e4 Fix migration for old harvests so that ones that errored are correctly marked. Added helpful comments in model. 2015-07-22 10:13:02 +01:00
amercader 83cca925c9 Merge branch 'metaodi-145-catch-no-harvesting-jobs-exception' 2015-07-21 11:16:43 +01:00
Stefan Oderbolz ab76830e85 [#145] Throw + catch a custom exception if there are no jobs to run
If there are no harvesting jobs to run, there was always an ugly
exception message when using the paster command. This replaces the ugly
output with a proper message and uses a custom exception to allow others
to deal with this error differently.
2015-07-20 18:41:50 +02:00
David Read 5801f3e083 Merge pull request #142 from metaodi/138-timezone-display
[WIP] [#138] Add data attributes to support timezone conversion
2015-07-09 22:03:18 +01:00
Stefan Oderbolz 83dd0b4b68 [#138] Add data attributes to support timezone conversion 2015-07-09 22:35:54 +02:00
David Read ce0aedd5b9 Merge pull request #140 from metaodi/139-delete-package-relationships
[#139] Delete package relationships when clearing a harvest source
2015-06-26 16:22:37 +01:00
Stefan Oderbolz 4dc2f7367d [#139] Delete package relationships when clearing a harvest source 2015-06-26 17:20:23 +02:00
amercader 955d3bb84b Merge branch 'tryggvib-master' 2015-06-15 17:40:04 +01:00
Tryggvi Bjorgvinsson 7a8fc2c67e Add Swedish translations
Harvester has been translated into Swedish. This updates the .po
file from transifex and a resulting compiled .mo file. Thanks to
translator Börje Lewin.
2015-06-15 14:28:20 +00:00
amercader 88d9ba0397 [#136] Fix broken RabbitMQ queue names
The harvester command was still using the old ones.
Use specific ones for testing.
2015-06-11 13:56:22 +01:00
amercader 673dfc9882 [#127] Use site user on the CKAN harvester
Add missing call
2015-06-11 10:38:33 +01:00
amercader d3a3f09ad1 [#127] Use site user on the CKAN harvester
To avoid having to create a 'harvest' sysadmin explicitly. It will still
be used if present, but if not the site user will be used. You can also
define to user to use via a config option.
2015-06-11 10:19:07 +01:00
amercader 84126bb821 Update README
Simplify install instructions (no need to choose a branch on
ckanext-harvest, just use master). Updated examples and paths.

Added contributing and license info.
2015-06-10 15:57:28 +01:00
amercader 5b4bff329f Merge branch 'metaodi-clear-command' 2015-06-10 15:34:13 +01:00
amercader b17c3269b5 Merge branch 'clear-command' of https://github.com/metaodi/ckanext-harvest into metaodi-clear-command 2015-06-10 15:32:37 +01:00
Stefan Oderbolz 64ff0f3a3a Use single quotes to be consistent 2015-06-10 16:22:04 +02:00
Stefan Oderbolz 2a2d85f60c Wording changes for clearsource and rmsource 2015-06-10 16:19:23 +02:00
joetsoi 92b93c53fc add some translation strings 2015-06-10 12:14:20 +01:00
Stefan Oderbolz 8ebb843052 Add documentation for clearsource command 2015-06-10 11:29:24 +02:00
Stefan Oderbolz 61bc150ae6 Expose clear harvester source as a paster command 2015-06-10 11:19:10 +02:00
joetsoi 5fbfa2a4c1 i18n: add transifex setup 2015-06-10 10:07:07 +01:00
joetsoi 56e3ef4b79 i18n setup files 2015-06-10 09:55:36 +01:00
amercader fd93a69da9 Document extra connection parameters 2015-06-01 17:55:37 +01:00
amercader 9f8aae3a18 Append site id to queue name
This allows multiple CKAN sites to share the same RabbitMQ exchange
(For the Redis backend this is handled via different Redis databases)
2015-06-01 17:54:22 +01:00
amercader 3e21ea4f82 Fix tests, set up Travis
TODO: sort out the tests properly, avoiding imports from the legacy ones
2015-04-07 13:31:45 +01:00
amercader f72d6da521 Change toolkit import
Apparently on package installs this is not well supported

from ckan.plugins.toolkit import check_ckan_version

But this works:

from ckan.plugins import toolkit

toolkit.check_ckan_version(...
2015-03-19 12:48:46 +00:00
amercader 7a20e93716 Raise on startup import errors so we don't mask problems
Otherwise if there was eg an actual ImportError we jut got

2015-03-19 12:30:08,430 DEBUG [ckanext.harvest.plugin] No auth module
for action "update"

on the log
2015-03-19 12:48:15 +00:00
Jari Voutilainen 859133fe36 move detecting unchanged datasets to ckanharvester and queue.py 2015-03-10 14:48:41 +02:00
David Read d6e9b80496 Merge pull request #118 from clementmouchet/114-remove_resource_groups
Removed ResourceGroup from query when using CKAN 2.3 or above
2015-02-24 09:56:44 +00:00
clementmouchet ead9e67a33 updated def harvest_source_clear() to delete resource views, resource revisions & resources in CKAN >= 2.3 2015-02-23 17:02:21 +00:00
Sean Hammond 07e47acea3 Add a missing command to the install docs 2015-02-13 10:43:43 +00:00
David Read b3ed6cae5a Merge pull request #121 from metaodi/120-create-remote-orgs
Fetch remote organization via action api
2015-01-15 10:49:09 +00:00
Stefan Oderbolz c1bcee9684 Use str() to get the error message 2015-01-15 11:36:15 +01:00
Stefan Oderbolz 191c39ce5c Catch the more general URLError instead of HTTPError
HTTPError is a subclass of URLError, so catch URLError is enough. I
think the HTTP error code is not as important in this situation, so
catching the more generic error seems like the best solution.
2015-01-15 10:57:24 +01:00
Stefan Oderbolz b978c26e70 Use ContentFetchError instead of generic Exception 2015-01-15 00:49:11 +01:00
Stefan Oderbolz 935b9dda01 Munge group name before fetching remote group
The API call /api/2/rest/package/<id> returns the display name of the
group instead of its ID. To properly match the group, munge the name
before calling /api/2/rest/group
2015-01-15 00:44:53 +01:00
Stefan Oderbolz ef35c21e2a Improve exception handling with custom exception
1. Try whenever possible to catch specific exceptions
2. Raise custom exception where appropriate
3. Fix the exception handling in _get_group and _get_organization
2015-01-15 00:44:45 +01:00
amercader a71cc495fb Merge branch 'metaodi-117-url-already-in-use' 2015-01-14 11:16:26 +00:00
Stefan Oderbolz 0fd38e0e54 Use _get_group as a fallback for remote orgs
First try to get a remote org from the remote Action API, if this fails
try to use the old rest api call, which works on older CKAN versions.

Only if both options fail, its currently not possible to get the remote
organization.
2015-01-14 00:10:27 +01:00
Stefan Oderbolz f214577872 Fetch remote organization via action api
Organizations used to be returned by /api/2/rest/group, this is what the
old implementation used to fetch the information to create the remote
organization on the local instance of CKAN.

With this commit the Action API is used to fetch the same information.
2015-01-13 14:46:53 +01:00
Stefan Oderbolz ea9debf714 Fix logic of conditional and make it more pythonic 2014-12-18 16:03:33 +01:00