From 9e8c8ba7acb8cfaffade59e58c9f5fff762d56dc Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 5 Mar 2012 21:01:55 -0500 Subject: [PATCH] remove sqlalchemy dependency --- sface/sfidata.py | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/sface/sfidata.py b/sface/sfidata.py index 1a326c6..6f7b265 100644 --- a/sface/sfidata.py +++ b/sface/sfidata.py @@ -28,37 +28,21 @@ class SfiData: 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() - 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() - 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() -- 2.43.0