Changeset 112:e22eeb00aa5a

Timestamp:

01/27/09 07:36:35 (14 months ago)

Author:

Ga?tan de Menten <ged@…>

Branch:

default

Message:

do not use the report repository in any example except a special purpose
example "demo_repository".

Files:

• examples/basic.tex (modified) (1 diff)
• examples/common.py (modified) (3 diffs)
• examples/complicated.odt (moved) (moved from examples/invoice.odt)
• examples/demo_chart.py (modified) (1 diff)
• examples/demo_context.py (modified) (1 diff)
• examples/demo_odf.py (modified) (1 diff)
• examples/demo_repository.py (added)
• relatorio/templates/pdf.py (modified) (1 diff)

examples/basic.tex

@@ -13 +13 @@
 \HL
 {% for line in o.lines%} \
-\NC $line.item.name \VL $line.item.reference \VL $line.quantity 
+\NC $line.item.name \VL $line.item.reference \VL $line.quantity
 \VL $line.item.price \VL $line.amount \SR
 \HL \

examples/common.py

@@ -1 @@
-import relatorio
-
 class Invoice(dict):
 
@@ -12 +10 @@
 
 
-repos = relatorio.ReportRepository()
 inv = Invoice(customer={'name': 'John Bonham',
                         'address': {'street': 'Smirnov street',
@@ -42 +39 @@
               bottle=(file('bouteille.png', 'r'), 'image/png'))
 
-
-

examples/demo_chart.py

@@ -1 @@
-from cStringIO import StringIO
-from common import Invoice, repos, inv
+from os.path import abspath
+from relatorio import Report
 
-repos.add_report(Invoice, 'image/png', 'pie_chart', report_name='pie')
-repos.add_report(Invoice, 'image/svg', 'vbar_chart', report_name='vbar')
-repos.add_report(Invoice, 'image/svg', 'hbar_chart', report_name='hbar')
-repos.add_report(Invoice, 'image/png', 'line_chart', report_name='line')
+# test data
+from common import inv
 
 if __name__ == '__main__':
-    pie_report, _ = repos.classes[Invoice].ids['pie']
+    pie_report = Report(abspath('pie_chart'), 'image/png')
     file('pie.png', 'wb').write(pie_report(o=inv).render().getvalue())
-    hbar_report, _ = repos.classes[Invoice].ids['hbar']
+    hbar_report = Report(abspath('hbar_chart'), 'image/svg')
     file('hbar.svg', 'wb').write(hbar_report(o=inv).render().getvalue())
-    vbar_report, _ = repos.classes[Invoice].ids['vbar']
+    vbar_report = Report(abspath('vbar_chart'), 'image/svg')
     file('vbar.svg', 'wb').write(vbar_report(o=inv).render().getvalue())
-    line_report, _ = repos.classes[Invoice].ids['line']
+    line_report = Report(abspath('line_chart'), 'image/png')
     file('line.png', 'wb').write(line_report(o=inv).render().getvalue())

examples/demo_context.py

@@ -1 @@
-from cStringIO import StringIO
-from common import Invoice, repos, inv
+from os.path import abspath
+from relatorio import Report
 
-repos.add_report(Invoice, 'application/pdf', 'basic.tex',
-                 report_name='ConTeXt')
+# test data
+from common import inv
+
 #PDF
 if __name__ == '__main__':
-    pdf_report, _ = repos.classes[Invoice].ids['ConTeXt']
-    file('bonham_basic.pdf', 'wb').write(pdf_report(o=inv).render().getvalue())
+    print "generating output_basic.pdf... ",
+    report = Report(abspath('basic.tex'), 'application/pdf')
+    content = report(o=inv).render().getvalue()
+    file('output_basic.pdf', 'wb').write(content)
+    print "done"
 

examples/demo_odf.py

@@ -1 @@
-from cStringIO import StringIO
-from common import Invoice, repos, inv
-import demo_chart
+from os.path import abspath
+from relatorio import Report
 
-repos.add_report(Invoice, 'application/vnd.oasis.opendocument.text',
-                 'basic.odt', report_name='basic')
-repos.add_report(Invoice, 'application/vnd.oasis.opendocument.text',
-                 'invoice.odt', report_name='complicated')
-repos.add_report(Invoice, 'application/vnd.oasis.opendocument.spreadsheet',
-                 'pivot.ods', report_name='pivot')
-repos.add_report(Invoice, 'application/vnd.oasis.opendocument.presentation',
-                 'presentation.odp', report_name='presentation')
-repos.add_report(None, 'application/vnd.oasis.opendocument.text',
-                 'columns.odt', report_name='column')
+# test data
+from common import inv
+
+ODT_MIME = 'application/vnd.oasis.opendocument.text'
+ODS_MIME = 'application/vnd.oasis.opendocument.spreadsheet'
+ODP_MIME = 'application/vnd.oasis.opendocument.presentation'
 
 if __name__ == '__main__':
-    # Add a chart to the invoice
-    inv['chart'] = repos.classes[Invoice].ids['pie']
-
     # ODT
     print "generating output_basic.odt... ",
-    basic_report, _ = repos.classes[Invoice].ids['basic']
-    data = basic_report(o=inv).render().getvalue()
-    file('output_basic.odt', 'wb').write(data)
+    report = Report(abspath('basic.odt'), ODT_MIME)
+    content = report(o=inv).render().getvalue()
+    file('output_basic.odt', 'wb').write(content)
     print "done"
 
+    # we could also use an opendocument template directly
+#    from relatorio.templates import opendocument
+#    template = opendocument.Template(source=None, filepath='basic.odt')
+#    content = template.generate(o=inv).render().getvalue()
+#    file('output_basic.odt', 'wb').write(content)
+
     print "generating output_complicated.odt... ",
-    report, _ = repos.classes[Invoice].ids['complicated']
-    data = report(o=inv).render().getvalue()
-    file('output_complicated.odt', 'wb').write(data)
+    # Add a chart to the invoice
+    inv['chart'] = (Report(abspath('pie_chart'), 'image/png'), 'image/png')
+    report = Report(abspath('complicated.odt'), ODT_MIME)
+    content = report(o=inv).render().getvalue()
+    file('output_complicated.odt', 'wb').write(content)
     print "done"
 
     print "generating output_columns.odt... ",
-    column_report, _ = repos.classes[None].ids['column']
+    report = Report(abspath('columns.odt'), ODT_MIME)
     lst = [[], ['i'], ['a', 'b'], [1, 2, 3], ['I', 'II', 'III', 'IV']]
     titles = ['first', 'second', 'third', 'fourth']
-    data = column_report(titles=titles, lst=lst).render().getvalue()
-    file('output_columns.odt', 'wb').write(data)
+    content = report(titles=titles, lst=lst).render().getvalue()
+    file('output_columns.odt', 'wb').write(content)
     print "done"
 
     # ODS
     print "generating output_pivot.ods... ",
-    ods_report, _ = repos.classes[Invoice].ids['pivot']
-    data = ods_report(o=inv).render().getvalue()
-    file('output_pivot.ods', 'wb').write(data)
+    report = Report(abspath('pivot.ods'), ODS_MIME)
+    content = report(o=inv).render().getvalue()
+    file('output_pivot.ods', 'wb').write(content)
     print "done"
 
     # ODP
     print "generating output_presentation.odp... ",
-    odp_report, _ = repos.classes[Invoice].ids['presentation']
-    data = odp_report(o=inv).render().getvalue()
-    file('output_presentation.odp', 'wb').write(data)
+    report = Report(abspath('presentation.odp'), ODP_MIME)
+    content = report(o=inv).render().getvalue()
+    file('output_presentation.odp', 'wb').write(content)
     print "done"
 

relatorio/templates/pdf.py

@@ -11 +11 @@
 # 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 
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
 # details.
 #