Fixed fixup-docbook.rb, as changes in Nokogiri rendered it useless

diff --git a/fixup-docbook.rb b/fixup-docbook.rb
index 7ed81df2f024c7ffe6494a9d5fcbdc8748b9f1a7..d568f216e8f40af8db2d53a688c5d1233f2b65e1 100755 (executable)
--- a/fixup-docbook.rb
+++ b/fixup-docbook.rb
@@ -21,15 +21,16 @@ def log(level,what)
 end
 
 def partreplace(xml, partid, tag)
-  xml.css('part[id=' + partid + ']').each do |part|
+  xml.css('part').select {|p| p.attributes['id'].value == partid}.each do |part|
     part.name = tag
   end
 end
 
 
 log 0, 'replace article* with book*'
-xml.css('articleinfo').each do |node|
-  node.name = 'bookinfo'
+xml.children[0].name = 'book'
+xml.children[1].name = 'book'
+xml.css('info').each do |node|
   node.last_element_child.after(<<'XML')
 <copyright>
     <year>2017</year>
@@ -57,13 +58,16 @@ partreplace(xml, 'bibliography', 'chapter')
 partreplace(xml, 'acknowledgments', 'chapter')
 
 log 0, 'place part introduction into <partintro>'
-s = xml.xpath("//part/title[text()='The Case Studies']")[0]
+s = xml.search('part title').select {|tit| tit.content =~ /The Case Studies/}[0]
+
 if s
   s.after('<partintro>')
   p = xml.css('part partintro')[0]
-  s.parent.xpath("//part/para").each do |node|
+  s.parent.children.select{|c| c.name == 'para'}.each do |node|
     node.parent = p
   end
+else
+  log 0, 'Adding <partintro> failed!'
 end
 
 
@@ -73,7 +77,7 @@ log 0, 'remove empty notes/web links sections'
   'Web links',
   'Web link',
 ].each do |title|
-  xml.xpath("//title[text()='%s']" % title).each do |node|
+  xml.search('title').select  {|t| t.content == title}.each do |node|
     p = node.parent
     node.remove
     if p.content =~ /^\s*$/
@@ -88,8 +92,8 @@ log 0, 'remove title from dedication'
 xml.css('dedication title')[0].content = ""
 
 log 0, 'move legal notice to bookinfo'
-xml.css('book bookinfo')[0].last_element_child.after('<legalnotice>')
-ln = xml.css('book bookinfo legalnotice')[0]
+xml.css('book info')[0].last_element_child.after('<legalnotice>')
+ln = xml.css('book info legalnotice')[0]
 xml.css('para').each do |para|
   if para.content =~ /This book is published under a/
     log 0, 'found legal'
@@ -99,8 +103,8 @@ xml.css('para').each do |para|
 end
 
 log 0, 'replace colophon page with one for this edition'
- xml.xpath('//colophon/para').remove
-s = xml.xpath('//colophon')[0]
+ xml.search('colophon para').map {|p| p.remove}
+s = xml.search('colophon')[0]
 s.first_element_child.after(<<'XML')
 <para>Made with Creative Commons</para>
 
@@ -206,7 +210,5 @@ XML
 end
 end
 
-log 0, 'Writing processed file'
-# Unable to figure out API way to replace DOCTYPE
-data = xml.to_xml().gsub!(/DOCTYPE article/, 'DOCTYPE book')
-File.open(dstfile, 'w') {|f| f.write(data)}
+log 0, 'Writing processed file (%s)' % dstfile
+File.open(dstfile, 'w') {|f| f.write(xml.to_xml())}