Commit Graph

631 Commits

Author SHA1 Message Date
amercader ee2f9bcd24 [#97] Add GeoALchemy2 requirement
It seems like the best option for supporting both CKAN 2.2 (SQLAlchemy
0.7.x) and CKAN 2.3 (SA 0.9.x) with the same code base is to add both
GeoAlchemy and GeoALchemy2 to the requirements. As long as GeoAlchemy is
installed first, both will be installed and the SQLAlchemy install (the
CKAN requirement) won't be affected. Tested with pip 1.5.6 and 6.0.8.
2015-03-27 12:51:33 +00:00
jqnatividad 89795c4b3d Display map widget custom attribution
Fixes #87
2014-11-03 16:51:46 -05:00
David Read 7c2b42693d Merge pull request #83 from tomkralidis/master
identify pycsw as the CSW component
2014-09-10 20:52:19 +02:00
Tom Kralidis 692c3b5175 identify pycsw as the CSW component 2014-09-10 06:56:38 -04:00
Tom Kralidis da2e1100ed fix refs 2014-06-28 15:58:03 +01:00
amercader 972e1145d3 Merge branch 'tomkralidis-doc-url-fix' 2014-06-28 15:57:37 +01:00
Tom Kralidis 02f20e3522 fix refs 2014-06-27 20:33:38 -04:00
amercader 798070e74a Merge branch 'geosolutions-it-57_default_tags_extras' 2014-06-27 17:02:00 +01:00
amercader 23a83fac29 Merge branch '57_default_tags_extras' of https://github.com/geosolutions-it/ckanext-spatial into geosolutions-it-57_default_tags_extras 2014-06-27 16:10:13 +01:00
Tom Mortimer-Jones 6685085b56 Update csw.py
Fix copy paste error
2014-06-27 16:07:53 +01:00
John Brisbin 90cec1ec96 Minor clarification for template extension
When creating a minimal custom theme users may start with a blank read.html file and include only the secondary_content block. This will fail, as the template needs to start with ckan_extends.
2014-06-27 16:07:53 +01:00
John Brisbin 309062b7b6 Update spatial-search.rst
Add a clue for locating the solr schema.xml file
2014-06-27 16:07:52 +01:00
amercader 4d3dd43268 Merge branch 'morty-patch-1' 2014-06-27 16:06:26 +01:00
amercader e26aadd36a Merge branch 'patch-1' of https://github.com/morty/ckanext-spatial into morty-patch-1 2014-06-27 16:06:12 +01:00
amercader 3da0384921 Merge branch 'boabjohn-patch-2' 2014-06-27 16:05:44 +01:00
amercader d78d904a43 Merge branch 'patch-2' of https://github.com/boabjohn/ckanext-spatial into boabjohn-patch-2 2014-06-27 16:05:31 +01:00
amercader eff5f94616 Merge branch 'boabjohn-patch-1' 2014-06-27 16:05:08 +01:00
Tom Mortimer-Jones d6896d68c2 Update csw.py
Fix copy paste error
2014-06-20 12:36:04 +01:00
John Brisbin 9e3c31319d Minor clarification for template extension
When creating a minimal custom theme users may start with a blank read.html file and include only the secondary_content block. This will fail, as the template needs to start with ckan_extends.
2014-06-14 12:43:20 +10:00
John Brisbin 9b67dab3a8 Update spatial-search.rst
Add a clue for locating the solr schema.xml file
2014-06-13 21:52:33 +10:00
amercader 1d63630b0f [#69] Fix autodoc in RTD, minor doc tweaks 2014-06-11 12:23:16 +01:00
amercader 10bb6a1edb [#69] Fix autodoc in RTD, minor doc tweaks 2014-06-11 12:22:13 +01:00
amercader f1e27c717c Merge branch 'master' into release-v2.0 2014-06-10 18:17:11 +01:00
amercader b428c33ff6 [#69] Add config option to keep old behaviour (not reindex) 2014-06-10 18:08:38 +01:00
amercader 869aa3a147 Merge branch '63-extend-spatial-harvesters' 2014-06-07 19:42:32 +01:00
amercader db3e418dc6 Merge branch 'master' into release-v2.0 2014-06-07 19:41:04 +01:00
amercader dbf139e732 [#63] Added extension point for defining custom validators 2014-05-13 18:07:14 +01:00
amercader 6c55aad223 [#63] Add extra stuff to the get_package_dict extension point
Moved the call to get_site_user higher on base.py so it's available to
extensions. Also added the parsed XML etree so it does not need to be
parsed from the string again.
2014-05-13 18:03:12 +01:00
amercader 5461bebb62 Merge branch 'master' into 63-extend-spatial-harvesters 2014-05-13 17:54:44 +01:00
amercader 8dc99c5ee7 [#70] Fix deletion of harvested CSW records
The object id was pushed to the list returned by gather_stage before
being saved on the db, so None was added, causing an exception in the
Redis queue
2014-05-13 17:54:36 +01:00
amercader fa4161af87 [#70] Fix deletion of harvested CSW records
The object id was pushed to the list returned by gather_stage before
being saved on the db, so None was added, causing an exception in the
Redis queue
2014-05-13 17:53:18 +01:00
amercader b25a01029a Merge branch 'master' into 63-extend-spatial-harvesters
Conflicts:
	ckanext/spatial/harvesters/base.py
2014-05-13 15:33:04 +01:00
amercader a2758a3b30 Pass defer_commit in context on get_site_user calls
See ckan/ckan#1714. Until that is fixed properly, the `defer_commit`
flag avoids some `DetachedInstanceErrors` happening during the
harvesting.
2014-05-13 15:32:21 +01:00
amercader ab241d2530 Pass defer_commit in context on get_site_user calls
See ckan/ckan#1714. Until that is fixed properly, the `defer_commit`
flag avoids some `DetachedInstanceErrors` happening during the
harvesting.
2014-05-13 15:30:34 +01:00
amercader 57b7e51e5a Merge branch '69-reindex-dataset-no-object-change' into 63-extend-spatial-harvesters 2014-04-30 18:02:15 +01:00
amercader e979d08e77 [#69] Reindex dataset if harvest object did not change
We replace the old harvest object with the new one, and if we don't
reindex the reference to the old harvest object will remain in the
dataset dict
2014-04-30 18:01:42 +01:00
amercader e9be08d8f1 Merge branch 'master' into 63-extend-spatial-harvesters 2014-04-28 18:41:38 +01:00
Tom Kralidis a17e40c83e bump pycsw requirement to 1.8.0 which eliminates the pycsw model definition issue 2014-04-28 18:41:21 +01:00
Tobias Preuss e02fcce22f Describe how to change ownership in more detail. 2014-04-28 18:41:17 +01:00
Tobias Preuss 97a84f3b3f Avoid that url is interpretated as a pattern by zsh. 2014-04-28 18:41:14 +01:00
amercader 3938a7e8a7 [#62] Fix xpath for Alternate Title 2014-04-28 18:41:10 +01:00
amercader 9eb1a2a4c4 Merge branch 'tomkralidis-master' 2014-04-28 18:39:38 +01:00
amercader 08a40fb173 Merge branch 'master' of https://github.com/tomkralidis/ckanext-spatial into tomkralidis-master 2014-04-28 18:39:23 +01:00
amercader dc7b4d91ca Merge branch 'johnjohndoe-patch-2' 2014-04-28 18:38:54 +01:00
amercader e655b7152d Merge branch 'patch-2' of https://github.com/johnjohndoe/ckanext-spatial into johnjohndoe-patch-2 2014-04-28 18:38:39 +01:00
amercader edf244ae5e Merge branch 'johnjohndoe-patch-1' 2014-04-28 17:26:59 +01:00
amercader d37f41760a Merge branch 'patch-1' of https://github.com/johnjohndoe/ckanext-spatial into johnjohndoe-patch-1 2014-04-28 17:26:29 +01:00
amercader e19ed8100f [#62] Fix xpath for Alternate Title 2014-04-28 17:25:17 +01:00
Tom Kralidis 2c87e31721 bump pycsw requirement to 1.8.0 which eliminates the pycsw model definition issue 2014-04-09 07:41:15 -04:00
Tobias Preuss d047a90a2c Describe how to change ownership in more detail. 2014-04-09 10:43:26 +02:00