git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
be48f8b
)
uncomment some usefull code. NT.
author
Nicolas Turro
<Nicolas.Turro@inria.fr>
Wed, 2 Nov 2011 12:59:34 +0000
(13:59 +0100)
committer
Nicolas Turro
<Nicolas.Turro@inria.fr>
Wed, 2 Nov 2011 12:59:34 +0000
(13:59 +0100)
sfa/senslab/api.py
patch
|
blob
|
history
diff --git
a/sfa/senslab/api.py
b/sfa/senslab/api.py
index
3ebc7b6
..
a968330
100644
(file)
--- a/
sfa/senslab/api.py
+++ b/
sfa/senslab/api.py
@@
-120,6
+120,7
@@
class SfaAPI(BaseAPI):
"""
type = 'authority'
path = self.config.SFA_DATA_DIR
"""
type = 'authority'
path = self.config.SFA_DATA_DIR
+ print >>sys.stderr,"FILENAME :", self.interface, self.hrn, type, "cred"
filename = ".".join([self.interface, self.hrn, type, "cred"])
cred_filename = path + os.sep + filename
print>>sys.stderr, "|\r\n \r\n API.pPY getCredentialAUTHORITY cred_filename %s" %(cred_filename)
filename = ".".join([self.interface, self.hrn, type, "cred"])
cred_filename = path + os.sep + filename
print>>sys.stderr, "|\r\n \r\n API.pPY getCredentialAUTHORITY cred_filename %s" %(cred_filename)
@@
-181,8
+182,8
@@
class SfaAPI(BaseAPI):
registries = Registries()
registry = registries.get_server(self.hrn, self.key_file, self.cert_file)
#Sandrine 24 Oct 2 commented 2 following lines
registries = Registries()
registry = registries.get_server(self.hrn, self.key_file, self.cert_file)
#Sandrine 24 Oct 2 commented 2 following lines
-
#
registries = Registries(self)
-
#
registry = registries[self.hrn]
+ registries = Registries(self)
+ registry = registries[self.hrn]
print>>sys.stderr, " SenslabAPI.PY __getCredential registries %s self.hrn %s \t registry %s " %(registries,self.hrn,registry)
cert_string=self.cert.save_to_string(save_parents=True)
# get self credential
print>>sys.stderr, " SenslabAPI.PY __getCredential registries %s self.hrn %s \t registry %s " %(registries,self.hrn,registry)
cert_string=self.cert.save_to_string(save_parents=True)
# get self credential
@@
-206,7
+207,7
@@
class SfaAPI(BaseAPI):
table = self.SfaTable()
records = table.findObjects({'hrn': hrn, 'type': 'authority+sa'})
#Sandrine 24 Oct 2 commented following line
table = self.SfaTable()
records = table.findObjects({'hrn': hrn, 'type': 'authority+sa'})
#Sandrine 24 Oct 2 commented following line
-
#
records = table.findObjects(hrn)
+ records = table.findObjects(hrn)
if not records:
raise RecordNotFound
if not records:
raise RecordNotFound