[Checkins] SVN: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/ cleanup
Andreas Jung
andreas at andreas-jung.com
Sat Jul 18 06:20:21 EDT 2009
Log message for revision 101984:
cleanup
Changed:
U zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/base.py
U zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/views.py
-=-
Modified: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/base.py
===================================================================
--- zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/base.py 2009-07-18 09:44:11 UTC (rev 101983)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/base.py 2009-07-18 10:20:21 UTC (rev 101984)
@@ -94,13 +94,13 @@
LOG.debug('Request end (%3.2lf seconds)' % (time.time() - ts))
return encoded_result
- def convertZIPEmail(self, zip_archive, converter_name='pdf-prince', email_param={}):
+ def convertZIPEmail(self, zip_archive, converter_name='pdf-prince', sender=None, recipients=None, subject=None, body=None):
""" Process zip archive and send conversion result as mail """
LOG.debug('Incoming request (%s, %d bytes)' % (converter_name, len(zip_archive)))
ts = time.time()
zip_out, output_filename = self._processZIP(zip_archive, converter_name)
- mail_util.send_email('info at zopyx.com', 'info at zopyx.com', 'test', 'test', [output_filename])
+ mail_util.send_email(sender, recipients, subject, body, [output_filename])
shutil.rmtree(os.path.dirname(zip_out))
LOG.debug('Request end (%3.2lf seconds)' % (time.time() - ts))
return True
Modified: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/views.py
===================================================================
--- zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/views.py 2009-07-18 09:44:11 UTC (rev 101983)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/views.py 2009-07-18 10:20:21 UTC (rev 101984)
@@ -46,10 +46,10 @@
return xmlrpclib.Fault(123, msg)
@xmlrpc_view
-def convertZIPEmail(context, zip_archive, converter_name='pdf-prince'):
- core = ServerCore()
+def convertZIPEmail(context, zip_archive, converter_name='pdf-prince', sender=None, recipients=None, subject=None, body=None):
+ core = ServerCore()
try:
- return core.convertZIPEmail(zip_archive, converter_name)
+ return core.convertZIPEmail(zip_archive, converter_name, sender, recipients, subject, body):
except Exception, e:
msg = 'Conversion failed (%s)' % e
LOG.error(msg, exc_info=True)
More information about the Checkins
mailing list