Read database from a configfile, so beta can now easily have

it's own database.

diff --git a/aggregator.py b/aggregator.py
index fcfcc26e43e53d1388b8058605e2ca10e92d26d7..ddfa1553a879d5c00af47868ac68ed254549f132 100755 (executable)
--- a/aggregator.py
+++ b/aggregator.py
@@ -11,6 +11,7 @@ import psycopg2
 import feedparser
 import datetime
 import socket
+import ConfigParser
 
 class Aggregator:
        def __init__(self, db):
@@ -68,4 +69,6 @@ class Aggregator:
                self.stored += 1
 
 if __name__=="__main__":
-       Aggregator(psycopg2.connect('dbname=planetpg host=/tmp/')).Update()
+       c = ConfigParser.ConfigParser()
+       c.read('planet.ini')
+       Aggregator(psycopg2.connect(c.get('planet','db'))).Update()

diff --git a/discovery.py b/discovery.py
index 3ec675d891aa77bca9229ea00789d792c48449a2..5beeeb9b2a782162e76c82779fedf282214ec294 100755 (executable)
--- a/discovery.py
+++ b/discovery.py
@@ -12,6 +12,7 @@ import psycopg2
 import feedparser
 import datetime
 import socket
+import ConfigParser
 
 class Aggregator:
        def __init__(self, db):
@@ -44,4 +45,6 @@ class Aggregator:
                        print feed
 
 if __name__=="__main__":
-       Aggregator(psycopg2.connect('dbname=planetpg host=/tmp/')).Update()
+       c = ConfigParser.ConfigParser()
+       c.read('planet.ini')
+       Aggregator(psycopg2.connect(c.get('planet','db'))).Update()

diff --git a/generator.py b/generator.py
index 51b672814c008d99e320772d872f4914fe65ff9d..d4d6e609a0cb93f3c717f3f3444771b5e7007c6d 100755 (executable)
--- a/generator.py
+++ b/generator.py
@@ -10,6 +10,7 @@ Copyright (C) 2008 PostgreSQL Global Development Group
 import psycopg2
 import psycopg2.extensions
 import PyRSS2Gen
+import ConfigParser 
 import datetime
 import sys
 import tidy
@@ -154,4 +155,6 @@ class HtmlTruncator(HTMLParser):
                        return self.fulltxt
 
 if __name__=="__main__":
-       Generator(psycopg2.connect('dbname=planetpg host=/tmp')).Generate()
+       c = ConfigParser.ConfigParser()
+       c.read('planet.ini')
+       Generator(psycopg2.connect(c.get('planet','db'))).Generate()