[cvs-annodex] commit (/annodex): cmmlwiki/trunk/cgi-bin/view.cgi cmmlwiki/trunk/cmmlwiki/database.py

[conrad]

Update of /annodex (new revision 1467)

Modified files:
   cmmlwiki/trunk/cgi-bin/view.cgi
   cmmlwiki/trunk/cmmlwiki/database.py

Log Message:
generalize ixp2source


Modified: cmmlwiki/trunk/cgi-bin/view.cgi
===================================================================
--- cmmlwiki/trunk/cgi-bin/view.cgi	2005-09-24 09:10:34 UTC (rev 1466)
+++ cmmlwiki/trunk/cgi-bin/view.cgi	2005-09-24 09:16:04 UTC (rev 1467)
@@ -7,7 +7,7 @@
 import sqlite
 import annodex
 
-from cmmlwiki.database import db, get_ixp
+from cmmlwiki.database import db, pname2ixp, ixp2source
 from cmmlwiki.utils import cmml_preamble, content_type, location
 from cmmlwiki.npt import npt2timestamp, time2npt
 
@@ -20,10 +20,7 @@
     cur = con.cursor()
 
     # Get the source
-    sql = 'SELECT * FROM sources WHERE ixp="%s"' % ixp
-    cur.execute(sql)
-    row = cur.next()
-    source = row['path']
+    source = ixp2source(ixp)
 
     # Work out the named time offset
     if (id == ""):
@@ -129,7 +126,7 @@
     path_info = os.getenv ('PATH_INFO')
     try:
         project_name = path_info[1:]
-        ixp = get_ixp (project_name)
+        ixp = pname2ixp (project_name)
     except TypeError:
         ixp = -1
 

Modified: cmmlwiki/trunk/cmmlwiki/database.py
===================================================================
--- cmmlwiki/trunk/cmmlwiki/database.py	2005-09-24 09:10:34 UTC (rev 1466)
+++ cmmlwiki/trunk/cmmlwiki/database.py	2005-09-24 09:16:04 UTC (rev 1467)
@@ -37,3 +37,12 @@
     cur.execute (sql)
     row = cur.next()
     return row['name']
+
+def ixp2source(ixp):
+    con = sqlite.connect(db)
+    cur = con.cursor()
+
+    sql = 'SELECT * FROM sources WHERE ixp="%s"' % ixp
+    cur.execute(sql)
+    row = cur.next()
+    return row['path']


-- 
conrad