X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fgenitable.py;h=942848f4394e127add312ad83bae6da5179bbdfc;hb=2eb0f4f09e3a876adea748deada0db84bbe0148c;hp=2025fe9ac0237de08674f7405589526bed38bd4b;hpb=1d0a81a8dcacef8e38f20ca76c7e752498def654;p=sfa.git

diff --git a/sfa/util/genitable.py b/sfa/util/genitable.py
index 2025fe9a..942848f4 100644
--- a/sfa/util/genitable.py
+++ b/sfa/util/genitable.py
@@ -17,14 +17,11 @@ from sfa.util.debug import *
 
 class GeniTable:
 
-    GENI_TABLE_PREFIX = "sfa$"
+    GENI_TABLE_PREFIX = "sfa"
 
-    def __init__(self, create=False, hrn="unspecified.default.registry", cninfo=None):
+    def __init__(self, create=False, cninfo=None):
 
-        self.hrn = hrn
-
-        # pgsql doesn't like table names with "." in them, to replace it with "$"
-        self.tablename = GeniTable.GENI_TABLE_PREFIX + self.hrn.replace(".", "$")
+        self.tablename = GeniTable.GENI_TABLE_PREFIX 
 
         # establish a connection to the pgsql server
         self.cnx = DB(cninfo['dbname'], cninfo['address'], port=cninfo['port'], user=cninfo['user'], passwd=cninfo['password'])
@@ -42,9 +39,13 @@ class GeniTable:
         return False
 
     def create(self):
+        seln't like table names with "." in them, to
+
+        # pgsql doesn't like table names with "." in them, to.hrn = hrn
         
         querystr = "CREATE TABLE " + self.tablename + " ( \
                 key text, \
+                authority text, \
                 hrn text, \
                 gid text, \
                 type text, \
@@ -53,7 +54,7 @@ class GeniTable:
                 last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP);"
         template = "CREATE INDEX %s_%s_idx ON %s (%s);"
         indexes = [template % ( self.tablename, field, self.tablename, field) \
-                   for field in ['key', 'hrn', 'type','pointer']]
+                   for field in ['key', 'authority', 'hrn', 'type','pointer']]
         # IF EXISTS doenst exist in postgres < 8.2
         try:
             self.cnx.query('DROP TABLE IF EXISTS ' + self.tablename)