[Checkins] SVN: zopyx.smartprintng.client/trunk/ holiday work

[Andreas Jung]

Log message for revision 102413:
  holiday work
  

Changed:
  U   zopyx.smartprintng.client/trunk/docs/HISTORY.txt
  U   zopyx.smartprintng.client/trunk/setup.py
  U   zopyx.smartprintng.client/trunk/zopyx/smartprintng/client/zip_client.py

-=-
Modified: zopyx.smartprintng.client/trunk/docs/HISTORY.txt
===================================================================
--- zopyx.smartprintng.client/trunk/docs/HISTORY.txt	2009-07-31 23:08:58 UTC (rev 102412)
+++ zopyx.smartprintng.client/trunk/docs/HISTORY.txt	2009-08-01 20:07:18 UTC (rev 102413)
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.4.0 (2007-08-03)
+------------------
+
+* added convertZIPandRedirect() API 
+
 0.3.0 (2007-07-19)
 ------------------
 

Modified: zopyx.smartprintng.client/trunk/setup.py
===================================================================
--- zopyx.smartprintng.client/trunk/setup.py	2009-07-31 23:08:58 UTC (rev 102412)
+++ zopyx.smartprintng.client/trunk/setup.py	2009-08-01 20:07:18 UTC (rev 102413)
@@ -1,7 +1,13 @@
+##########################################################################
+# zopyx.smartprintng.client - client library for the SmartPrintNG server
+# (C) 2009, ZOPYX Ltd & Co. KG, Tuebingen, Germany
+##########################################################################
+
+
 from setuptools import setup, find_packages
 import os
 
-version = '0.3.0'
+version = '0.4.0'
 
 setup(name='zopyx.smartprintng.client',
       version=version,

Modified: zopyx.smartprintng.client/trunk/zopyx/smartprintng/client/zip_client.py
===================================================================
--- zopyx.smartprintng.client/trunk/zopyx/smartprintng/client/zip_client.py	2009-07-31 23:08:58 UTC (rev 102412)
+++ zopyx.smartprintng.client/trunk/zopyx/smartprintng/client/zip_client.py	2009-08-01 20:07:18 UTC (rev 102413)
@@ -65,6 +65,17 @@
         os.unlink(zip_temp)
         return output_filename
 
+    def convertZIPandRedirect(self, dirname, converter_name='pdf-prince', prefix=None):
+        """ XMLRPC client to SmartPrintNG server """
+
+        zip_filename = self._makeZipFromDirectory(dirname)
+        server = xmlrpclib.ServerProxy('http://%s:%d/convertZIPandRedirect' % (self.host, self.port))
+        location = server(base64.encodestring(file(zip_filename, 'rb').read()),
+                          converter_name,
+                          prefix)
+        os.unlink(zip_filename)
+        return location
+
     def convertZIPEmail(self, dirname, converter_name='pdf-prince', 
                         sender=None, recipients=None, subject=None, body=None):
 
@@ -86,9 +97,9 @@
     print proxy.ping()
     print proxy.availableConverters()
     print proxy.convertZIP(sys.argv[1])
-    print proxy.convertZIPEmail(sys.argv[1], 
-                                sender='foo at bar.org', 
-                                recipients='foo at bar.org', 
-                                subject=unicode('üöä', 'latin1').encode('utf-8'),
-                                body=unicode('üöä', 'latin1').encode('utf-8'))
+#    print proxy.convertZIPEmail(sys.argv[1], 
+#                                sender='foo at bar.org', 
+#                                recipients='foo at bar.org', 
+#                                subject=unicode('üöä', 'latin1').encode('utf-8'),
+#                                body=unicode('üöä', 'latin1').encode('utf-8'))