Skip to content

Commit

Permalink
do not translate log messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomkralidis @nyalldawson
tomkralidis authored and nyalldawson committed Oct 3, 2024
1 parent e9695d8 commit afb31e6
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 44 deletions.
9 changes: 3 additions & 6 deletions python/plugins/MetaSearch/plugin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def initGui(self):
"""startup"""

# run
log_message(QCoreApplication.translate(
'MetaSearch', 'Initializing plugin'), Qgis.Info)
log_message('Initializing plugin', Qgis.Info)

run_icon = QIcon('{}/{}'.format(self.context.ppath, 'images/MetaSearch.svg'))
self.action_run = QAction(run_icon, 'MetaSearch',
Expand Down Expand Up @@ -83,8 +82,7 @@ def initGui(self):
def unload(self):
"""teardown"""

log_message(QCoreApplication.translate(
'MetaSearch', 'Unloading plugin'), Qgis.Info)
log_message('Unloading plugin', Qgis.Info)

# remove the plugin menu item and icon
self.iface.removePluginWebMenu(self.web_menu, self.action_run)
Expand All @@ -94,8 +92,7 @@ def unload(self):
def run(self):
"""open MetaSearch"""

log_message(QCoreApplication.translate(
'MetaSearch', 'Running plugin'), Qgis.Info)
log_message('Running plugin', Qgis.Info)

self.dialog.exec()

Expand Down
56 changes: 18 additions & 38 deletions python/plugins/MetaSearch/search_backend.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
from owslib.csw import CatalogueServiceWeb # spellok

from qgis.core import Qgis
from qgis.PyQt.QtCore import QCoreApplication

if owslib.__version__ < '0.25':
OWSLIB_OAREC_SUPPORTED = False
Expand Down Expand Up @@ -89,8 +88,7 @@ def __init__(self, url, timeout, username, password, auth):
self.record_info_template = 'record_metadata_dc.html'
self.constraints = []

log_message(QCoreApplication.translate(
'MetaSearch', f'Connecting to CSW: {self.url}'), Qgis.Info)
log_message(f'Connecting to CSW: {self.url}', Qgis.Info)
self.conn = CatalogueServiceWeb(self.url, # spellok
timeout=self.timeout,
username=self.username,
Expand All @@ -108,34 +106,28 @@ def query_records(self, bbox=[], keywords=None, limit=10, offset=1):
# even for a global bbox, if a spatial filter is applied, then
# the CSW server will skip records without a bbox
if bbox and bbox != ['-180', '-90', '180', '90']:
log_message(QCoreApplication.translate(
'MetaSearch', f'Setting bbox filter ({bbox})'), Qgis.Info)
log_message(f'Setting bbox filter ({bbox})', Qgis.Info)
minx, miny, maxx, maxy = bbox
self.constraints.append(BBox([miny, minx, maxy, maxx],
crs='urn:ogc:def:crs:EPSG::4326'))

# keywords
if keywords:
# TODO: handle multiple word searches
log_message(QCoreApplication.translate(
'MetaSearch', f'Setting csw:AnyText filter {keywords}'),
Qgis.Info)
log_message(f'Setting csw:AnyText filter {keywords}', Qgis.Info)
self.constraints.append(PropertyIsLike('csw:AnyText', keywords))

if len(self.constraints) > 1: # exclusive search (a && b)
self.constraints = [self.constraints]

log_message(QCoreApplication.translate(
'MetaSearch', f'Searching CSW: {self.url}'), Qgis.Info)
log_message('Searching CSW: {self.url}', Qgis.Info)
self.conn.getrecords2(constraints=self.constraints, maxrecords=limit,
startposition=offset, esn='full')

self.matches = self.conn.results['matches']
self.returned = self.conn.results['returned']
log_message(QCoreApplication.translate(
'MetaSearch', f'Matches: {self.matches}'), Qgis.Info)
log_message(QCoreApplication.translate(
'MetaSearch', f'Returned: {self.returned}'), Qgis.Info)
log_message(f'Matches: {self.matches}', Qgis.Info)
log_message(f'Returned: {self.returned}', Qgis.Info)

self.request = self.conn.request
self.response = self.conn.response
Expand Down Expand Up @@ -169,9 +161,7 @@ def records(self):
return recs

def get_record(self, identifier):
log_message(QCoreApplication.translate(
'MetaSearch', f'Searching CSW for record: {identifier}'),
Qgis.Info)
log_message(f'Searching CSW for record: {identifier}', Qgis.Info)
self.conn.getrecordbyid([identifier])

return self.conn.records[identifier]
Expand All @@ -195,8 +185,7 @@ def __init__(self, url, timeout, auth):
self.record_collection = None

if '/collections/' in self.url: # catalog is a collection
log_message(QCoreApplication.translate(
'MetaSearch', 'OARec endpoint is a collection'), Qgis.Info)
log_message('OARec endpoint is a collection', Qgis.Info)
self.base_url, self.record_collection = self.url.split('/collections/') # noqa
self.conn = Records(
self.base_url, timeout=self.timeout, auth=self.auth)
Expand All @@ -209,8 +198,7 @@ def __init__(self, url, timeout, auth):
pass
self.request = self.conn.request
else:
log_message(QCoreApplication.translate(
'MetaSearch', 'OARec endpoint is not a collection'), Qgis.Info)
log_message('OARec endpoint is not a collection', Qgis.Info)
self.conn = Records(self.url, timeout=self.timeout, auth=self.auth)
self.request = None

Expand All @@ -228,26 +216,21 @@ def query_records(self, bbox=[], keywords=None, limit=10, offset=1):
}

if keywords:
log_message(QCoreApplication.translate(
'MetaSearch', f'Setting keyword search {keywords}'), Qgis.Info)
log_message(f'Setting keyword search {keywords}', Qgis.Info)
params['q'] = keywords
if bbox and bbox != ['-180', '-90', '180', '90']:
log_message(QCoreApplication.translate(
'MetaSearch', f'Setting bbox search {bbox}'), Qgis.Info)
log_message(f'Setting bbox search {bbox}', Qgis.Info)
params['bbox'] = bbox

log_message(QCoreApplication.translate(
'MetaSearch', f'Searching OARec: {self.url}'), Qgis.Info)
log_message(f'Searching OARec: {self.url}', Qgis.Info)
self.response = self.conn.collection_items(**params)

self.matches = self.response.get('numberMatched', 0)
self.returned = self.response.get('numberReturned', 0)
self.request = self.conn.request

log_message(QCoreApplication.translate(
'MetaSearch', f'Matches: {self.matches}'), Qgis.Info)
log_message(QCoreApplication.translate(
'MetaSearch', f'Returned: {self.returned}'), Qgis.Info)
log_message(f'Matches: {self.matches}', Qgis.Info)
log_message(f'Returned: {self.returned}', Qgis.Info)

def records(self):
recs = []
Expand Down Expand Up @@ -276,9 +259,8 @@ def records(self):
return recs

def get_record(self, identifier):
log_message(QCoreApplication.translate(
'MetaSearch', f'Searching OARec endpoint for item {identifier}'),
Qgis.Info)
log_message(f'Searching OARec endpoint for item {identifier}',
Qgis.Info)
return self.conn.collection_item(self.record_collection, identifier)

def parse_link(self, link):
Expand All @@ -297,12 +279,10 @@ def parse_link(self, link):
def get_catalog_service(url, catalog_type, timeout, username, password,
auth=None):
if catalog_type in [None, CATALOG_TYPES[0]]:
log_message(QCoreApplication.translate(
'MetaSearch', 'CSW endpoint detected'), Qgis.Info)
log_message('CSW endpoint detected', Qgis.Info)
return CSW202Search(url, timeout, username, password, auth)
elif catalog_type == CATALOG_TYPES[1]:
log_message(QCoreApplication.translate(
'MetaSearch', 'OARec endpoint detected'), Qgis.Info)
log_message('OARec endpoint detected', Qgis.Info)
if not OWSLIB_OAREC_SUPPORTED:
raise ValueError("OGC API - Records requires OWSLib 0.25 or above")
return OARecSearch(url, timeout, auth)
Expand Down

0 comments on commit afb31e6

Please sign in to comment.