Changeset 13:d57a45e8a7b2

Timestamp:

07/14/08 22:09:55 (5 years ago)

Author:

Nicolas Evrard <nicoe@…>

Branch:

default

Message:

- Created a NullTemplate? object for unavailable templates

• test for trml2pdf presence (we do not want to depend on this)
  
• generate different hashes for images althought the expr is the same
  

Location:

relatorio

Files:

• reporting.py (modified) (2 diffs)
• templates/__init__.py (modified) (1 diff)
• templates/odt.py (modified) (3 diffs)

relatorio/reporting.py

@@ -19 +19 @@
 ###############################################################################
 
-__revision__ = "$Id: reporting.py 13 2008-07-10 16:41:20Z ged $"
+__revision__ = "$Id: reporting.py 14 2008-07-14 22:09:55Z nicoe $"
 __metaclass__ = type
 
@@ -28 +28 @@
 from genshi.template import TemplateLoader
 
+from templates import NullTemplate
 from templates.odt import Template as OOTemplate
-from templates.pdf import Template as PDFTemplate
+
+try:
+    from templates.pdf import Template as PDFTemplate
+except ImportError:
+    PDFTemplate = NullTemplate
+    warnings.warn("trml2pdf is not installed on your system. You will not "
+                  "be able to create PDF files.")
 
 def _absolute(path):

relatorio/templates/__init__.py

@@ +1 @@
+###############################################################################
+#
+# Copyright (c) 2007, 2008 OpenHex SPRL. (http://openhex.com) All Rights
+# Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+###############################################################################
+
+__revision__ = "$Id: __init__.py 14 2008-07-14 22:09:55Z nicoe $"
+__metaclass__ = type
+
+from genshi.template import Template as GenshiTemplate, MarkupTemplate
+
+
+class NullTemplate(GenshiTemplate):
+
+    def __init__(self, source, filepath=None, filename=None, loader=None,
+                 encoding=None, lookup='strict', allow_exec=True):
+        raise NotImplementedError
+
+    def _parse(self, source, encoding):
+        pass
+    
+    def _prepare(self, stream):
+        pass
+
+    def generate(self, *args, **kwargs):
+        pass

relatorio/templates/odt.py

@@ -19 +19 @@
 ###############################################################################
 
-__revision__ = "$Id: odt.py 9 2008-07-08 19:23:12Z nicoe $"
+__revision__ = "$Id: odt.py 14 2008-07-14 22:09:55Z nicoe $"
 __metaclass__ = type
 
@@ -46 +46 @@
              }
 
-def _make_href(zip):
-    def attr_maker(expr, name):
+class ImageHref:
+    
+    def __init__(self, zipfile):
+        self.zip = zipfile
+        self.count = 0
+
+    def __call__(self, expr, name):
         bitstream, mimetype = expr
-        name = md5.new(name).hexdigest()
+        name = md5.new('%s-%s' % (name, self.count)).hexdigest()
+        self.count += 1
         path = 'Pictures/%s.%s' % (name, EXTENSIONS[mimetype])
         bitstream.seek(0)
-        zip.writestr(path, bitstream.read())
+        self.zip.writestr(path, bitstream.read())
         return {'{%s}href' % NS['xlink']: path}
-    return attr_maker
 
 
@@ -178 +183 @@
         outzip = zipfile.ZipFile(new_oo, 'w')
 
-        kwargs['make_href'] = _make_href(outzip)
+        kwargs['make_href'] = ImageHref(outzip)
         content = str(self.content_template.generate(*args, **kwargs))