summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2008-10-24 15:20:43 +0000
committerMagnus Hagander2008-10-24 15:20:43 +0000
commit9ea8477e9839fae1bb392227be8693e23a6d5fcd (patch)
tree9bb93a8747657081eb449ab131b20c13bf08ad84
parent6d57001bf26b5f263ac89cf2d3b3caa3a0d2fdf3 (diff)
Read database from a configfile, so beta can now easily have
it's own database. git-svn-id: file:///Users/dpage/pgweb/svn-repo/trunk@2236 8f5c7a92-453e-0410-a47f-ad33c8a6b003
-rwxr-xr-xplanet/aggregator.py5
-rwxr-xr-xplanet/discovery.py5
-rwxr-xr-xplanet/generator.py5
3 files changed, 12 insertions, 3 deletions
diff --git a/planet/aggregator.py b/planet/aggregator.py
index fcfcc26e..ddfa1553 100755
--- a/planet/aggregator.py
+++ b/planet/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/planet/discovery.py b/planet/discovery.py
index 3ec675d8..5beeeb9b 100755
--- a/planet/discovery.py
+++ b/planet/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/planet/generator.py b/planet/generator.py
index 51b67281..d4d6e609 100755
--- a/planet/generator.py
+++ b/planet/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()