Fixed complex books (books with hasPart).

[wolnelektury.git] / lib / librarian / html.py

diff --git a/lib/librarian/html.py b/lib/librarian/html.py
index bb5a637..9763428 100644 (file)
--- a/lib/librarian/html.py
+++ b/lib/librarian/html.py
@@ -55,7 +55,7 @@ def transform(input_filename, output_filename):
     result = doc.xslt(style)
     add_anchors(result.getroot())
     add_table_of_contents(result.getroot())
-    result.write(output_filename, xml_declaration=True, pretty_print=True, encoding='utf-8')
+    result.write(output_filename, xml_declaration=False, pretty_print=True, encoding='utf-8')
 
 
 class Fragment(object):
@@ -109,7 +109,7 @@ def extract_fragments(input_filename):
 
     for event, element in etree.iterparse(input_filename, events=('start', 'end')):
         # Process begin and end elements
-        if element.tag == 'span' and element.get('class', '') in ('theme-begin', 'theme-end'):
+        if element.get('class', '') in ('theme-begin', 'theme-end'):
             if not event == 'end': continue # Process elements only once, on end event
 
             # Open new fragment
@@ -117,9 +117,9 @@ def extract_fragments(input_filename):
                 fragment = Fragment(id=element.get('fid'), themes=element.text)
 
                 # Append parents
-                if element.getparent().tag != 'body':
+                if element.getparent().get('id', None) != 'book-text':
                     parents = [element.getparent()]
-                    while parents[-1].getparent().tag != 'body':
+                    while parents[-1].getparent().get('id', None) != 'book-text':
                         parents.append(parents[-1].getparent())
 
                     parents.reverse()