new curriculum

[librarian.git] / librarian / pypdf.py

diff --git a/librarian/pypdf.py b/librarian/pypdf.py
index 408b18d..6aadbc4 100644 (file)
--- a/librarian/pypdf.py
+++ b/librarian/pypdf.py
@@ -29,7 +29,7 @@ def escape(really):
         def _wrap(*args, **kw):
             value = f(*args, **kw)
 
         def _wrap(*args, **kw):
             value = f(*args, **kw)
 

-            prefix = (u'<TeXML escape="%d">' % (really and 1 or 0))
+            prefix = (u'<TeXML escape="%d">' % (1 if really else 0))

             postfix = u'</TeXML>'
             if isinstance(value, list):
                 import pdb
             postfix = u'</TeXML>'
             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:
     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, _):
         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)
     @escape(True)
     def get_rightsinfo(self, element):
         rights_lic = self.get_dc(element, 'rights.license', True)

-        return u'<cmd name="rightsinfostr">' + (rights_lic and u'<opt>%s</opt>' % rights_lic or '') + \
+        return u'<cmd name="rightsinfostr">' + (u'<opt>%s</opt>' % rights_lic if rights_lic else '') + \

             u'<parm>%s</parm>' % self.get_dc(element, 'rights', True) + \
             u'</cmd>'
 
             u'<parm>%s</parm>' % self.get_dc(element, 'rights', True) + \
             u'</cmd>'
 


@@ -108,10 +108,45 @@ class EduModule(Xmill):
             authors = getattr(dc, "authors_%s" % which)
         return u', '.join(author.readable() for author in authors if author)
 
             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)
 
     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):
+        ret = []
+        for dc_tag, new in [('subject.curriculum', False), ('subject.curriculum.new', True)]:
+            identifiers = self.get_dc(element, dc_tag)
+            if not identifiers:
+                continue
+            try:
+                from curriculum.templatetags.curriculum_tags import curriculum
+                curr_elements = curriculum(identifiers)
+            except ImportError:
+                curr_elements = {'identifiers': identifiers}
+            items = ['Nowa podstawa programowa:' if new else 'Podstawa programowa:']
+            newline = '<ctrl ch="\\"/>\n'
+            if 'currset' in curr_elements:
+                for (course, level), types in curr_elements['currset'].iteritems():
+                    label = u'klasa' if new else u'poziom edukacyjny'
+                    lines = [u'%s, %s %s' % (course, level, label)]
+                    for type, currs in types.iteritems():
+                        lines.append(type)
+                        lines += [curr.title for curr in currs]
+                    items.append(newline.join(lines))
+            else:
+                items += identifiers
+            ret.append('\n<cmd name="vspace"><parm>.6em</parm></cmd>\n'.join(
+                '<cmd name="akap"><parm>%s</parm></cmd>' % item for item in items))
+        return '\n<cmd name="vspace"><parm>1em</parm></cmd>\n'.join(ret)
+

     def handle_utwor(self, element):
         lines = [
             u'''
     def handle_utwor(self, element):
         lines = [
             u'''


@@ -130,24 +165,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\\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'''\\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'</TeXML>'
         ]
 
         return u"".join(filter(None, lines)), u'</TeXML>'
 
             u'</TeXML>'
         ]
 
         return u"".join(filter(None, lines)), u'</TeXML>'
 

-    @escape(1)
+    @escape(True)

     def handle_powiesc(self, element):
         return u"""
     <env name="document">
     <cmd name="maketitle"/>
     """, """<cmd name="editorialsection" /></env>"""
 
     def handle_powiesc(self, element):
         return u"""
     <env name="document">
     <cmd name="maketitle"/>
     """, """<cmd name="editorialsection" /></env>"""
 

-    @escape(1)
+    @escape(True)

     def handle_texcommand(self, element):
         cmd = functions.texcommand(element.tag)
         return u'<TeXML escape="1"><cmd name="%s"><parm>' % cmd, u'</parm></cmd></TeXML>'
     def handle_texcommand(self, element):
         cmd = functions.texcommand(element.tag)
         return u'<TeXML escape="1"><cmd name="%s"><parm>' % cmd, u'</parm></cmd></TeXML>'


@@ -386,11 +423,11 @@ class EduModule(Xmill):
 <cmd name="begin"><parm>tabular</parm><parm>%s</parm></cmd>
     ''' % ('l' * max_col), u'''<cmd name="end"><parm>tabular</parm></cmd>'''
 
 <cmd name="begin"><parm>tabular</parm><parm>%s</parm></cmd>
     ''' % ('l' * max_col), u'''<cmd name="end"><parm>tabular</parm></cmd>'''
 

-    @escape(1)
+    @escape(True)

     def handle_wiersz(self, element):
         return u"", u'<ctrl ch="\\"/>'
 
     def handle_wiersz(self, element):
         return u"", u'<ctrl ch="\\"/>'
 

-    @escape(1)
+    @escape(True)

     def handle_kol(self, element):
         if element.getnext() is not None:
             return u"", u'<spec cat="align" />'
     def handle_kol(self, element):
         if element.getnext() is not None:
             return u"", u'<spec cat="align" />'


@@ -502,24 +539,19 @@ class Wybor(Exercise):
         if not pytania:
             pytania = [element]
         for p in pytania:
         if not pytania:
             pytania = [element]
         for p in pytania:

-            solutions = re.split(r"[, ]+", p.attrib.get('rozw', ''))
+            solutions = p.xpath(".//punkt[@rozw='prawda']")

             if len(solutions) != 1:
                 is_single_choice = False
                 break
             if len(solutions) != 1:
                 is_single_choice = False
                 break

-            choices = p.xpath(".//*[@nazwa]")
-            uniq = set()
-            for n in choices:
-                uniq.add(n.attrib.get('nazwa', ''))
-            if len(choices) != len(uniq):
-                is_single_choice = False
-                break

 
         self.options = {'single': is_single_choice}
         return pre, post
 
     def handle_punkt(self, element):
 
         self.options = {'single': is_single_choice}
         return pre, post
 
     def handle_punkt(self, element):

-        if self.options['exercise'] and element.attrib.get('nazwa', None):
+        if self.options['exercise'] and element.attrib.get('rozw', None):

             cmd = 'radio' if self.options['single'] else 'checkbox'
             cmd = 'radio' if self.options['single'] else 'checkbox'

+            if self.options['teacher'] and element.attrib['rozw'] == 'prawda':
+                cmd += 'checked'

             return u'<cmd name="%s"/>' % cmd, ''
         else:
             return super(Wybor, self).handle_punkt(element)
             return u'<cmd name="%s"/>' % cmd, ''
         else:
             return super(Wybor, self).handle_punkt(element)