This commit is contained in:
Kovid Goyal 2013-09-12 20:34:39 +05:30
parent 187eb4e065
commit 7d1c82aad2

View File

@ -122,7 +122,7 @@ class odfmetaparser(xml.sax.saxutils.XMLGenerator):
if name == (OFFICENS,u'meta'):
for k,v in self.addfields.items():
if len(v) > 0:
if type(k) == type(''):
if isinstance(k, basestring):
xml.sax.saxutils.XMLGenerator.startElementNS(self,(METANS,u'user-defined'),None,{(METANS,u'name'):k})
xml.sax.saxutils.XMLGenerator.characters(self, v)
xml.sax.saxutils.XMLGenerator.endElementNS(self, (METANS,u'user-defined'),None)
@ -165,15 +165,15 @@ def get_metadata(stream, extract_cover=True):
parser.parse(StringIO(content))
data = odfs.seenfields
mi = MetaInformation(None, [])
if data.has_key('title'):
if 'title' in data:
mi.title = data['title']
if data.get('initial-creator', '').strip():
mi.authors = string_to_authors(data['initial-creator'])
elif data.has_key('creator'):
elif 'creator' in data:
mi.authors = string_to_authors(data['creator'])
if data.has_key('description'):
if 'description' in data:
mi.comments = data['description']
if data.has_key('language'):
if 'language' in data:
mi.language = data['language']
if data.get('keywords', ''):
mi.tags = [x.strip() for x in data['keywords'].split(',') if x.strip()]