X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfidata.py;h=9a2710a41a07e4cf8b172ad7af56b129c12d2e78;hp=71bb471cded27ac23b536a43206474c1e411b19e;hb=72d17d9e61f0c38e293a3e8773b046975ac570d5;hpb=b64036ac10d8faf553f8faa2d43aa0717dba5b6b

diff --git a/sface/sfidata.py b/sface/sfidata.py
index 71bb471..9a2710a 100644
--- a/sface/sfidata.py
+++ b/sface/sfidata.py
@@ -5,7 +5,7 @@ from PyQt4.QtGui import *
 
 from lxml import etree
 from sfa.util.xrn import hrn_to_urn, urn_to_hrn
-from sfa.util.record import SfaRecord, SliceRecord, AuthorityRecord, UserRecord
+from sfa.storage.record import SfaRecord, SliceRecord, AuthorityRecord, UserRecord
 from sfa.rspecs.rspec import RSpec
 from sface.config import config
 
@@ -80,9 +80,11 @@ class SfiData:
         rspec_file = config.getSliceRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
-            rspec = RSpec(rspec=xml) #rspec = parse_rspec(xml)
 
-            #self.purgeNonSliceResources(rspec)
+            if (xml.strip()==""):
+               return None
+
+            rspec = RSpec(rspec=xml)
 
             return rspec
         return None
@@ -91,7 +93,11 @@ class SfiData:
         rspec_file = config.getResourcesRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
-            rspec = RSpec(rspec=xml) #rspec= parse_rspec(xml)
+
+            if (xml.strip()==""):
+                return None
+
+            rspec = RSpec(rspec=xml)
             return rspec
         return None