X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/05a4485b020b9252f5ffc02d19c163705cbf26e2..e797b32fa517a05d15fbd3c15a30d8c615500fd6:/librarian/pypdf.py?ds=sidebyside
diff --git a/librarian/pypdf.py b/librarian/pypdf.py
index 408b18d..5ba5131 100644
--- a/librarian/pypdf.py
+++ b/librarian/pypdf.py
@@ -29,7 +29,7 @@ def escape(really):
def _wrap(*args, **kw):
value = f(*args, **kw)
- prefix = (u'' % (really and 1 or 0))
+ prefix = (u'' % (1 if really else 0))
postfix = u''
if isinstance(value, list):
import pdb
@@ -83,7 +83,7 @@ class EduModule(Xmill):
def get_dc(self, element, dc_field, single=False):
values = map(lambda t: t.text, element.xpath("//dc:%s" % dc_field, namespaces={'dc': DCNS.uri}))
if single:
- return values[0]
+ return values[0] if len(values) else ''
return values
def handle_rdf__RDF(self, _):
@@ -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''
@@ -108,10 +108,41 @@ class EduModule(Xmill):
authors = getattr(dc, "authors_%s" % which)
return u', '.join(author.readable() for author in authors if author)
- @escape(1)
+ @escape(True)
def get_title(self, element):
return self.get_dc(element, 'title', True)
+ @escape(True)
+ def get_description(self, element):
+ desc = self.get_dc(element, 'description', single=True)
+ if not desc:
+ 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'''
@@ -130,24 +161,26 @@ class EduModule(Xmill):
u'''\\def\\authorsexpert{%s}''' % self.get_authors(element, 'expert'),
u'''\\def\\authorsscenario{%s}''' % self.get_authors(element, 'scenario'),
u'''\\def\\authorstextbook{%s}''' % self.get_authors(element, 'textbook'),
+ u'''\\def\\description{%s}''' % self.get_description(element),
u'''\\author{\\authors}''',
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''
]
return u"".join(filter(None, lines)), u''
- @escape(1)
+ @escape(True)
def handle_powiesc(self, element):
return u"""
""", """"""
- @escape(1)
+ @escape(True)
def handle_texcommand(self, element):
cmd = functions.texcommand(element.tag)
return u'' % cmd, u''
@@ -386,11 +419,11 @@ class EduModule(Xmill):
tabular%s
''' % ('l' * max_col), u'''tabular'''
- @escape(1)
+ @escape(True)
def handle_wiersz(self, element):
return u"", u''
- @escape(1)
+ @escape(True)
def handle_kol(self, element):
if element.getnext() is not None:
return u"", u''