[Checkins] SVN: zopyx.smartprintng.server/branches/calibre-integration/ updated

[Andreas Jung]

Log message for revision 103596:
  updated
  

Changed:
  U   zopyx.smartprintng.server/branches/calibre-integration/docs/HISTORY.txt
  U   zopyx.smartprintng.server/branches/calibre-integration/setup.py
  U   zopyx.smartprintng.server/branches/calibre-integration/zopyx/smartprintng/server/models.py

-=-
Modified: zopyx.smartprintng.server/branches/calibre-integration/docs/HISTORY.txt
===================================================================
--- zopyx.smartprintng.server/branches/calibre-integration/docs/HISTORY.txt	2009-09-05 12:58:17 UTC (rev 103595)
+++ zopyx.smartprintng.server/branches/calibre-integration/docs/HISTORY.txt	2009-09-05 13:21:59 UTC (rev 103596)
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.5.2 (2009/09/05)
+------------------
+* adjusted to newest zopyx.convert2 version
+
 0.5.1 (2009/08/01)
 ------------------
 

Modified: zopyx.smartprintng.server/branches/calibre-integration/setup.py
===================================================================
--- zopyx.smartprintng.server/branches/calibre-integration/setup.py	2009-09-05 12:58:17 UTC (rev 103595)
+++ zopyx.smartprintng.server/branches/calibre-integration/setup.py	2009-09-05 13:21:59 UTC (rev 103596)
@@ -10,7 +10,7 @@
 if sys.version_info < (2,6):
     raise RuntimeError('Please use Python 2.6.X')
 
-version = '0.5.1'
+version = '0.5.2'
 
 setup(name='zopyx.smartprintng.server',
       version=version,

Modified: zopyx.smartprintng.server/branches/calibre-integration/zopyx/smartprintng/server/models.py
===================================================================
--- zopyx.smartprintng.server/branches/calibre-integration/zopyx/smartprintng/server/models.py	2009-09-05 12:58:17 UTC (rev 103595)
+++ zopyx.smartprintng.server/branches/calibre-integration/zopyx/smartprintng/server/models.py	2009-09-05 13:21:59 UTC (rev 103596)
@@ -127,16 +127,17 @@
         self._inject_base_tag(html_filename)
         result = self._convert(html_filename, 
                                converter_name=converter_name)
-        basename, ext = os.path.splitext(os.path.basename(result))
+        output_filename = result['output_filename']
+        basename, ext = os.path.splitext(os.path.basename(output_filename))
 
         # Generate result ZIP archive with base64-encoded result
         zip_out = os.path.join(tempdir, '%s.zip' % ident)
         ZF = zipfile.ZipFile(zip_out, 'w')
-        ZF.writestr('output%s' % ext, file(result, 'rb').read())
+        ZF.writestr('output%s' % ext, file(output_filename, 'rb').read())
         ZF.close()
 
         LOG.info('Request end (%3.2lf seconds)' % (time.time() - ts))
-        return zip_out, result
+        return zip_out, output_filename
 
     def convertZIP(self, zip_archive, converter_name='pdf-prince'):
         """ Process html-file + images within a ZIP archive """