X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/215503e15ca9d6d1e8a053f7bfa359af1af102f3..5b04b2994c70c88d76709823bc012f410c7a1370:/librarian/parser.py diff --git a/librarian/parser.py b/librarian/parser.py old mode 100755 new mode 100644 index 225000b..2cd86ab --- a/librarian/parser.py +++ b/librarian/parser.py @@ -1,23 +1,7 @@ # -*- coding: utf-8 -*- # -# This file is part of Librarian. -# -# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska -# -# For full list of contributors see AUTHORS file. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from librarian import ValidationError, NoDublinCore, ParseError from librarian import RDFNS @@ -37,9 +21,9 @@ class WLDocument(object): self.edoc = edoc root_elem = edoc.getroot() - + dc_path = './/' + RDFNS('RDF') - + if root_elem.tag != 'utwor': raise ValidationError("Invalid root element. Found '%s', should be 'utwor'" % root_elem.tag) @@ -48,11 +32,11 @@ class WLDocument(object): if self.rdf_elem is None: raise NoDublinCore('Document has no DublinCore - which is required.') - + self.book_info = dcparser.BookInfo.from_element(self.rdf_elem) else: self.book_info = None - + @classmethod def from_string(cls, xml, swap_endlines=False, parse_dublincore=True): return cls.from_file(StringIO(xml), swap_endlines, parse_dublincore=parse_dublincore) @@ -75,21 +59,21 @@ class WLDocument(object): if swap_endlines: data = cls.LINE_SWAP_EXPR.sub(u'
\n', data) - + try: parser = etree.XMLParser(remove_blank_text=False) return cls(etree.parse(StringIO(data), parser), parse_dublincore=parse_dublincore) except (ExpatError, XMLSyntaxError, XSLTApplyError), e: - raise ParseError(e) + raise ParseError(e) def chunk(self, path): - # convert the path to XPath + # convert the path to XPath expr = self.path_to_xpath(path) elems = self.edoc.xpath(expr) if len(elems) == 0: return None - else: + else: return elems[0] def path_to_xpath(self, path):