A few indentation corrections.

[sfa.git] / sfa / senslab / slabpostgres.py

diff --git a/sfa/senslab/slabpostgres.py b/sfa/senslab/slabpostgres.py
index 6176a03..a133833 100644 (file)
--- a/sfa/senslab/slabpostgres.py
+++ b/sfa/senslab/slabpostgres.py
@@ -14,9 +14,13 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relationship, backref
 
 
+from sqlalchemy.dialects import postgresql
+
 from sqlalchemy import MetaData, Table
 from sqlalchemy.exc import NoSuchTableError
 
+from sqlalchemy import String
+
 #Dict holding the columns names of the table as keys
 #and their type, used for creation of the table
 slice_table = {'record_id_user':'integer PRIMARY KEY references X ON DELETE CASCADE ON UPDATE CASCADE','oar_job_id':'integer DEFAULT -1',  'record_id_slice':'integer', 'slice_hrn':'text NOT NULL'}
@@ -35,12 +39,16 @@ SlabBase = declarative_base()
 
 class SliceSenslab (SlabBase):
     __tablename__ = 'slice_senslab' 
-    record_id_user = Column(Integer, primary_key=True)
+    #record_id_user = Column(Integer, primary_key=True)
+    slice_hrn = Column(String,primary_key=True)
+    peer_authority = Column( String,nullable = True)
+    record_id_slice = Column(Integer)    
+    record_id_user = Column(Integer)
     oar_job_id = Column( Integer,default = -1)
-    record_id_slice = Column(Integer)
-    slice_hrn = Column(String,nullable = False)
+    node_list = Column(postgresql.ARRAY(String), nullable =True)
     
-    def __init__ (self, slice_hrn =None, oar_job_id=None, record_id_slice=None, record_id_user= None):
+    def __init__ (self, slice_hrn =None, oar_job_id=None, record_id_slice=None, record_id_user= None,peer_authority=None):
+        self.node_list = []
         if record_id_slice: 
             self.record_id_slice = record_id_slice
         if slice_hrn:
@@ -51,14 +59,25 @@ class SliceSenslab (SlabBase):
             self.slice_hrn = slice_hrn 
         if record_id_user: 
             self.record_id_user= record_id_user
+        if peer_authority:
+            self.peer_authority = peer_authority
+            
             
     def __repr__(self):
-        result="<Record id user =%s, slice hrn=%s, oar_job id=%s,Record id slice =%s" % \
-                (self.record_id_user, self.slice_hrn, self.oar_job_id, self.record_id_slice)
+        result="<Record id user =%s, slice hrn=%s, oar_job id=%s,Record id slice =%s  node_list =%s peer_authority =%s"% \
+                (self.record_id_user, self.slice_hrn, self.oar_job_id, self.record_id_slice, self.node_list, self.peer_authority)
         result += ">"
         return result
           
-            
+    def dumpquerytodict(self):
+        dict = {'slice_hrn':self.slice_hrn,
+        'peer_authority':self.peer_authority,
+        'record_id':self.record_id_slice, 
+        'record_id_user':self.record_id_user,
+        'oar_job_id':self.oar_job_id, 
+        'record_id_slice':self.record_id_slice, 
+         'node_list':self.node_list}
+        return dict       
 #class PeerSenslab(SlabBase):
     #__tablename__ = 'peer_senslab' 
     #peername = Column(String, nullable = False)
@@ -77,7 +96,6 @@ class SliceSenslab (SlabBase):
 class SlabDB:
     def __init__(self,config):
         self.sl_base = SlabBase
-
         dbname="slab_sfa"
         # will be created lazily on-demand
         self.slab_session = None
@@ -104,11 +122,14 @@ class SlabDB:
                 pass
         self.slab_engine=None
         raise Exception,"Could not connect to database"
-
+    
+    
+    
     def check (self):
         self.slab_engine.execute ("select 1").scalar()
-
-
+        
+        
+        
     def session (self):
         if self.slab_session is None:
             Session=sessionmaker ()
@@ -154,11 +175,15 @@ class SlabDB:
         SlabBase.metadata.create_all(slab_engine)
         return
     
-    
-    def update_job(self, job_id, hrn):
+    #Updates the job_id and the nodes list 
+    #The nodes list is never erased.
+    def update_job(self, hrn, job_id= None, nodes = None ):
         slice_rec = slab_dbsession.query(SliceSenslab).filter_by(slice_hrn = hrn).first()
         print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES  update_job slice_rec %s"%(slice_rec)
-        slice_rec.oar_job_id = job_id
+        if job_id is not None:
+            slice_rec.oar_job_id = job_id
+        if nodes is not None :
+            slice_rec.node_list = nodes
         slab_dbsession.commit()
 
     def find (self, name = None, filter_dict = None):
@@ -196,12 +221,14 @@ class SlabDB:
                   Q = newQ
                 except KeyError:
                     print>>sys.stderr, "\r\n \t\t FFFFFFFFFFFFFFFFUUUUUUUUFUFUFU!!!!!!!!"
-        print>>sys.stderr, " HEEEEEEEEEEEEY %s " %(Q.all())
-        reclist = []
-        for rec in Q.all():
-            reclist.append(dict(zip(['record_id_user','oar_job_id', 'record_id_slice','slice_hrn'],[rec.record_id_user,rec.oar_job_id,rec.record_id_slice, rec.slice_hrn])))
-        print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES find  reclist %s" %(reclist)
-        return reclist
+        print>>sys.stderr, " HEEEEEEEEEEEEY %s " %(Q.first())
+        rec = Q.first()
+        print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES find  rec %s" %(rec)
+        return dict(zip(['record_id_user','oar_job_id', 'record_id_slice','slice_hrn'],[rec.record_id_user,rec.oar_job_id,rec.record_id_slice, rec.slice_hrn]))
+        #reclist = []
+        ##for rec in Q.all():
+            #reclist.append(dict(zip(['record_id_user','oar_job_id', 'record_id_slice','slice_hrn'],[rec.record_id_user,rec.oar_job_id,rec.record_id_slice, rec.slice_hrn])))
+        #return reclist