Skip to content
Permalink
Browse files

Merge pull request #1740 from geopython/MetaSearch-core-merge-no-tests

merge MetaSearch into QGIS core
  • Loading branch information
tomkralidis committed Dec 19, 2014
2 parents 984324b + e4a8fd8 commit 4b4726c8f0bb479b4e44128f44a64a6577c2a6be
@@ -0,0 +1,5 @@
- Tom Kralidis <tomkralidis@gmail.com>
- Alexander Bruy <alexander.bruy@gmail.com>
- Maxim Dubinin <sim@gis-lab.info>
- Angelos Tzotsos <gcpp.kalxas@gmail.com>
- Richard Duivenvoorde <richard@webmapper.net>
@@ -1,5 +1,5 @@
FILE(GLOB PY_FILES *.py)
PLUGIN_INSTALL(MetaSearch . ${PY_FILES} metadata.txt)
FILE(GLOB PY_FILES __init__.py link_types.py plugin.py util.py)
PLUGIN_INSTALL(MetaSearch . ${PY_FILES} metadata.txt LICENSE.txt)

FOREACH(dir ui dialogs images resources resources/templates)
FILE(GLOB _items ${dir}/*)
@@ -0,0 +1,19 @@
Copyright (C) 2010 NextGIS (http://nextgis.ru),
Alexander Bruy (alexander.bruy@gmail.com),
Maxim Dubinin (sim@gis-lab.info),

Copyright (C) 2014 Tom Kralidis (tomkralidis@gmail.com)

This source is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option)
any later version.

This code is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.

You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -83,6 +83,7 @@ def __init__(self, iface):
# form inputs
self.startfrom = 0
self.maxrecords = 10
self.timeout = 10
self.constraints = []

# Servers tab
@@ -416,6 +417,9 @@ def search(self):
self.startfrom = 0
self.maxrecords = self.spnRecords.value()

# set timeout
self.timeout = self.spnTimeout.value()

# bbox
minx = self.leWest.text()
miny = self.leSouth.text()
@@ -726,7 +730,7 @@ def show_metadata(self):

try:
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
cat = CatalogueServiceWeb(self.catalog_url)
cat = CatalogueServiceWeb(self.catalog_url, timeout=self.timeout)
cat.getrecordbyid(
[self.catalog.records[identifier].identifier])
except ExceptionReport, err:
@@ -798,7 +802,8 @@ def _get_csw(self):
# connect to the server
try:
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
self.catalog = CatalogueServiceWeb(self.catalog_url)
self.catalog = CatalogueServiceWeb(self.catalog_url,
timeout=self.timeout)
return True
except ExceptionReport, err:
msg = self.tr('Error connecting to service: %s') % err
@@ -2,16 +2,18 @@
name=MetaSearch Catalogue Client
description=MetaSearch is a QGIS plugin to interact with metadata catalogue services (CSW).
category=Web
version=0.3.1
version=0.3.2
qgisMinimumVersion=2.0
icon=images/MetaSearch.png
author=Tom Kralidis
email=tomkralidis@gmail.com
tags=web,catalogue,service,metadata,csw
homepage=http://geopython.github.io/MetaSearch
tracker=https://github.com/geopython/MetaSearch/issues
repository=https://github.com/geopython/MetaSearch.git
homepage=https://hub.qgis.org/projects/MetaSearch
tracker=https://hub.qgis.org/projects/MetaSearch/issues
repository=https://github.com/qgis/QGIS/tree/master/python/plugins/MetaSearch
experimental=False
deprecated=False
changelog=Version 0.3.1 (2014-09-03)
- fix packaging and translation
changelog=Version 0.3.2 (2014-11-04)
- fix message formatting
- add server timeout as plugin setting
- bump OWSLib dependency

0 comments on commit 4b4726c

Please sign in to comment.
You can’t perform that action at this time.