Changed pycsw version to 3.0.0-alpha4. Fixed the mapping for links fo…

…r pycsw.

geonode/base/models.py

@@ -20,6 +20,7 @@
 import os
 import re
 import html
+import json
 import math
 import uuid
 import logging
@@ -1452,16 +1453,16 @@ def set_center_zoom(self):
             except ZeroDivisionError:
                 pass
 
-    def download_links(self):
+    def download_urls(self):
         """assemble download links for pycsw"""
         links = []
         for link in self.link_set.all():
             if link.link_type == "metadata":  # avoid recursion
                 continue
             if link.link_type == "html":
-                links.append((self.title, "Web address (URL)", "WWW:LINK-1.0-http--link", link.url))
+                links.append({'name':self.title, 'description':"Web address (URL)", 'protocol':"WWW:LINK-1.0-http--link", 'url':link.url})
             elif link.link_type in ("OGC:WMS", "OGC:WFS", "OGC:WCS"):
-                links.append((self.title, link.name, link.link_type, link.url))
+                links.append({'name':self.title, 'description':link.name, 'protocol':link.link_type, 'url':link.url})
             else:
                 _link_type = "WWW:DOWNLOAD-1.0-http--download"
                 try:
@@ -1473,8 +1474,8 @@ def download_links(self):
                 except Exception as e:
                     logger.exception(e)
                 description = f"{self.title} ({link.name} Format)"
-                links.append((self.title, description, _link_type, link.url))
-        return links
+                links.append({'name':self.title, 'description':description, 'protocol':_link_type, 'url':link.url})
+        return json.dumps(links)
 
     @property
     def embed_url(self):

geonode/catalogue/backends/generic.py

@@ -216,7 +216,7 @@ def metadatarecord2dict(self, rec):
         }
 
         # locate all distribution links
-        result["download_links"] = self.extract_links(rec)
+        result["download_urls"] = self.extract_links(rec)
 
         # construct the link to the Catalogue metadata record (not
         # self-indexed)

geonode/catalogue/backends/pycsw_local_mappings.py

@@ -85,6 +85,6 @@
         "pycsw:Publisher": "publisher",
         "pycsw:Contributor": "contributor",
         "pycsw:Relation": "relation",
-        "pycsw:Links": "links",
+        "pycsw:Links": "download_urls",
     },
 }

requirements.txt

@@ -55,7 +55,7 @@ pyjwt==2.7.0
 # geopython dependencies
 pyproj<3.6.0
 OWSLib==0.29.2
--e git+https://github.com/geopython/pycsw.git#egg=pycsw
+-e git+https://github.com/geopython/pycsw.git@3.0.0-alpha4#egg=pycsw
 SQLAlchemy==2.0.15 # required by PyCSW
 Shapely==1.8.5.post1
 mercantile==1.2.1

setup.cfg

@@ -81,7 +81,7 @@ install_requires =
     # geopython dependencies
     pyproj<3.6.0
     OWSLib==0.29.2
-    pycsw @ git+https://github.com/geopython/pycsw.git@master
+    pycsw @ git+https://github.com/geopython/pycsw.git@3.0.0-alpha4
     SQLAlchemy==2.0.15 # required by PyCSW
     Shapely==1.8.5.post1
     mercantile==1.2.1