Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

6058: Ambiguous pdf output file format values [fix by Peter]

Browse Source 
(this was already fixed in gramps34 20445)


svn: r22448
This commit is contained in:
Paul Franklin 2013-05-28 20:52:59 +00:00
parent 62da0fbaa9
commit 8755619584
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/cli/plug/__init__.py
View File

@ -6,7 +6,7 @@
# Copyright (C) 2008 Raphael Ackermann # Copyright (C) 2008 Raphael Ackermann
# Copyright (C) 2008-2011 Brian G. Matherly # Copyright (C) 2008-2011 Brian G. Matherly
# Copyright (C) 2010 Jakim Friant # Copyright (C) 2010 Jakim Friant
# Copyright (C) 2011-2012 Paul Franklin # Copyright (C) 2011-2013 Paul Franklin
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -303,7 +303,7 @@ class CommandLineReport(object):
elif self.category == CATEGORY_GRAPHVIZ: elif self.category == CATEGORY_GRAPHVIZ:
for graph_format in graphdoc.FORMATS: for graph_format in graphdoc.FORMATS:
self.options_help['off'][2].append( self.options_help['off'][2].append(
graph_format["ext"] + "\t" + graph_format["descr"] ) graph_format["type"] + "\t" + graph_format["descr"] )
else: else:
self.options_help['off'][2] = "NA" self.options_help['off'][2] = "NA"
@ -468,13 +468,13 @@ class CommandLineReport(object):
_chosen_format = plugin.get_extension() _chosen_format = plugin.get_extension()
elif self.category == CATEGORY_GRAPHVIZ: elif self.category == CATEGORY_GRAPHVIZ:
for graph_format in graphdoc.FORMATS: for graph_format in graphdoc.FORMATS:
if graph_format['ext'] == self.options_dict['off']: if graph_format['type'] == self.options_dict['off']:
if not self.format: # choose the first one, not the last if not self.format: # choose the first one, not the last
self.format = graph_format["class"] self.format = graph_format["class"]
if self.format is None: if self.format is None:
# Pick the first one as the default. # Pick the first one as the default.
self.format = graphdoc.FORMATS[0]["class"] self.format = graphdoc.FORMATS[0]["class"]
_chosen_format = graphdoc.FORMATS[0]["ext"] _chosen_format = graphdoc.FORMATS[0]["type"]
else: else:
self.format = None self.format = None
if _chosen_format and _format_str: if _chosen_format and _format_str: