[Closes #4029] Metadata Download Link for RemoteServices should repor…

…t the Service Type instead of a generic 'http-download' (#4030)
GeoNode · Oct 29, 2018 · fd8666b · fd8666b
1 parent aba1eb7
commit fd8666b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/geonode/base/models.py b/geonode/base/models.py
@@ -1032,11 +1032,14 @@ def download_links(self):
             elif url.link_type in ('OGC:WMS', 'OGC:WFS', 'OGC:WCS'):
                 links.append((self.title, url.name, url.link_type, url.url))
             else:
+                _link_type = 'WWW:DOWNLOAD-1.0-http--download'
+                if self.storeType == 'remoteStore':
+                    _link_type = 'WWW:DOWNLOAD-%s' % self.remote_service.type
                 description = '%s (%s Format)' % (self.title, url.name)
                 links.append(
                     (self.title,
                      description,
-                     'WWW:DOWNLOAD-1.0-http--download',
+                     _link_type,
                      url.url))
         return links
 

diff --git a/geonode/catalogue/backends/generic.py b/geonode/catalogue/backends/generic.py
@@ -409,7 +409,7 @@ def extract_links(self, rec):
             return None
 
         for link_el in rec.distribution.online:
-            if link_el.protocol == 'WWW:DOWNLOAD-1.0-http--download':
+            if 'WWW:DOWNLOAD' in link_el.protocol:
                 try:
                     extension = link_el.name.split('.')[-1]
                     format = format_re.match(link_el.description).groups()[0]