X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/8ac6e02d37081946e15e888d391b13bede1843d7..132297f0be27da544304733bd24da32282310235:/apps/catalogue/models/book.py?ds=inline diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py index f58fe108..83db3057 100755 --- a/apps/catalogue/models/book.py +++ b/apps/catalogue/models/book.py @@ -319,14 +319,14 @@ class Book(models.Model): def book_info(self, publishable=True): try: - book_xml = self.materialize(publishable=publishable) + book_xml = self.wl1_xml(publishable=publishable) except self.NoTextError: pass else: from librarian.dcparser import BookInfo from librarian import NoDublinCore, ParseError, ValidationError try: - return BookInfo.from_string(book_xml.encode('utf-8')) + return BookInfo.from_string(book_xml) except (self.NoTextError, ParseError, NoDublinCore, ValidationError): return None @@ -365,10 +365,10 @@ class Book(models.Model): def refresh(self): """This should be done offline.""" - self.short_html - self.single - self.new_publishable - self.published + self.short_html() + self.single() + self.new_publishable() + self.published() # Materializing & publishing # ========================== @@ -408,14 +408,23 @@ class Book(models.Model): parse_dublincore=parse_dublincore, strict=strict) - def publish(self, user): + def publish(self, user, host=None): """ Publishes a book on behalf of a (local) user. """ + import json + import os + from django.conf import settings self.assert_publishable() changes = self.get_current_changes() - book_xml = self.wl1_xml(changes=changes) - apiclient.api_call(user, "lessons/", {"lesson_xml": book_xml}) + data = {"lesson_xml": self.wl1_xml(changes=changes)} + if host: + gallery_url = u'%s%s%s%s/' % (host, settings.MEDIA_URL, settings.IMAGE_DIR, self.slug) + gallery_dir = os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, self.slug) + if os.path.isdir(gallery_dir): + data['gallery_url'] = gallery_url + data['attachments'] = json.dumps(os.listdir(gallery_dir)) + apiclient.api_call(user, "lessons/", data) # record the publish br = BookPublishRecord.objects.create(book=self, user=user) for c in changes: @@ -430,7 +439,7 @@ class Book(models.Model): import os.path from django.conf import settings from fnpdjango.utils.text.slughifi import slughifi - from librarian import ParseError + from librarian import ParseError, DCNS def _register_function(f): """ Register extension function with lxml """ @@ -463,7 +472,7 @@ class Book(models.Model): i1 = etree.parse(f2) for sect in i1.findall('//section'): - if sect[0].text == u'Przebieg zajęć': + if sect[0].text and sect[0].text.strip() == u'Przebieg zajęć': # Prostujemy. first = sect.find('section') subs = first.findall('.//section') @@ -472,14 +481,19 @@ class Book(models.Model): break else: # print 'BRAK PRZEBIEGU' - raise ParseError('Brak przebiegu') + dc_type = i1.findall('//dc:type', namespaces={'dc': DCNS.uri}) + if dc_type and dc_type[0] in ('course', 'synthetic'): + raise ParseError('Brak przebiegu') i1.getroot().attrib['redslug'] = self.slug i1.getroot().attrib['wlslug'] = self.slug # THIS! # print '.', w1t = i1.xslt(t) for h in w1t.findall('//aktywnosc/opis'): - if not re.match(r'\d\.\s', h[0].text): + if len(h) == 0: + raise ParseError('Pusty element aktywnosc/opis') + # FIXME assumption that every lesson has at most 9 parts + if not h[0].text or not re.match(r'\d\.\s', h[0].text): raise ParseError('Niepoprawny nagłówek (aktywnosc/opis): %s' % repr(h[0].text)) h[0].text = h[0].text[3:] return etree.tostring(w1t, encoding='utf-8')