From 72aa061d0672c314cebd55a51710099c8a1f10bc Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Fri, 6 Jan 2012 15:49:00 -0600
Subject: [PATCH] Updated from deprecated feed classes.
---
gracedb/feeds.py | 11 ++++++++---
settings_dev.py | 5 ++++-
urls.py | 4 +---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/gracedb/feeds.py b/gracedb/feeds.py
index 5116b8aed..fd6ca5a5c 100644
--- a/gracedb/feeds.py
+++ b/gracedb/feeds.py
@@ -1,7 +1,7 @@
-from django.contrib.syndication.feeds import FeedDoesNotExist
+from django.contrib.syndication.views import FeedDoesNotExist
from django.core.exceptions import ObjectDoesNotExist
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
from django.core.urlresolvers import reverse
from django.template import RequestContext
@@ -14,8 +14,13 @@ from django.conf import settings
FEED_MAX_RESULTS = getattr(settings, 'FEED_MAX_RESULTS', 20)
class EventFeed(Feed):
- def get_object(self, bits):
+ title_template = "feeds/latest_title.html"
+ description_template = "feeds/latest_description.html"
+ def get_object(self, request, url):
+ bits = url.split('/')[1:]
+ # bits will look like
# [] , ['cbc'], ['cbc','lowmass']
+
objs = Event.objects.order_by("-id")
if 'test' not in bits:
# Filter out test group
diff --git a/settings_dev.py b/settings_dev.py
index 4db7d67b2..ced018094 100644
--- a/settings_dev.py
+++ b/settings_dev.py
@@ -56,6 +56,9 @@ SKYALERT_DESCRIPTION = "LIGO / Virgo trigger"
SKYALERT_SUBMITTERS = ['Patrick Brady', 'Brian Moe']
+GRACEDB_DATA_DIR = "/mnt/gracedb-web/data"
+#GRACEDB_DATA_DIR = "/mnt/gracedb-web-temp/data"
+
# Latency histograms. Where they go and max latency to bin.
LATENCY_REPORT_DEST_DIR = "/home/bmoe/django/data/latency"
LATENCY_MAXIMUM_CHARTED = 1800
@@ -77,7 +80,7 @@ GRACE_DATETIME_FORMAT = 'Y-m-d H:i:s T'
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'en-us'
-SITE_ID = 3
+SITE_ID = 4
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
diff --git a/urls.py b/urls.py
index ee0b85a3c..9d2d04ede 100644
--- a/urls.py
+++ b/urls.py
@@ -24,9 +24,7 @@ urlpatterns = patterns('',
(r'^cli/tag', 'gracedb.gracedb.views.cli_tag'),
(r'^cli/label', 'gracedb.gracedb.views.cli_label'),
(r'^cli/search', 'gracedb.gracedb.views.cli_search'),
- #(r'^cli/ping/(?P<arg>.*)', 'gracedb.gracedb.views.ping'),
- (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed',
- {'feed_dict': feeds}),
+ (r'^feeds/(?P<url>.*)/$', EventFeed()),
url (r'^feeds/$', feedview, name="feeds"),
url (r'^reports/$', 'gracedb.gracedb.reports.histo', name="reports"),
--
GitLab