[Erp5-report] r13210 - in /erp5/trunk/utils/oood: mimemapper.py test_server.py

nobody at svn.erp5.org nobody at svn.erp5.org
Sat Mar 3 16:12:34 CET 2007


Author: bartek
Date: Sat Mar  3 16:12:31 2007
New Revision: 13210

URL: http://svn.erp5.org?rev=13210&view=rev
Log:
added more formats, mostly for importing from; added test for these formats; tidy structure of directories for running tests; added test documents;

Modified:
    erp5/trunk/utils/oood/mimemapper.py
    erp5/trunk/utils/oood/test_server.py

Modified: erp5/trunk/utils/oood/mimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/mimemapper.py?rev=13210&r1=13209&r2=13210&view=diff
==============================================================================
--- erp5/trunk/utils/oood/mimemapper.py (original)
+++ erp5/trunk/utils/oood/mimemapper.py Sat Mar  3 16:12:31 2007
@@ -38,23 +38,23 @@
   types_map={
     'application/vnd.oasis.opendocument.text':
       {'ext':'odt',
-       'allowed_to':['pdf','doc','rtf','html-writer','txt'],
-       'allowed_from':['rtf','doc','txt'],
+       'allowed_to':['pdf', 'doc', 'rtf', 'html-writer', 'txt'],
+       'allowed_from':['rtf', 'doc', 'txt', 'sxw', 'sdw'],
       },
      'application/vnd.oasis.opendocument.spreadsheet':
      {'ext':'ods',
-      'allowed_to':['csv','html-calc','xls','calc.pdf'],
-      'allowed_from':['xls','sxc'],
+      'allowed_to':['csv', 'html-calc', 'xls', 'calc.pdf'],
+      'allowed_from':['xls', 'sxc', 'sdc'],
      },
      'application/vnd.oasis.opendocument.presentation':
      {'ext':'odp',
-      'allowed_to':['impr.pdf','ppt'],
-      'allowed_from':['ppt'],
+      'allowed_to':['impr.pdf', 'ppt'],
+      'allowed_from':['ppt', 'sxi', 'sdd'],
      },
      'application/vnd.oasis.opendocument.graphics':
      {'ext':'odg',
-      'allowed_to':['jpg','draw.pdf'],
-      'allowed_from':[],
+      'allowed_to':['jpg', 'draw.pdf', 'svg'],
+      'allowed_from':['sxd', 'sda'],
      },
    }
 
@@ -117,6 +117,12 @@
     'jpg':{
       'mime_type':'image/jpg',
       'outprops':(PropertyValue("FilterName",0,"draw_jpg_Export",0),PropertyValue("Overwrite",0,True,0)),
+      'label': 'JPEG',
+    },
+    'svg':{
+      'mime_type':'image/svg+xml',
+      'outprops':(PropertyValue("FilterName",0,"draw_svg_Export",0),PropertyValue("Overwrite",0,True,0)),
+      'label':'Scalable Vector Graphics',
     },
     'draw.pdf':{
       'mime_type':'application/pdf',
@@ -124,6 +130,38 @@
     },
     'sxc':{
       'mime_type':'application/vnd.sun.xml.calc',
+      'outprops':(),
+    },
+    'sdc':{
+      'mime_type':'application/vnd.stardivision.calc',
+      'outprops':(),
+    },
+    #'pxl':{ # OOo is apparently not able to do this one - saves as, but does not import
+      #'mime_type':'application/x-pocket-excel',
+      #'outprops':(),
+    #},
+    'sxw':{
+      'mime_type':'application/vnd.sun.xml.writer',
+      'outprops':(),
+    },
+    'sdw':{
+      'mime_type':'application/vnd.stardivision.writer',
+      'outprops':(),
+    },
+    'sxi':{
+      'mime_type':'application/vnd.sun.xml.impress',
+      'outprops':(),
+    },
+    'sdd':{
+      'mime_type':'application/vnd.stardivision.impress',
+      'outprops':(),
+    },
+    'sxd':{
+      'mime_type':'application/vnd.sun.xml.draw',
+      'outprops':(),
+    },
+    'sda':{
+      'mime_type':'application/vnd.stardivision.draw',
       'outprops':(),
     },
   }

