fix for empty editors

diff --git a/librarian/epub/xsltLast.xsl b/librarian/epub/xsltLast.xsl
index 0739606..92f5be6 100644 (file)
--- a/librarian/epub/xsltLast.xsl
+++ b/librarian/epub/xsltLast.xsl
@@ -78,10 +78,10 @@
   </xsl:template>\r
 \r
   <xsl:template name="editors">\r
   </xsl:template>\r
 \r
   <xsl:template name="editors">\r

-    <xsl:if test="//dc:contributor.editor|//dc:contributor.technical_editor">\r
+    <xsl:if test="//dc:contributor.editor[text()]|//dc:contributor.technical_editor[text()]">\r

         <p class="info">\r
             <xsl:text>Opracowanie redakcyjne i przypisy: </xsl:text>\r
         <p class="info">\r
             <xsl:text>Opracowanie redakcyjne i przypisy: </xsl:text>\r

-            <xsl:for-each select="//dc:contributor.editor|//dc:contributor.technical_editor[not(//dc:contributor.editor/text()=text())]">\r
+            <xsl:for-each select="//dc:contributor.editor[text()]|//dc:contributor.technical_editor[text() and not(//dc:contributor.editor/text()=text())]">\r

                 <xsl:sort />\r
                 <xsl:if test="position() != 1">, </xsl:if>\r
                 <xsl:apply-templates mode="person" />\r
                 <xsl:sort />\r
                 <xsl:if test="position() != 1">, </xsl:if>\r
                 <xsl:apply-templates mode="person" />\r

diff --git a/librarian/pdf.py b/librarian/pdf.py
index 41de1b3..5f28547 100644 (file)
--- a/librarian/pdf.py
+++ b/librarian/pdf.py
@@ -132,6 +132,8 @@ def parse_creator(doc):
     for person in doc.xpath("|".join('//dc:'+(tag) for tag in (
                     'creator', 'contributor.translator', 'contributor.editor', 'contributor.technical_editor')),
                     namespaces = {'dc': str(DCNS)})[::-1]:
     for person in doc.xpath("|".join('//dc:'+(tag) for tag in (
                     'creator', 'contributor.translator', 'contributor.editor', 'contributor.technical_editor')),
                     namespaces = {'dc': str(DCNS)})[::-1]:

+        if not person.text:
+            continue

         p = Person.from_text(person.text)
         person_parsed = deepcopy(person)
         person_parsed.tag = person.tag + '_parsed'
         p = Person.from_text(person.text)
         person_parsed = deepcopy(person)
         person_parsed.tag = person.tag + '_parsed'

diff --git a/librarian/text.py b/librarian/text.py
index bcb031d..f5aafc1 100644 (file)
--- a/librarian/text.py
+++ b/librarian/text.py
@@ -55,7 +55,8 @@ def transform(input_file, output_file, parse_dublincore=True, **options):
         else:
             source = ''
 
         else:
             source = ''
 

-        contributors = ', '.join(person.readable() for person in sorted(set(parsed_dc.technical_editors + parsed_dc.editors)))
+        contributors = ', '.join(person.readable() for person in 
+                                 sorted(set(p for p in (parsed_dc.technical_editors + parsed_dc.editors) if p)))

         if contributors:
             contributors = "\n\nOpracowanie redakcyjne i przypisy: %s" % contributors
     else:
         if contributors:
             contributors = "\n\nOpracowanie redakcyjne i przypisy: %s" % contributors
     else:

diff --git a/tests/files/text/asnyk_miedzy_nami.xml b/tests/files/text/asnyk_miedzy_nami.xml
index d7ab4fc..36d8df6 100644 (file)
--- a/tests/files/text/asnyk_miedzy_nami.xml
+++ b/tests/files/text/asnyk_miedzy_nami.xml
@@ -6,6 +6,7 @@
 <rdf:Description rdf:about="http://wiki.wolnepodreczniki.pl/Lektury:Asnyk/Między_nami_nic_nie_było">
 <dc:creator xml:lang="pl">Asnyk, Adam</dc:creator>
 <dc:title xml:lang="pl">Między nami nic nie było</dc:title>
 <rdf:Description rdf:about="http://wiki.wolnepodreczniki.pl/Lektury:Asnyk/Między_nami_nic_nie_było">
 <dc:creator xml:lang="pl">Asnyk, Adam</dc:creator>
 <dc:title xml:lang="pl">Między nami nic nie było</dc:title>

+<dc:contributor.editor xml:lang="pl" />

 <dc:contributor.editor xml:lang="pl">Sekuła, Aleksandra</dc:contributor.editor>
 <dc:contributor.technical_editor xml:lang="pl">Sutkowska, Olga</dc:contributor.technical_editor>
 <dc:publisher xml:lang="pl">Fundacja Nowoczesna Polska</dc:publisher>
 <dc:contributor.editor xml:lang="pl">Sekuła, Aleksandra</dc:contributor.editor>
 <dc:contributor.technical_editor xml:lang="pl">Sutkowska, Olga</dc:contributor.technical_editor>
 <dc:publisher xml:lang="pl">Fundacja Nowoczesna Polska</dc:publisher>