[Erp5-report] r9430 - /erp5/trunk/utils/ooodoc_server/serw.py

[nobody at svn.erp5.org]

Author: bartek
Date: Fri Aug 25 12:59:13 2006
New Revision: 9430

URL: http://svn.erp5.org?rev=9430&view=rev
Log:
fixed naming of html files, zipping and removing old files

Modified:
    erp5/trunk/utils/ooodoc_server/serw.py

Modified: erp5/trunk/utils/ooodoc_server/serw.py
URL: http://svn.erp5.org/erp5/trunk/utils/ooodoc_server/serw.py?rev=9430&r1=9429&r2=9430&view=diff
==============================================================================
--- erp5/trunk/utils/ooodoc_server/serw.py (original)
+++ erp5/trunk/utils/ooodoc_server/serw.py Fri Aug 25 12:59:13 2006
@@ -142,9 +142,10 @@
       # because we are in finally, things can be none
       # if there was an exception
       if kw.get('filename') is not None:
-        self._safeRemove(self._mkName(kw['filename']))
-      if kw.get('newfilename') is not None:
-        self._safeRemove(self._mkName(kw['newfilename']))
+        os.system('rm -f %s*' % self._mkName(kw['filename']))
+        #self._safeRemove(self._mkName(kw['filename']))
+      #if kw.get('newfilename') is not None:
+        #self._safeRemove(self._mkName(kw['newfilename']))
     finally:
       if w is not None: 
         w.setFree()
@@ -172,14 +173,18 @@
               tozip=False
             if tozip:
                 #first delete the original
-                # XXX rewrite to use zipfile
+                # XXX rewrite to use zipfile and os filesystem layer
                 fname=kw['filename']
-                os.remove(self._mkName(fname))
-                zipname=self._mkName(fname+'.zip')
-                zipwildcard=self._mkName(fname+'*')
+                fullname=self._mkName(fname)
+                os.remove(fullname)
+                zipname=fullname+'.zip'
+                zipwildcard=fullname+'*'
+                cmd='mv %s.%s %s.html' % (fullname,kw['extension'],fullname)
+                res=os.system(cmd)
                 cmd='zip -j %s %s' % (zipname,zipwildcard)
                 res=os.system(cmd)
-                data=base64.encodestring(open(zipname).read())
+                kw['data']=base64.encodestring(open(zipname).read())
+                res=os.system('rm %s' % zipname)
                 kw['mime']='application/zip' # generation returns mime type
             else:
               kw['data']=base64.encodestring(open(self._mkName(kw['newfilename'])).read())