support for separate ListResources calls for slice and resources

[sface.git] / sface / sliceview.py

diff --git a/sface/sliceview.py b/sface/sliceview.py
index 92dd844..65b6572 100644 (file)
--- a/sface/sliceview.py
+++ b/sface/sliceview.py
@@ -6,6 +6,7 @@ from PyQt4.QtGui import *
 
 from sfa.util.record import SfaRecord, SliceRecord, AuthorityRecord
 from sface.config import config
+from sface.sfidata import SfiData
 
 NAME_COLUMN = 0
 MEMBERSHIP_STATUS_COLUMN = 1
@@ -118,16 +119,7 @@ class SliceModel(QStandardItemModel):
     def updateModel(self):
         self.clear()
 
-        slice_names = []
-
-        i=0
-        while (os.path.exists(config.getAuthorityListFile(i))):
-            rec = self.readSliceRecord(i)
-            if rec:
-                name = str(rec.get_name())
-                if (rec.get_type() == "slice"):
-                    slice_names.append(name)
-            i=i+1
+        slice_names = SfiData().getAuthorityHrns(type="slice")
 
         rootItem = self.invisibleRootItem()
 
@@ -156,12 +148,3 @@ class SliceModel(QStandardItemModel):
 
         return slices
 
-    def readSliceRecord(self, i):
-        rec_file = config.getAuthorityListFile(i)
-        if os.path.exists(rec_file):
-            xml = open(rec_file).read()
-            rec = SliceRecord()
-            rec.load_from_string(xml)
-            return rec
-        return None
-