git://git.onelab.eu
/
sface.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
168e223
)
remove sqlalchemy dependency
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 6 Mar 2012 02:01:55 +0000
(21:01 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 6 Mar 2012 02:01:55 +0000
(21:01 -0500)
sface/sfidata.py
patch
|
blob
|
history
diff --git
a/sface/sfidata.py
b/sface/sfidata.py
index
1a326c6
..
6f7b265
100644
(file)
--- a/
sface/sfidata.py
+++ b/
sface/sfidata.py
@@
-28,37
+28,21
@@
class SfiData:
return names
return names
+ def getRecord(self, rec_file):
+ if os.path.exists(rec_file):
+ from sfa.storage.record import Record
+ xml = open(rec_file).read()
+ rec = Record(xml=xml)
+ return rec.todict()
+ return None
+
def getSliceRecord(self):
rec_file = config.getSliceRecordFile()
def getSliceRecord(self):
rec_file = config.getSliceRecordFile()
- if os.path.exists(rec_file):
- try:
- from sfa.storage.record import SliceRecord
- xml = open(rec_file).read()
- rec = SliceRecord()
- rec.load_from_string(xml)
- return rec
- except:
- from sfa.storage.model import make_record
- obj=make_record (xml=file(rec_file).read())
- # consider as a dict for smooth transition
- return obj.__dict__
- return None
+ return self.getRecord(rec_file)
def getUserRecord(self):
rec_file = config.getUserRecordFile()
def getUserRecord(self):
rec_file = config.getUserRecordFile()
- if os.path.exists(rec_file):
- try:
- from sfa.storage.record import SliceUser
- xml = open(rec_file).read()
- rec = UserRecord()
- rec.load_from_string(xml)
- return rec
- except:
- from sfa.storage.model import make_record
- obj=make_record (xml=file(rec_file).read())
- # consider as a dict for smooth transition
- return obj.__dict__
- return None
+ return self.getRecord(rec_file)
def getUserSliceHrns(self):
rec = self.getUserRecord()
def getUserSliceHrns(self):
rec = self.getUserRecord()