[Pymerase-cvs-commit] pymerase/pymweb/cgi pymweb.py,1.3,1.4

[<ki...@us...>]

Update of /cvsroot/pymerase/pymerase/pymweb/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv23291/cgi

Modified Files:
	pymweb.py 
Log Message:
added support for compressing generated files.


Index: pymweb.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymweb/cgi/pymweb.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pymweb.py	4 Apr 2003 23:58:14 -0000	1.3
--- pymweb.py	8 Apr 2003 18:29:04 -0000	1.4
***************
*** 39,48 ****
  import re
  
! def getDriverScript():
!   text = """#!/bin/bash
  export CLASSPATH=/home/king/downloads/novasoft/nsuml-0.4.19.jar:/usr/share/java/xerces.jar
! /home/king/jython-2.1/jython %s/driver.py > /dev/null
!   """ % (DIRPATH)
! 
    return text
  
--- 39,60 ----
  import re
  
! def getDriverScript(dest, compress):
!   if compress == 'Tar&Gzip':
!     text = """#!/bin/bash
  export CLASSPATH=/home/king/downloads/novasoft/nsuml-0.4.19.jar:/usr/share/java/xerces.jar
! cd %s
! /home/king/jython-2.1/jython ./driver.py > /dev/null
! tar cvzf %s.tar.gz %s > /dev/null
! """ % (DIRPATH, dest, dest)
!   elif compress == 'Zip':
!     text = """#!/bin/bash
! export CLASSPATH=/home/king/downloads/novasoft/nsuml-0.4.19.jar:/usr/share/java/xerces.jar
! cd %s
! /home/king/jython-2.1/jython ./driver.py > /dev/null
! zip %s > /dev/null
! """ % (DIRPATH, dest)
!   else:
!     raise ValueError, 'Compression type of %s is invalid.' % (compress)
!     
    return text
  
***************
*** 82,85 ****
--- 94,99 ----
  mydir, myfile = os.path.split(DIRPATH)
  os.mkdir(DIRPATH)
+ os.chmod(DIRPATH, 0775)
+ 
  
  def saveFile(fileName, file):
***************
*** 118,121 ****
--- 132,136 ----
    
    print "<img src=\"/images/pymerase-title.jpg\" alt=\"Pymerase\"><br>"
+   print "Version %s<br><br>" % (pymerase.VERSION)
    form = cgi.FieldStorage()
    
***************
*** 140,143 ****
--- 155,159 ----
      print '<b>Schema:</b> %s<br>' % (fileName)
      print '<b>Destination:</b> %s<br>' % (form['dest'].value)
+     print '<b>Compression:</b> %s<br>' % (form['compression'].value)
      print '<br>'
  
***************
*** 149,153 ****
      driverPath = saveFile('driver.py', driver)
  
!     script = getDriverScript()
      scriptPath = saveFile('driver.sh', script)
  
--- 165,169 ----
      driverPath = saveFile('driver.py', driver)
  
!     script = getDriverScript(form['dest'].value, form['compression'].value)
      scriptPath = saveFile('driver.sh', script)
  
***************
*** 170,174 ****
      else:
        print '<b>Generation Complete</b><br>'
!       print 'Download: <a href="/pymweb/%s/%s">%s</a>' % (myfile,
!                                                form['dest'].value,
!                                                form['dest'].value)
--- 186,198 ----
      else:
        print '<b>Generation Complete</b><br>'
! 
!       if form['compression'].value == 'Tar&Gzip':
!         print 'Download: <a href="/pymweb/%s/%s.tar.gz">%s.tar.gz</a>' % (myfile,
!                                                                    form['dest'].value,
!                                                                    form['dest'].value)
!       elif form['compression'].value == 'Zip':
!         print 'Download: <a href="/pymweb/%s/%s.zip">%s.zip</a>' % (myfile,
!                                                                 form['dest'].value,
!                                                                 form['dest'].value)
!       else:
!         raise ValueError, '%s invalid compression type!' % (form['compression'].value)