keep default connection list format for backward compat

qgis · Dec 10, 2021 · 6d8ec08 · 6d8ec08
1 parent 082cf9e
commit 6d8ec08
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/python/plugins/MetaSearch/dialogs/maindialog.py b/python/plugins/MetaSearch/dialogs/maindialog.py
@@ -350,7 +350,7 @@ def add_default_connections(self):
         keys = self.settings.childGroups()
         self.settings.endGroup()
 
-        for server in doc.findall('catalog'):
+        for server in doc.findall('csw'):
             name = server.attrib.get('name')
             # check for duplicates
             if name in keys:

diff --git a/python/plugins/MetaSearch/dialogs/manageconnectionsdialog.py b/python/plugins/MetaSearch/dialogs/manageconnectionsdialog.py
@@ -112,21 +112,21 @@ def populate(self):
                 self.listConnections.clear()
                 return
 
-            for catalog in doc.findall('catalog'):
+            for catalog in doc.findall('csw'):
                 item = QListWidgetItem(self.listConnections)
                 item.setText(catalog.attrib.get('name'))
 
     def save(self, connections):
         """save connections ops"""
 
-        doc = etree.Element('qgsCatalogConnections')
+        doc = etree.Element('qgsCSWConnections')
         doc.attrib['version'] = '1.0'
 
         for conn in connections:
             url = self.settings.value('/MetaSearch/%s/url' % conn)
             type_ = self.settings.value('/MetaSearch/%s/catalog-type' % conn)
             if url is not None:
-                connection = etree.SubElement(doc, 'catalog')
+                connection = etree.SubElement(doc, 'csw')
                 connection.attrib['name'] = conn
                 connection.attrib['type'] = type_ or 'OGC CSW 2.0.2'
                 connection.attrib['url'] = url
@@ -147,7 +147,7 @@ def load(self, items):
 
         exml = etree.parse(self.filename).getroot()
 
-        for catalog in exml.findall('catalog'):
+        for catalog in exml.findall('csw'):
             conn_name = catalog.attrib.get('name')
 
             # process only selected connections

diff --git a/python/plugins/MetaSearch/pavement.py b/python/plugins/MetaSearch/pavement.py
@@ -203,7 +203,7 @@ def generate_csw_connections_file():
     if not filename:
         raise ValueError('path to file of CSW URLs required')
 
-    conns = etree.Element('qgsCatalogConnections')
+    conns = etree.Element('qgsCSWConnections')
     conns.attrib['version'] = '1.0'
 
     with open(filename) as connsfh:

