Fixes #350

geonode/contrib/worldmap/gazetteer/models.py

@@ -1,7 +1,8 @@
 from django.utils.translation import ugettext as _
 from django.contrib.gis.db import models
+from django.db.models import signals
 
-from geonode.layers.models import Attribute
+from geonode.layers.models import Layer, Attribute
 
 # Querying postgis database for features then saving as django model object is
 # significantly slower than doing everything via SQL on postgis database only.
@@ -43,3 +44,11 @@ class GazetteerAttribute(models.Model):
 
     def layer_name(self):
         return self.attribute.layer.name
+
+
+def gazetteer_delete_layer(instance, sender, **kwargs):
+    GazetteerEntry.objects.filter(layer_name=instance.name).delete()
+    print 'Removing gazetteer entries for the layer'
+
+
+signals.pre_delete.connect(gazetteer_delete_layer, sender=Layer)

geonode/contrib/worldmap/gazetteer/utils.py

@@ -68,11 +68,11 @@ def getGazetteerEntry(input_id):
 
 
 def formatSourceLink(layer_name):
-    layer = cache.get("layerinfo_" + layer_name)
-    if layer is None:
+    if Layer.objects.filter(name=layer_name).exists():
         layer = Layer.objects.get(name=layer_name)
-        cache.add("layerinfo_" + layer_name, layer)
-    return "<a href='{0}data/{1}' target='_blank'>{2}</a>".format(settings.SITEURL, layer.typename, layer.name)
+        return "<a href='{0}data/{1}' target='_blank'>{2}</a>".format(settings.SITEURL, layer.typename, layer.name)
+    else:
+        return "This layer does not exist anymore"
 
 
 def getGazetteerResults(place_name, map=None, layer=None, start_date=None, end_date=None, project=None, user=None):