From 166d0073d01f88834bc1cc83c93423d7cfe1b4b5 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 16 Feb 2012 17:24:22 -0500 Subject: [PATCH] updaed show() --- sfa/client/sfaadmin.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py index 704d651c..77f966f4 100755 --- a/sfa/client/sfaadmin.py +++ b/sfa/client/sfaadmin.py @@ -6,6 +6,7 @@ from optparse import OptionParser from sfa.util.xrn import Xrn from sfa.storage.record import SfaRecord +from sfa.client.sfi import save_records_to_file def args(*args, **kwargs): def _decorator(func): @@ -43,11 +44,15 @@ class RegistryCommands(Commands): @args('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn') @args('-t', '--type', dest='type', metavar='', help='object type', default=None) @args('-o', '--outfile', dest='outfile', metavar='', help='save record to file') - def show(self, xrn, type=None, full=True): - records = self.api.manager.Resolve(self.api, xrn, type, full) + @args('-f', '--format', dest='format', metavar='', type='choice', + choices=('text', 'xml', 'summary'), help='display record in different formats') + def show(self, xrn, type=None, format=None, outfile=None): + records = self.api.manager.Resolve(self.api, xrn, type, True) for record in records: - sfa_record = SfaRecord(record) - print sfa_record.dump() + sfa_record = SfaRecord(dict=record) + sfa_record.dump(format) + if outfile: + save_records_to_file(outfile, records) def register(self, record): pass -- 2.47.0