Modified: erp5/trunk/utils/oood/test_server.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/test_server.py?rev=13210&r1=13209&r2=13210&view=diff
==============================================================================
--- erp5/trunk/utils/oood/test_server.py (original)
+++ erp5/trunk/utils/oood/test_server.py Sat Mar  3 16:12:31 2007
@@ -29,6 +29,7 @@
 
 import sys, base64, unittest
 from xmlrpclib import *
+sys.path.append('/etc/oood')
 import config
 
 enc = base64.encodestring
@@ -50,7 +51,7 @@
     newmeta={'title':'HELLOOOOOO','reference':'blaaaaaah','MIMEType':mime}
     data=open('doc/test.odt').read()
     res=sp.run_setmetadata('test.odt',base64.encodestring(data),newmeta)
-    open('doc/test_changed.odt','w').write(base64.decodestring(res['data']))
+    open('doc/out/test_changed.odt','w').write(base64.decodestring(res['data']))
     # getting metadata back after the change
     data=open('doc/test_changed.odt').read()
     res=sp.run_getmetadata('test_changed.odt',base64.encodestring(data))
@@ -63,40 +64,40 @@
     data=open('doc/test.doc').read()
     res=sp.run_convert('test.doc',base64.encodestring(data))
     self.assertEqual(res['mime'],'application/vnd.oasis.opendocument.text')
-    open('doc/test.odt','w').write(base64.decodestring(res['data']))
+    open('doc/out/test.odt','w').write(base64.decodestring(res['data']))
 
   def testConvertXls(self):
     data=open('doc/test.xls').read()
     res=sp.run_convert('test.xls',base64.encodestring(data))
     self.assertEqual(res['mime'],'application/vnd.oasis.opendocument.spreadsheet')
-    open('doc/test.ods','w').write(base64.decodestring(res['data']))
+    open('doc/out/test.ods','w').write(base64.decodestring(res['data']))
 
   def testConvertPpt(self):
     data=open('doc/test.ppt').read()
     res=sp.run_convert('test.ppt',base64.encodestring(data))
     self.assertEqual(res['mime'],'application/vnd.oasis.opendocument.presentation')
-    open('doc/test.odp','w').write(base64.decodestring(res['data']))
+    open('doc/out/test.odp','w').write(base64.decodestring(res['data']))
 
   def testPdfTextGeneration(self):
     data=open('doc/test.odt').read()
     res=sp.run_generate('test.odt',enc(data),None,'pdf')
     self.assert_(res)
     self.assertEqual(res['mime'],'application/pdf')
-    open('doc/test.pdf','w').write(base64.decodestring(res['data']))
+    open('doc/out/test.pdf','w').write(base64.decodestring(res['data']))
 
   def testPdfCalcGeneration(self):
     data=open('doc/test.ods').read()
     res=sp.run_generate('test.ods',enc(data),None,'calc.pdf')
     self.assert_(res)
     self.assertEqual(res['mime'],'application/pdf')
-    open('doc/test.calc.pdf','w').write(base64.decodestring(res['data']))
+    open('doc/out/test.calc.pdf','w').write(base64.decodestring(res['data']))
 
   def testPdfImpressGeneration(self):
     data=open('doc/test.odp').read()
     res=sp.run_generate('test.odp',enc(data),None,'impr.pdf')
     self.assert_(res)
     self.assertEqual(res['mime'],'application/pdf')
-    open('doc/test.impr.pdf','w').write(base64.decodestring(res['data']))
+    open('doc/out/test.impr.pdf','w').write(base64.decodestring(res['data']))
 
   def testHtmlWriterGeneration(self):
     self.generateFile('odt','html-writer')
@@ -129,7 +130,7 @@
     data=open('doc/test.%s' % src).read()
     res=sp.run_generate('test.%s' % src,enc(data),None,ext)
     self.assert_(res)
-    open('doc/test.%s' % ext,'w').write(base64.decodestring(res['data']))
+    open('doc/out/test.%s' % ext,'w').write(base64.decodestring(res['data']))
 
 if __name__=='__main__':
   #unittest.main()




More information about the Erp5-report mailing list