diff --git a/python/plugins/MetaSearch/resources/connections-default.xml b/python/plugins/MetaSearch/resources/connections-default.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Guidance: https://docs.qgis.org/testing/en/docs/user_manual/plugins/core_plugins/plugins_metasearch.html#managing-catalog-services -->
-<qgsCatalogConnections version="1.0">
-    <catalog type="OGC CSW 2.0.2" name="Danmark: National CSW (geodata-info)" url="https://geodata-info.dk/srv/dan/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Finland: National CSW (Paikkatietohakemisto)" url="http://www.paikkatietohakemisto.fi/geonetwork/srv/fi/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Iceland: National CSW (Iceland Service)" url="https://gatt.lmi.is/geonetwork/srv/eng/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Italy: National CSW (Geoportale Nazionale - Servizio di ricerca Italiano)" url="http://www.pcn.minambiente.it/geoportal/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Italy: RNDT - Repertorio Nazionale dei Dati Territoriali - Servizio di ricerca" url="https://geodati.gov.it/RNDT/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Italy: Istituto Nazionale di Geofisica e Vulcanologia (INGV)" url="https://ogc.ingv.it/csw/"/>
-    <catalog type="OGC CSW 2.0.2" name="New Zealand: LINZ Data Service" url="https://data.linz.govt.nz/services/csw/"/>
-    <catalog type="OGC CSW 2.0.2" name="Netherlands: National CSW (Nationaal Georegister)" url="http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Norway: National CSW (Geonorge)" url="http://www.geonorge.no/geonetwork/srv/no/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Sweden: National CSW" url="https://www.geodata.se/geodataportalen/srv/eng/csw-inspire"/>
-    <catalog type="OGC CSW 2.0.2" name="UK Location Catalogue Publishing Service" url="https://data.gov.uk/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="UNEP GRID-Geneva Metadata Catalog" url="https://datacore-gn.unepgrid.ch/geonetwork/srv/eng/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Portugal: Sistema Nacional de Informação Geográfica (SNIG)" url="https://snig.dgterritorio.gov.pt/rndg/srv/eng/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Spain: Centro Nacional de Información Geográfica (CNIG)" url="http://www.ign.es/csw-inspire/srv/spa/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Germany: GDI-DE Geodatenkatalog.de" url="https://gdk.gdi-de.org/gdi-de/srv/ger/csw"/>
-    <catalog type="OGC CSW 2.0.2" name="Canada: Federal Geospatial Platform-Plateforme géospatiale fédérale (FGP-PGF)" url="https://maps.canada.ca/geonetwork/srv/csw"/>
-<!-- <catalog type="OGC API - Records" name="Sample OARec entry" url="https://example.org/collections/collectionId"/> -->
-</qgsCatalogConnections>
+<qgsCSWConnections version="1.0">
+    <csw type="OGC CSW 2.0.2" name="Danmark: National CSW (geodata-info)" url="https://geodata-info.dk/srv/dan/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Finland: National CSW (Paikkatietohakemisto)" url="http://www.paikkatietohakemisto.fi/geonetwork/srv/fi/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Iceland: National CSW (Iceland Service)" url="https://gatt.lmi.is/geonetwork/srv/eng/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Italy: National CSW (Geoportale Nazionale - Servizio di ricerca Italiano)" url="http://www.pcn.minambiente.it/geoportal/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Italy: RNDT - Repertorio Nazionale dei Dati Territoriali - Servizio di ricerca" url="https://geodati.gov.it/RNDT/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Italy: Istituto Nazionale di Geofisica e Vulcanologia (INGV)" url="https://ogc.ingv.it/csw/"/>
+    <csw type="OGC CSW 2.0.2" name="New Zealand: LINZ Data Service" url="https://data.linz.govt.nz/services/csw/"/>
+    <csw type="OGC CSW 2.0.2" name="Netherlands: National CSW (Nationaal Georegister)" url="http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Norway: National CSW (Geonorge)" url="http://www.geonorge.no/geonetwork/srv/no/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Sweden: National CSW" url="https://www.geodata.se/geodataportalen/srv/eng/csw-inspire"/>
+    <csw type="OGC CSW 2.0.2" name="UK Location Catalogue Publishing Service" url="https://data.gov.uk/csw"/>
+    <csw type="OGC CSW 2.0.2" name="UNEP GRID-Geneva Metadata Catalog" url="https://datacore-gn.unepgrid.ch/geonetwork/srv/eng/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Portugal: Sistema Nacional de Informação Geográfica (SNIG)" url="https://snig.dgterritorio.gov.pt/rndg/srv/eng/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Spain: Centro Nacional de Información Geográfica (CNIG)" url="http://www.ign.es/csw-inspire/srv/spa/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Germany: GDI-DE Geodatenkatalog.de" url="https://gdk.gdi-de.org/gdi-de/srv/ger/csw"/>
+    <csw type="OGC CSW 2.0.2" name="Canada: Federal Geospatial Platform-Plateforme géospatiale fédérale (FGP-PGF)" url="https://maps.canada.ca/geonetwork/srv/csw"/>
+<!-- <csw type="OGC API - Records" name="Sample OARec entry" url="https://example.org/collections/collectionId"/> -->
+</qgsCSWConnections>
diff --git a/python/plugins/MetaSearch/util.py b/python/plugins/MetaSearch/util.py
@@ -82,7 +82,7 @@ def get_connections_from_file(parent, filename):
     error = 0
     try:
         doc = etree.parse(filename).getroot()
-        if doc.tag != 'qgsCatalogConnections':
+        if doc.tag != 'qgsCSWConnections':
             error = 1
             msg = parent.tr('Invalid Catalog connections XML.')
     except etree.ParseError as err: