minor clean-up

svn: r15937
This commit is contained in:
Jérôme Rapinat 2010-09-29 14:45:27 +00:00
parent 2262dc70da
commit 8b675ed1f2

View File

@ -397,10 +397,8 @@ class GeneWebWriter(object):
ret = ret + m_date
if m_place != "" and m_source != "":
ret = ret + " #mp %s #ms %s" % (self.rem_spaces( m_place), self.rem_spaces( m_source))
if m_place != "" and m_source == "":
ret = ret + " #mp %s" % self.rem_spaces( m_place)
if m_source != "" and m_place == "":
ret = ret + " #ms %s" % self.rem_spaces( m_source)
elif engaged == 1:
@ -408,11 +406,9 @@ class GeneWebWriter(object):
if eng_date != "":
ret = ret + eng_date
if m_place != "" and m_source != "":
ret = ret + " #mp %s #ms %s" % (self.rem_spaces( m_place), self.rem_spaces( m_source))
ret = ret + " #mp %s #ms %s" % (self.rem_spaces( m_place), self.rem_spaces( m_source))
if eng_place != "" and m_source == "":
ret = ret + " #mp %s" % self.rem_spaces( m_place)
if eng_source != "" and m_place == "":
ret = ret + " #ms %s" % self.rem_spaces( m_source)
else: