X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/215503e15ca9d6d1e8a053f7bfa359af1af102f3..5f2702eda7a1b36f4d29658b5468b6b78745218c:/scripts/book2html

diff --git a/scripts/book2html b/scripts/book2html
index 8ec7aa8..8adeb38 100755
--- a/scripts/book2html
+++ b/scripts/book2html
@@ -1,29 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
-#
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    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 <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import os
 import optparse
 
-from librarian import html, ParseError
+from librarian import ParseError
+from librarian.parser import WLDocument
 
 
 if __name__ == '__main__':
@@ -37,7 +22,9 @@ if __name__ == '__main__':
         help='print status messages to stdout')
     parser.add_option('-i', '--ignore-dublin-core', action='store_false', dest='parse_dublincore', default=True,
         help='don\'t try to parse dublin core metadata')
-            
+    parser.add_option('-r', '--raw', action='store_false', dest='full_page', default=True,
+        help='outpu raw text for use in templates')
+
     options, input_filenames = parser.parse_args()
 
     if len(input_filenames) < 1:
@@ -48,15 +35,19 @@ if __name__ == '__main__':
     for input_filename in input_filenames:
         if options.verbose:
             print input_filename
-        
+
         output_filename = os.path.splitext(input_filename)[0] + '.html'
         try:
-            html.transform(input_filename, output_filename, parse_dublincore=options.parse_dublincore)
+            doc = WLDocument.from_file(input_filename,
+                parse_dublincore=options.parse_dublincore)
+            flags = ('full-page',) if options.full_page else None
+            html = doc.as_html(flags=flags)
+            doc.save_output_file(html, output_path=output_filename)
         except ParseError, e:
             print '%(file)s:%(name)s:%(message)s' % {
                 'file': input_filename,
                 'name': e.__class__.__name__,
-                'message': e.message
+                'message': e,
             }
         except IOError, e:
             print '%(file)s:%(name)s:%(message)s' % {
@@ -68,7 +59,7 @@ if __name__ == '__main__':
             print '%(file)s:%(etype)s:%(message)s' % {
                 'file': input_filename,
                 'etype': e.__class__.__name__,
-                'message': e.message,
+                'message': e,
             }
-            raise e
+            raise