Fix property rel missing from atom links (#790)

Author: kalxas

.gitignore

@@ -33,3 +33,4 @@ tests/results
 # visual studio code workspace
 *.code-workspace
 .vscode/settings.json
+.vscode/launch.json

pycsw/ogc/api/records.py

@@ -1015,9 +1015,11 @@ def record2json(record, url, collection, stac_item=False):
             rdl.append(link2)
 
     record_dict['links'].append({
-        'rel': 'self',
+        'rel': 'collection',
         'type': 'application/json',
         'title': 'Collection',
+        'name': 'collection',
+        'description': 'Collection',
         'href': f"{url}/collections/{collection}?f=json"
     })
 

pycsw/ogc/csw/csw3.py

@@ -1607,10 +1607,11 @@ def _write_record(self, recobj, queryables):
                 if rlinks:
                     LOGGER.info('link type: {}'.format(type(rlinks)))
                     for link in util.jsonify_links(rlinks):
-                        etree.SubElement(record,
-                        util.nspath_eval('dct:references',
-                        self.parent.context.namespaces),
-                        scheme=link['protocol']).text = link['url']
+                        ref = etree.SubElement(record, util.nspath_eval('dct:references',
+                            self.parent.context.namespaces))
+                        if link['protocol']:
+                            ref.attrib['scheme'] = link['protocol']
+                        ref.text = link['url']
 
                 for i in ['dc:relation', 'dct:modified', 'dct:abstract']:
                     val = util.getqattr(recobj, queryables[i]['dbcol'])

pycsw/opensearch.py

@@ -136,9 +136,11 @@ def _csw2_2_os(self):
 
             for rec in self.exml.xpath('//atom:entry',
                         namespaces=self.context.namespaces):
+                LOGGER.debug('Adding Atom entry')
                 node.append(rec)
             for rec in self.exml.xpath('//csw:Record|//csw:BriefRecord|//csw:SummaryRecord',
                         namespaces=self.context.namespaces):
+                LOGGER.debug('Converting CSW Record to Atom entry')
                 node.append(self.cswrecord2atom(rec))
         elif operation_name == 'Capabilities':
             node = etree.Element(util.nspath_eval('os:OpenSearchDescription', self.namespaces), nsmap=self.namespaces)
@@ -248,6 +250,7 @@ def _csw3_2_os(self):
                 node.append(rec)
 
             for rec in self.exml.xpath('//csw30:Record|//csw30:BriefRecord|//csw30:SummaryRecord', namespaces=self.context.namespaces):
+                LOGGER.debug('Converting CSW Record to Atom entry')
                 node.append(self.cswrecord2atom(rec))
 
         elif response_name == 'Capabilities':

pycsw/plugins/outputschemas/atom.py

@@ -91,11 +91,10 @@ def write_record(result, esn, context, url=None):
                 url2.attrib['title'] = link['description']
 
             if link['protocol']:
-                if link['protocol'] == 'enclosure':
-                    url2.attrib['rel'] = link['protocol']
-                    url2.attrib['type'] = 'application/octet-stream'
-                else:
-                    url2.attrib['type'] = link['protocol']
+                url2.attrib['type'] = link['protocol']
+
+            if link['function']:
+                url2.attrib['rel'] = link['function']
 
     etree.SubElement(node, util.nspath_eval('atom:link', NAMESPACES), href='%s?service=CSW&version=2.0.2&request=GetRepositoryItem&id=%s' % (url, util.getqattr(result, context.md_core_model['mappings']['pycsw:Identifier'])))