From: Jan Szejko Date: Tue, 31 Jan 2017 13:53:41 +0000 (+0100) Subject: curriculum in pdf footer X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/e797b32fa517a05d15fbd3c15a30d8c615500fd6?ds=sidebyside;hp=f1ae0a40b774ad7260e7449986764c9104553e03 curriculum in pdf footer --- diff --git a/librarian/pdf.py b/librarian/pdf.py index c02e98c..44ec644 100644 --- a/librarian/pdf.py +++ b/librarian/pdf.py @@ -70,19 +70,30 @@ def insert_tags(doc, split_re, tagname, exclude=None): def substitute_hyphens(doc): - insert_tags(doc, - re.compile("(?<=[^-\s])-(?=[^-\s])"), - "dywiz", - exclude=[DCNS("identifier.url"), DCNS("rights.license"), 'www'] - ) + insert_tags( + doc, re.compile("(?<=[^-\s])-(?=[^-\s])"), "dywiz", + exclude=[ + DCNS("identifier.url"), + DCNS("rights.license"), + DCNS("title"), + DCNS("description"), + DCNS("subject.curriculum"), + 'www', + ] + ) def fix_hanging(doc): - insert_tags(doc, - re.compile("(?<=\s\w)\s+"), - "nbsp", - exclude=[DCNS("identifier.url"), DCNS("rights.license"), DCNS("title"), DCNS("description")] - ) + insert_tags( + doc, re.compile("(?<=\s\w)\s+"), "nbsp", + exclude=[ + DCNS("identifier.url"), + DCNS("rights.license"), + DCNS("title"), + DCNS("description"), + DCNS("subject.curriculum"), + ] + ) def move_motifs_inside(doc): diff --git a/librarian/pypdf.py b/librarian/pypdf.py index 920f1b9..5ba5131 100644 --- a/librarian/pypdf.py +++ b/librarian/pypdf.py @@ -93,7 +93,7 @@ class EduModule(Xmill): @escape(True) def get_rightsinfo(self, element): rights_lic = self.get_dc(element, 'rights.license', True) - return u'' + (rights_lic and u'%s' % rights_lic or '') + \ + return u'' + (u'%s' % rights_lic if rights_lic else '') + \ u'%s' % self.get_dc(element, 'rights', True) + \ u'' @@ -116,9 +116,33 @@ class EduModule(Xmill): def get_description(self, element): desc = self.get_dc(element, 'description', single=True) if not desc: - print '!! no descripton' + print '!! no description' return desc + @escape(True) + def get_curriculum(self, element): + identifiers = self.get_dc(element, 'subject.curriculum') + if not identifiers: + return '' + try: + from curriculum.templatetags.curriculum_tags import curriculum + curr_elements = curriculum(identifiers) + except ImportError: + curr_elements = {'identifiers': identifiers} + items = ['Podstawa programowa:'] + newline = '\n' + if 'currset' in curr_elements: + for (course, level), types in curr_elements['currset'].iteritems(): + lines = [u'%s, %s poziom edukacyjny' % (course, level)] + for type, currs in types.iteritems(): + lines.append(type) + lines += [curr.title for curr in currs] + items.append(newline.join(lines)) + else: + items += identifiers + return '\n.6em\n'.join( + '%s' % item for item in items) + def handle_utwor(self, element): lines = [ u''' @@ -143,6 +167,7 @@ class EduModule(Xmill): u'''\\title{%s}''' % self.get_title(element), u'''\\def\\bookurl{%s}''' % self.options['wldoc'].book_info.url.canonical(), u'''\\def\\rightsinfo{%s}''' % self.get_rightsinfo(element), + u'''\\def\\curriculum{%s}''' % self.get_curriculum(element), u'' ] diff --git a/librarian/res/styles/edumed/pdf/edumed.sty b/librarian/res/styles/edumed/pdf/edumed.sty index dc856d1..0a18142 100644 --- a/librarian/res/styles/edumed/pdf/edumed.sty +++ b/librarian/res/styles/edumed/pdf/edumed.sty @@ -71,6 +71,9 @@ Materiał pochodzi z serwisu \href{http://edukacjamedialna.edu.pl}{edukacjamedia \vspace{.6em} \description +\vspace{.6em} +\curriculum + \color{black} } \end{figure}