Fixes minor bug with html output of author's name.

[quanlib.git] / book.rb

diff --git a/book.rb b/book.rb
index f59b61a66ea44d17a86e7d999e34496b84fbea99..bfd3b250dcc358d958af23ff706f4e9065c049e8 100644 (file)
--- a/book.rb
+++ b/book.rb
@@ -6,9 +6,13 @@ require 'author'
 require 'cover'
 
 class Book
+  @@DC_NS_URL = 'http://purl.org/dc/elements/1.1/'
+
   def initialize(fileName)
+    #puts 'InitBook(' + fileName + ')'
     @author = nil
     @cover = nil
+    @description = nil
     @path = fileName
     @series = nil
     @title = nil
@@ -32,11 +36,19 @@ class Book
     return false
   end
 
+  def author
+    return @author
+  end
+
   def cover
     return @cover
   end
 
-  def describe
+  def description
+    @description
+  end
+
+  def heading
     result = []
 
     if nil != @title
@@ -45,7 +57,7 @@ class Book
       result.push('<i>(Unknown title)</i>')
     end
     if nil != @author
-      result.push(@author.to_s())
+      result.push('<i>by ' + @author.reading_order + '</i>')
     end
     
     seriesInfo = []
@@ -65,7 +77,7 @@ class Book
   def inspect
     data = []
     if nil != @author
-      data.push('author="' + @author.to_s + '"')
+      data.push('author="' + @author.inspect + '"')
     end
     if nil != @series
       data.push('series="' + @series + '"')
@@ -89,30 +101,42 @@ class Book
     @path
   end
 
+  def series
+    @series
+  end
+
   def to_s
     return inspect()
   end
 
+  def title
+    @title
+  end
+
+  def volume
+    @volume
+  end
+
   protected
   def isUpper?(c)
     return /[[:upper:]]/.match(c)
   end
 
   protected
-  def massageAuthor(input)
+  def massage_author(input)
     if nil == input
       return nil
     end
 
-    result = ""
+    reading_order = ""
     input.each_char do |c|
-      if isUpper?(c) and (result.length > 0)
-        result += " "
-      end
-      result += c
+      if isUpper?(c) and (reading_order.length > 0)
+        reading_order += " "
+     end
+      reading_order += c
     end
-    
-    return result
+
+    return reading_order
   end
 
   # Returns (series, volumeNo, titleText)
@@ -151,7 +175,10 @@ class Book
     parts = fileName.split('/')
     (@series, @volume, @title) = processTitle(parts[-1])
     if parts.length > 1
-      @author = massageAuthor(parts[-2])
+      grouping = parts[-2]
+      reading_order = massage_author(grouping)
+      sort_order = nil
+      @author = Author.new(grouping, reading_order, sort_order)
     end
 
     if fileName.downcase.end_with?(".epub")
@@ -166,6 +193,7 @@ class Book
       Zip::File.open(fileName) do |zipfile|
         entry = zipfile.find_entry('META-INF/container.xml')
         if nil == entry
+          puts 'No META-INF/container.xml, skipping book ' + fileName
           return
         end
         contXml = zipfile.read('META-INF/container.xml')
@@ -191,22 +219,47 @@ class Book
     #-------
     # Author
 
-    creator = opfDoc.css('dc|creator', 'dc' => 'http://purl.org/dc/elements/1.1/')
-    if (nil != creator) and (creator.length > 0)
-      roleNode = creator.attr('role')
-      if nil != roleNode
-        role = roleNode.value
-        if ('aut' == role) and (creator.children.length > 0) and (nil != creator.children[0])
-          name = creator.children[0].content
-          parts = name.split(' ')
-          if parts.length > 1
-            surname = parts[-1]
-            givenNames = parts[0..-2].join(' ')
-            @author = Author.new(surname, givenNames)
-          else
-            @author = Author.new(name, '')
+    grouping = @author.grouping
+    reading_order = @author.reading_order
+    sort_order = @author.sort_order
+
+    creators = opfDoc.css('dc|creator', 'dc' => @@DC_NS_URL)
+    if (creators.length > 0)
+      creator = creators[0]
+      if nil != creator
+        role = creator['opf:role']
+        if 'aut' == role
+          reading_order = creator.content
+
+          file_as = creator['opf:file-as']
+          if nil != file_as
+            sort_order = file_as
           end
         end
+
+        @author = Author.new(grouping, reading_order, sort_order)
+      end
+    end
+
+    #---------------------------------------
+    # Title
+
+    titles = opfDoc.css('dc|title', 'dc' => @@DC_NS_URL)
+    if titles.length > 0
+      title = titles[0]
+      if nil != title
+        @title = title.content
+      end
+    end
+
+    #---------------------------------------
+    # Description
+    
+    descrNodes = opfDoc.css('dc|description', 'dc' => @@DC_NS_URL)
+    if (descrNodes.length > 0)
+      descrNode = descrNodes[0]
+      if nil != descrNode
+        @description = descrNode.content
       end
     end
 
@@ -224,6 +277,7 @@ class Book
         @volume = content
       elsif 'cover' == name
         coverId = content
+        #puts 'File ' + @path + ' coverId ' + coverId
       end
     end