Permalink
Browse files

Fixes on data sources

  • Loading branch information...
1 parent 85d3e92 commit f1de800e3a6e4962911f029708a681132c36ce41 @sfermigier committed Jul 14, 2014
Showing with 29 additions and 26 deletions.
  1. +3 −3 Makefile
  2. +19 −16 ring.cfg
  3. +6 −5 ring/models.py
  4. +1 −2 ring/server.py
View
@@ -32,6 +32,6 @@ install:
python setup.py install
-push:
- rsync -avz -e ssh ring Makefile *.txt ring.sh ring.cfg \
- gtll@oss4cloud.org:/var/www/gtll-2.0/
+#push:
+# rsync -avz -e ssh ring Makefile *.txt ring.sh ring.cfg \
+# gtll@gt-logiciel-libre.org:/var/www/gtll-2.0/
View
@@ -17,6 +17,9 @@ crawler=GtllFeed
### Companies
+[Abilian]
+url=http://www.abilian.com/fr/feed/
+
[Adacore]
url=http://www.adacore.com/rss/all
@@ -26,8 +29,9 @@ url=http://bearstech.com/actualites/lactualite-des-ours/RSS
[Pilot Systems]
url=http://www.pilotsystems.net/actus/actus-smart/RSS
-[Anakeen]
-url=http://www.anakeen.com/rss.xml
+# Broken
+#[Anakeen]
+#url=http://www.anakeen.com/rss.xml
[AlterWay]
url=http://alterway.fr/rss.xml
@@ -45,16 +49,12 @@ url=http://feeds.feedburner.com/logilaborg?format=xml
[Mandriva]
url=http://blog.mandriva.com/feed/
-[Nuxeo Corp EN]
-url=http://www.nuxeo.com/nxc/rssfeed/news
-author=Nuxeo
-
-[Nuxeo Corp FR]
-url=http://www.nuxeo.com/fr/nxc/rssfeed/news
+[Nuxeo Corp]
+url=http://www.nuxeo.com/feed/
author=Nuxeo
[Nuxeo Blogs]
-url=http://blogs.nuxeo.com/atom.xml
+url=http://blogs.nuxeo.com/feed/
#[OW2]
#url=http://www.ow2.org/Main/BlogRss?xpage=rdf
@@ -69,6 +69,9 @@ url=http://www.oslandia.com/?feed=atom
[Oslandia Tech]
url=http://www.oslandia.com/tech/?feed=atom
+[OVH]
+url=http://www.ovh.com/fr/rss.xml
+
[Smile]
url=http://www.smile.fr/rss/feed/nos-actualites
@@ -85,7 +88,7 @@ url=http://blog.zenika.com/index.php?feed/atom
url=http://feeds.feedburner.com/cubicweborg?format=xml
[Wakanda]
-url=http://www.wakanda.org/feed-news
+url=http://www.wakanda.org/rss.xml
# Labos
@@ -94,15 +97,15 @@ url=http://www.irill.org/blog/homepage/RSS
# Misc
-[OSS4CLOUD]
-url=http://www.oss4cloud.org/feed/
-
[Stefane Fermigier]
url=http://www.fermigier.com/rss
-# Projects
-[COCLICO]
-url=http://forge.projet-coclico.org/export/rss20_news.php?group_id=14
+[CNLL]
+url=http://cnll.fr/feed
+#[OSS4CLOUD]
+#url=http://www.oss4cloud.org/feed/
+
+# Projects
[Compatible One]
url=http://www.compatibleone.org/bin/view/Blog/GlobalBlogRss?xpage=plain
View
@@ -40,15 +40,15 @@ class Entry(Base):
title = Column(String)
content = Column(String)
- published = Column(Integer, index=True)
+ published = Column(Integer)
updated = Column(Integer)
new_date = None
def __init__(self, **kw):
for k, v in kw.items():
setattr(self, k, v)
-
+
def __repr__(self):
return "<Entry id=%s>" % self.id
@@ -62,6 +62,7 @@ class Feed(Base):
home_url = Column(String)
author = ""
+
def __init__(self, **kw):
for k, v in kw.items():
@@ -81,7 +82,7 @@ def crawl(self):
self.title = raw_feed.feed.title
for raw_entry in raw_feed.entries:
id = raw_entry.get('id', raw_entry.link)
- if session.query(Entry.id).filter(Entry.id == id).all():
+ if session.query(Entry.id).filter(Entry.id==id).all():
continue
e = raw_entry
@@ -108,7 +109,7 @@ def crawl(self):
published = updated
author_email = e.get("author_detail", {}).get("email", "")
-
+
entry = Entry(id=id, source=self.id, link=e.link, author=author, title=e.title,
content=content, published=published, updated=updated,
author_email=author_email)
@@ -134,7 +135,7 @@ def crawl(self):
for slug, title in matches:
id = slug
- if session.query(Entry.id).filter(Entry.id == id).all():
+ if session.query(Entry.id).filter(Entry.id==id).all():
continue
link = self.ROOT + slug
View
@@ -43,7 +43,6 @@
traceback.print_exc()
pass
-
# Use /media instead of default /static because /static is already used.
app = Flask(__name__, static_path='/media')
app.jinja_loader.searchpath = ['./templates'] + app.jinja_loader.searchpath
@@ -129,7 +128,7 @@ def age(t):
def main():
- app.run(debug=True)
+ app.run(debug=True, port=5200)
if __name__ == '__main__':
main()

0 comments on commit f1de800

Please sign in to comment.