git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e11e68
)
updaed show()
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 16 Feb 2012 22:24:22 +0000
(17:24 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 16 Feb 2012 22:24:22 +0000
(17:24 -0500)
sfa/client/sfaadmin.py
patch
|
blob
|
history
diff --git
a/sfa/client/sfaadmin.py
b/sfa/client/sfaadmin.py
index
704d651
..
77f966f
100755
(executable)
--- 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.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):
def args(*args, **kwargs):
def _decorator(func):
@@
-43,11
+44,15
@@
class RegistryCommands(Commands):
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn')
@args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None)
@args('-o', '--outfile', dest='outfile', metavar='<outfile>', help='save record to file')
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn')
@args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None)
@args('-o', '--outfile', dest='outfile', metavar='<outfile>', 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='<display>', 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:
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
def register(self, record):
pass