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

Revert "#276 Coupled Resource - fix to not show withdrawn packages in list of coupled resources." 

Reverting changes for "#276 Coupled Resource" on master as it is INSPIRE-specific. Moving to datagovuk/ckanext-spatial branch dgu.

This reverts commit 3f627d9700.
This commit is contained in:
David Read 2013-02-04 16:00:34 +00:00
parent 27c4ee81e2
commit 84b75ea759
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ckanext/spatial/harvesters.py
View File

@ -64,8 +64,6 @@ debug_exception_mode = bool(os.getenv('DEBUG'))
class SpatialHarvester(object): class SpatialHarvester(object):
# Q: Why does this not inherit from HarvesterBase in ckanext-harvest? # Q: Why does this not inherit from HarvesterBase in ckanext-harvest?
# A: HarvesterBase just provides some useful util methods. The key thing
# a harvester does is it implements(IHarvester).
def _is_wms(self,url): def _is_wms(self,url):
try: try:

8
ckanext/spatial/lib/helpers.py
View File

@ -12,9 +12,7 @@ def get_coupled_packages(pkg):
coupled_packages = \ coupled_packages = \
[(couple.service_record.name, couple.service_record.title) \ [(couple.service_record.name, couple.service_record.title) \
for couple in coupled_resources \ for couple in coupled_resources \
if couple.service_record_package_id and \ if couple.service_record_package_id]
couple.service_record and \
couple.service_record.state == 'active']
return coupled_packages return coupled_packages
elif res_type == 'service': elif res_type == 'service':
@ -23,8 +21,6 @@ def get_coupled_packages(pkg):
coupled_packages = \ coupled_packages = \
[(couple.dataset_record.name, couple.dataset_record.title) \ [(couple.dataset_record.name, couple.dataset_record.title) \
for couple in coupled_resources \ for couple in coupled_resources \
if couple.dataset_record_package_id and \ if couple.dataset_record_package_id]
couple.dataset_record and \
couple.dataset_record.state == 'active']
return coupled_packages return coupled_packages