handle blank rspecs without faulting

[sface.git] / sface / sfidata.py

diff --git a/sface/sfidata.py b/sface/sfidata.py
index 71bb471..9a2710a 100644 (file)
--- 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 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
 
 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_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
 
             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_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
 
             return rspec
         return None