Merge pull request #48 from OpenGeoscience/fix-multiple-category-keywords

Overwrite if extra keywords already exist

Author: dorukozturk

dataqs/helpers.py

@@ -381,3 +381,15 @@ def __init__(self, content):
 
     def raise_for_status(self):
         pass
+
+
+def add_keywords(keyword_list, extra_keywords):
+    """Adds extra_keywords list to the keyword_list"""
+
+    # check if datetime and category already exist in the
+    # keyword list
+    filtered_keywords = [k for k in keyword_list if not
+                         (k.startswith('category:') or
+                          k.startswith('datetime:'))]
+
+    return filtered_keywords + extra_keywords

dataqs/processor_base.py

@@ -31,7 +31,7 @@
 import requests
 from django.conf import settings
 import shutil
-from dataqs.helpers import get_html
+from dataqs.helpers import get_html, add_keywords
 from geonode.geoserver.helpers import ogc_server_settings, gs_catalog, get_store
 from geonode.geoserver.management.commands.updatelayers import Command \
     as UpdateLayersCommand
@@ -268,9 +268,11 @@ def update_geonode(self, layer_name, title="", description="",
                 gs_catalog.save(res)
             if extra_keywords:
                 assert isinstance(extra_keywords, list)
+                now = datetime.datetime.now().isoformat()
+                extra_keywords.append('datetime:{}'.format(now))
                 # Append extra keywords to the default ones
                 res = lyr.gs_resource
-                keywords = res.keywords + extra_keywords
+                keywords = add_keywords(res.keywords, extra_keywords)
                 res.keywords = keywords
                 _user, _password = ogc_server_settings.credentials
                 url = ogc_server_settings.rest