From 3a70fb37a8784ea703eb23d8b19b90bfd00f13bc Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 19 Jan 2012 15:56:10 +0100 Subject: [PATCH 1/1] kind, genre, epoch not required --- librarian/dcparser.py | 15 +++++++++------ scripts/book2html | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/librarian/dcparser.py b/librarian/dcparser.py index a0eaa04..f64317a 100644 --- a/librarian/dcparser.py +++ b/librarian/dcparser.py @@ -347,9 +347,12 @@ class BookInfo(WorkInfo): Field( DCNS('audience'), 'audiences', salias='audience', multiple=True, required=False), - Field( DCNS('subject.period'), 'epochs', salias='epoch', multiple=True), - Field( DCNS('subject.type'), 'kinds', salias='kind', multiple=True), - Field( DCNS('subject.genre'), 'genres', salias='genre', multiple=True), + Field( DCNS('subject.period'), 'epochs', salias='epoch', multiple=True, + required=False), + Field( DCNS('subject.type'), 'kinds', salias='kind', multiple=True, + required=False), + Field( DCNS('subject.genre'), 'genres', salias='genre', multiple=True, + required=False), Field( DCNS('contributor.translator'), 'translators', \ as_person, salias='translator', multiple=True, default=[]), @@ -358,9 +361,9 @@ class BookInfo(WorkInfo): Field( DCNS('relation.isVariantOf'), 'variant_of', WLURI, strict=as_wluri_strict, required=False), - Field( DCNS('relation.cover_image.url'), 'cover_url', required=False), - Field( DCNS('relation.cover_image.attribution'), 'cover_by', required=False), - Field( DCNS('relation.cover_image.source'), 'cover_source', required=False), + Field( DCNS('relation.coverImage.url'), 'cover_url', required=False), + Field( DCNS('relation.coverImage.attribution'), 'cover_by', required=False), + Field( DCNS('relation.coverImage.source'), 'cover_source', required=False), ) diff --git a/scripts/book2html b/scripts/book2html index 1e88823..8adeb38 100755 --- a/scripts/book2html +++ b/scripts/book2html @@ -22,6 +22,8 @@ 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() @@ -38,7 +40,8 @@ if __name__ == '__main__': try: doc = WLDocument.from_file(input_filename, parse_dublincore=options.parse_dublincore) - html = doc.as_html(flags=('full-page',)) + 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' % { -- 2.20.1