From be6f266052e8eb29cdcf8278375d0f3bfb028351 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Thu, 11 Aug 2011 10:00:28 +0000 Subject: [PATCH] Port proceedings feed - Legacy-Id: 3298 --- ietf/proceedings/feeds.py | 18 +++++++++++++++++- redesign/importing/import-meetings.py | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ietf/proceedings/feeds.py b/ietf/proceedings/feeds.py index a094be7fd..0bf0f0bd9 100644 --- a/ietf/proceedings/feeds.py +++ b/ietf/proceedings/feeds.py @@ -1,6 +1,7 @@ -import re +import re, os from django.contrib.syndication.feeds import Feed from django.utils.feedgenerator import Atom1Feed +from django.conf import settings from ietf.proceedings.models import WgProceedingsActivities from ietf.proceedings.models import Slide, WgAgenda, Proceeding from datetime import datetime, time @@ -14,6 +15,21 @@ class LatestWgProceedingsActivity(Feed): base_url = "http://www3.ietf.org/proceedings/" def items(self): + if settings.USE_DB_REDESIGN_PROXY_CLASSES: + objs = [] + from redesign.doc.models import Document + for doc in Document.objects.filter(type__in=("agenda", "minutes", "slides")).order_by('-time')[:60]: + obj = dict( + title=doc.type_id, + group_acronym=doc.name.split("-")[2], + date=doc.time, + link=self.base_url + os.path.join(doc.get_file_path(), doc.external_url)[len(settings.AGENDA_PATH):], + author="" + ) + objs.append(obj) + + return objs + objs = [] for act in WgProceedingsActivities.objects.order_by('-act_date')[:60]: obj = {} diff --git a/redesign/importing/import-meetings.py b/redesign/importing/import-meetings.py index 12a56aa9d..9060a4832 100755 --- a/redesign/importing/import-meetings.py +++ b/redesign/importing/import-meetings.py @@ -185,6 +185,8 @@ def import_materials(wg_meeting_session, timeslot=None, session=None): if kind == Slide: name += "-%s" % o.slide_num + name = name.lower() + try: d = Document.objects.get(type=doctype, docalias__name=name) except Document.DoesNotExist: