Menu
▾
▴
pymerase-cvs-commit — CVS Commits to Pymerase Project
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(151) |
Mar
(131) |
Apr
(171) |
May
(125) |
Jun
(43) |
Jul
(26) |
Aug
(19) |
Sep
(10) |
Oct
|
Nov
(4) |
Dec
(28) |
| 2004 |
Jan
(134) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/pymerase/pymerase/examples/varTypes
In directory sc8-pr-cvs1:/tmp/cvs-serv1423
Modified Files:
createapi.py createpytkdbwidgets.py createpytkwidgets.py
createreport.py createsql.py
Log Message:
Updated for setup.py install script
Index: createapi.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/varTypes/createapi.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createapi.py 20 Dec 2002 02:18:45 -0000 1.1
--- createapi.py 5 Feb 2003 23:08:26 -0000 1.2
***************
*** 8,13 ****
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import input.parseXMI
! import output.CreateDBAPI
if __name__ == "__main__":
--- 8,13 ----
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import pymerase.input.parseXMI
! import pymerase.output.CreateDBAPI
if __name__ == "__main__":
***************
*** 16,20 ****
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateDBAPI)
--- 16,20 ----
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateDBAPI)
Index: createpytkdbwidgets.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/varTypes/createpytkdbwidgets.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createpytkdbwidgets.py 13 Jan 2003 23:55:44 -0000 1.1
--- createpytkdbwidgets.py 5 Feb 2003 23:08:26 -0000 1.2
***************
*** 8,13 ****
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import input.parseXMI
! import output.CreatePyTkDBWidgets
if __name__ == "__main__":
--- 8,13 ----
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import pymerase.input.parseXMI
! import pymerase.output.CreatePyTkDBWidgets
if __name__ == "__main__":
***************
*** 16,20 ****
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, input.parseXMI, outputPath, output.CreatePyTkDBWidgets)
--- 16,20 ----
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreatePyTkDBWidgets)
Index: createpytkwidgets.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/varTypes/createpytkwidgets.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createpytkwidgets.py 20 Dec 2002 02:18:46 -0000 1.1
--- createpytkwidgets.py 5 Feb 2003 23:08:27 -0000 1.2
***************
*** 8,13 ****
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import input.parseXMI
! import output.CreatePyTkWidgets
if __name__ == "__main__":
--- 8,13 ----
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import pymerase.input.parseXMI
! import pymerase.output.CreatePyTkWidgets
if __name__ == "__main__":
***************
*** 16,20 ****
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, input.parseXMI, outputPath, output.CreatePyTkWidgets)
--- 16,20 ----
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreatePyTkWidgets)
Index: createreport.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/varTypes/createreport.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createreport.py 20 Dec 2002 02:18:46 -0000 1.1
--- createreport.py 5 Feb 2003 23:08:27 -0000 1.2
***************
*** 5,10 ****
import pymerase
! import input.parseXMI
! import output.CreateReport
if __name__ == "__main__":
--- 5,10 ----
import pymerase
! import pymerase.input.parseXMI
! import pymerase.output.CreateReport
if __name__ == "__main__":
***************
*** 12,15 ****
outputPath = os.path.abspath("./report.txt")
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateReport)
--- 12,15 ----
outputPath = os.path.abspath("./report.txt")
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateReport)
Index: createsql.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/varTypes/createsql.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** createsql.py 13 Jan 2003 21:54:06 -0000 1.2
--- createsql.py 5 Feb 2003 23:08:27 -0000 1.3
***************
*** 5,10 ****
import pymerase
! import input.parseXMI
! import output.CreateDBAPI
if __name__ == "__main__":
--- 5,10 ----
import pymerase
! import pymerase.input.parseXMI
! import pymerase.output.CreateDBAPI
if __name__ == "__main__":
***************
*** 12,15 ****
outputPath = os.path.abspath("./varTypes.sql")
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateSQL)
--- 12,15 ----
outputPath = os.path.abspath("./varTypes.sql")
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateSQL)
|
Update of /cvsroot/pymerase/pymerase/examples/xmiSchool
In directory sc8-pr-cvs1:/tmp/cvs-serv1231
Modified Files:
TestSchool.py createapi.py creategraphvizuml.py
createpytkwidgets.py createsql.py
Log Message:
Updated for setup.py install script
Index: TestSchool.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/xmiSchool/TestSchool.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestSchool.py 9 Dec 2002 22:14:27 -0000 1.1
--- TestSchool.py 5 Feb 2003 23:07:59 -0000 1.2
***************
*** 15,19 ****
#sys.path.append(os.path.abspath(".."))
import pymerase
! from util import NameMangling
# import code to use api
--- 15,19 ----
#sys.path.append(os.path.abspath(".."))
import pymerase
! from pymerase.util import NameMangling
# import code to use api
Index: createapi.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/xmiSchool/createapi.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** createapi.py 19 Nov 2002 00:55:44 -0000 1.4
--- createapi.py 5 Feb 2003 23:07:59 -0000 1.5
***************
*** 8,13 ****
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import input.parseXMI
! import output.CreateDBAPI
if __name__ == "__main__":
--- 8,13 ----
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import pymerase.input.parseXMI
! import pymerase.output.CreateDBAPI
if __name__ == "__main__":
***************
*** 16,20 ****
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateDBAPI)
--- 16,20 ----
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateDBAPI)
Index: creategraphvizuml.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/xmiSchool/creategraphvizuml.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** creategraphvizuml.py 1 Feb 2003 01:22:57 -0000 1.1
--- creategraphvizuml.py 5 Feb 2003 23:07:59 -0000 1.2
***************
*** 8,13 ****
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import input.parseXMI
! import output.CreateGraphvizUML
if __name__ == "__main__":
--- 8,13 ----
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import pymerase.input.parseXMI
! import pymerase.output.CreateGraphvizUML
if __name__ == "__main__":
***************
*** 16,20 ****
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateGraphvizUML)
--- 16,20 ----
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateGraphvizUML)
Index: createpytkwidgets.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/xmiSchool/createpytkwidgets.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createpytkwidgets.py 12 Dec 2002 21:31:29 -0000 1.1
--- createpytkwidgets.py 5 Feb 2003 23:07:59 -0000 1.2
***************
*** 8,13 ****
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import input.parseXMI
! import output.CreatePyTkWidgets
if __name__ == "__main__":
--- 8,13 ----
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import pymerase.input.parseXMI
! import pymerase.output.CreatePyTkWidgets
if __name__ == "__main__":
***************
*** 16,20 ****
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, input.parseXMI, outputPath, output.CreatePyTkWidgets)
--- 16,20 ----
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreatePyTkWidgets)
Index: createsql.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/xmiSchool/createsql.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** createsql.py 19 Nov 2002 00:55:44 -0000 1.3
--- createsql.py 5 Feb 2003 23:07:59 -0000 1.4
***************
*** 5,10 ****
import pymerase
! import input.parseXMI
! import output.CreateDBAPI
if __name__ == "__main__":
--- 5,10 ----
import pymerase
! import pymerase.input.parseXMI
! import pymerase.output.CreateDBAPI
if __name__ == "__main__":
***************
*** 12,15 ****
outputPath = os.path.abspath("./school.sql")
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateSQL)
--- 12,15 ----
outputPath = os.path.abspath("./school.sql")
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateSQL)
|
|
From: <ki...@us...> - 2003-02-05 23:07:25
|
Update of /cvsroot/pymerase/pymerase/examples/school
In directory sc8-pr-cvs1:/tmp/cvs-serv978
Modified Files:
TestSchool.py createapi.py createsql.py
Log Message:
Updated for setup.py install script
Index: TestSchool.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/school/TestSchool.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestSchool.py 14 Dec 2002 02:16:41 -0000 1.9
--- TestSchool.py 5 Feb 2003 23:07:21 -0000 1.10
***************
*** 15,19 ****
#sys.path.append(os.path.abspath(".."))
import pymerase
! from util import NameMangling
# import code to use api
--- 15,19 ----
#sys.path.append(os.path.abspath(".."))
import pymerase
! from pymerase.util import NameMangling
# import code to use api
Index: createapi.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/school/createapi.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** createapi.py 15 Aug 2002 00:17:50 -0000 1.4
--- createapi.py 5 Feb 2003 23:07:21 -0000 1.5
***************
*** 3,7 ****
import os
import pymerase
! from util import NameMangling
if __name__ == "__main__":
--- 3,7 ----
import os
import pymerase
! from pymerase.util import NameMangling
if __name__ == "__main__":
Index: createsql.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/school/createsql.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** createsql.py 15 Aug 2002 00:17:50 -0000 1.3
--- createsql.py 5 Feb 2003 23:07:21 -0000 1.4
***************
*** 2,6 ****
import pymerase
! from util import NameMangling
--- 2,6 ----
import pymerase
! from pymerase.util import NameMangling
|
Update of /cvsroot/pymerase/pymerase/examples/dvd
In directory sc8-pr-cvs1:/tmp/cvs-serv695
Modified Files:
createapi.py creategraphvizuml.py createhtml.py
createpytkdbwidgets.py createpytkwidgets.py createreport.py
createsql.py
Log Message:
Updated for setup.py install script
Index: createapi.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/dvd/createapi.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createapi.py 11 Dec 2002 17:37:47 -0000 1.1
--- createapi.py 5 Feb 2003 23:06:44 -0000 1.2
***************
*** 8,13 ****
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import input.parseXMI
! import output.CreateDBAPI
if __name__ == "__main__":
--- 8,13 ----
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import pymerase.input.parseXMI
! import pymerase.output.CreateDBAPI
if __name__ == "__main__":
***************
*** 16,20 ****
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateDBAPI)
--- 16,20 ----
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateDBAPI)
Index: creategraphvizuml.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/dvd/creategraphvizuml.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** creategraphvizuml.py 1 Feb 2003 02:11:28 -0000 1.1
--- creategraphvizuml.py 5 Feb 2003 23:06:44 -0000 1.2
***************
*** 5,10 ****
import pymerase
! import input.parseXMI
! import output.CreateGraphvizUML
if __name__ == "__main__":
--- 5,10 ----
import pymerase
! import pymerase.input.parseXMI
! import pymerase.output.CreateGraphvizUML
if __name__ == "__main__":
***************
*** 12,15 ****
outputPath = os.path.abspath("./dvd.dot")
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateGraphvizUML)
--- 12,15 ----
outputPath = os.path.abspath("./dvd.dot")
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateGraphvizUML)
Index: createhtml.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/dvd/createhtml.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createhtml.py 11 Dec 2002 17:39:14 -0000 1.1
--- createhtml.py 5 Feb 2003 23:06:44 -0000 1.2
***************
*** 5,10 ****
import pymerase
! import input.parseXMI
! import output.CreateHtmlForms
if __name__ == "__main__":
--- 5,10 ----
import pymerase
! import pymerase.input.parseXMI
! import pymerase.output.CreateHtmlForms
if __name__ == "__main__":
***************
*** 12,15 ****
outputPath = os.path.abspath("./html")
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateHtmlForms)
--- 12,15 ----
outputPath = os.path.abspath("./html")
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateHtmlForms)
Index: createpytkdbwidgets.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/dvd/createpytkdbwidgets.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createpytkdbwidgets.py 13 Jan 2003 23:57:42 -0000 1.1
--- createpytkdbwidgets.py 5 Feb 2003 23:06:44 -0000 1.2
***************
*** 8,13 ****
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import input.parseXMI
! import output.CreatePyTkDBWidgets
if __name__ == "__main__":
--- 8,13 ----
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import pymerase.input.parseXMI
! import pymerase.output.CreatePyTkDBWidgets
if __name__ == "__main__":
***************
*** 16,20 ****
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, input.parseXMI, outputPath, output.CreatePyTkDBWidgets)
--- 16,20 ----
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreatePyTkDBWidgets)
Index: createpytkwidgets.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/dvd/createpytkwidgets.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createpytkwidgets.py 12 Dec 2002 21:32:03 -0000 1.1
--- createpytkwidgets.py 5 Feb 2003 23:06:44 -0000 1.2
***************
*** 8,13 ****
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import input.parseXMI
! import output.CreatePyTkWidgets
if __name__ == "__main__":
--- 8,13 ----
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
! import pymerase.input.parseXMI
! import pymerase.output.CreatePyTkWidgets
if __name__ == "__main__":
***************
*** 16,20 ****
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, input.parseXMI, outputPath, output.CreatePyTkWidgets)
--- 16,20 ----
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreatePyTkWidgets)
Index: createreport.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/dvd/createreport.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createreport.py 11 Dec 2002 17:38:42 -0000 1.1
--- createreport.py 5 Feb 2003 23:06:44 -0000 1.2
***************
*** 5,10 ****
import pymerase
! import input.parseXMI
! import output.CreateReport
if __name__ == "__main__":
--- 5,10 ----
import pymerase
! import pymerase.input.parseXMI
! import pymerase.output.CreateReport
if __name__ == "__main__":
***************
*** 12,15 ****
outputPath = os.path.abspath("./report.txt")
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateReport)
--- 12,15 ----
outputPath = os.path.abspath("./report.txt")
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateReport)
Index: createsql.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/dvd/createsql.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** createsql.py 11 Dec 2002 17:37:27 -0000 1.1
--- createsql.py 5 Feb 2003 23:06:44 -0000 1.2
***************
*** 5,10 ****
import pymerase
! import input.parseXMI
! import output.CreateDBAPI
if __name__ == "__main__":
--- 5,10 ----
import pymerase
! import pymerase.input.parseXMI
! import pymerase.output.CreateDBAPI
if __name__ == "__main__":
***************
*** 12,15 ****
outputPath = os.path.abspath("./dvd.sql")
! pymerase.run(schema, input.parseXMI, outputPath, output.CreateSQL)
--- 12,15 ----
outputPath = os.path.abspath("./dvd.sql")
! pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateSQL)
|
|
From: <ki...@us...> - 2003-02-05 23:04:21
|
Update of /cvsroot/pymerase/pymerase/input In directory sc8-pr-cvs1:/tmp/cvs-serv32129 Modified Files: parseGenexSchemaXML.py parseXMI.py Log Message: Updated for setup.py install script Index: parseGenexSchemaXML.py =================================================================== RCS file: /cvsroot/pymerase/pymerase/input/parseGenexSchemaXML.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** parseGenexSchemaXML.py 20 Dec 2002 01:53:58 -0000 1.24 --- parseGenexSchemaXML.py 5 Feb 2003 23:04:15 -0000 1.25 *************** *** 9,27 **** import warnings ! from util.Warnings import DebugWarning from warnings import warn import xml.sax import pymerase ! from ClassMembers import ModelElement ! from ClassMembers import ClassAttribute ! from ClassMembers import Association ! from ClassMembers import AssociationEnd ! from ClassMembers import ClassMetaInfo ! from ClassMembers import createAssociation ! from util.bool import parseBoolValue ! from util.PymeraseType import PymeraseType ! from output.dbAPI import fkeyTypes from xml.sax import sax2exts, saxutils, handler, SAXNotSupportedException, SAXNotRecognizedException --- 9,27 ---- import warnings ! from pymerase.util.Warnings import DebugWarning from warnings import warn import xml.sax import pymerase ! from pymerase.ClassMembers import ModelElement ! from pymerase.ClassMembers import ClassAttribute ! from pymerase.ClassMembers import Association ! from pymerase.ClassMembers import AssociationEnd ! from pymerase.ClassMembers import ClassMetaInfo ! from pymerase.ClassMembers import createAssociation ! from pymerase.util.bool import parseBoolValue ! from pymerase.util.PymeraseType import PymeraseType ! from pymerase.output.dbAPI import fkeyTypes from xml.sax import sax2exts, saxutils, handler, SAXNotSupportedException, SAXNotRecognizedException Index: parseXMI.py =================================================================== RCS file: /cvsroot/pymerase/pymerase/input/parseXMI.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** parseXMI.py 14 Dec 2002 02:17:29 -0000 1.12 --- parseXMI.py 5 Feb 2003 23:04:15 -0000 1.13 *************** *** 42,47 **** import warnings from warnings import warn ! from util.Warnings import DebugWarning ! from util.Warnings import InfoWarning import os --- 42,47 ---- import warnings from warnings import warn ! from pymerase.util.Warnings import DebugWarning ! from pymerase.util.Warnings import InfoWarning import os *************** *** 51,63 **** from javax.xml.parsers import SAXParserFactory ! from ClassMembers import ModelElement ! from ClassMembers import ClassAttribute ! from ClassMembers import AssociationEnd ! from ClassMembers import Association ! from ClassMembers import createAssociation ! from ClassMembers import ClassMetaInfo ! from util.bool import parseBoolValue ! from util.PymeraseType import PymeraseType ! from output.dbAPI import fkeyTypes --- 51,63 ---- from javax.xml.parsers import SAXParserFactory ! from pymerase.ClassMembers import ModelElement ! from pymerase.ClassMembers import ClassAttribute ! from pymerase.ClassMembers import AssociationEnd ! from pymerase.ClassMembers import Association ! from pymerase.ClassMembers import createAssociation ! from pymerase.ClassMembers import ClassMetaInfo ! from pymerase.util.bool import parseBoolValue ! from pymerase.util.PymeraseType import PymeraseType ! from pymerase.output.dbAPI import fkeyTypes |
|
From: <ki...@us...> - 2003-02-05 23:02:30
|
Update of /cvsroot/pymerase/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv31516
Modified Files:
pymerase.py
Log Message:
Updated for setup.py install script
Index: pymerase.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** pymerase.py 20 Dec 2002 02:48:08 -0000 1.27
--- pymerase.py 5 Feb 2003 23:02:27 -0000 1.28
***************
*** 44,57 ****
# import pymerpase packages
! import output
! import input
! from util.bool import parseBoolValue
# import warning support
! # note: util.Warning adds to builtins
! #import util.Warnings
! from util.Warnings import DebugWarning
! from util.Warnings import InfoWarning
! import util.NameMangling
! from util.SortMetaInfo import computeDependencyGraph
import warnings
from warnings import warn
--- 44,57 ----
# import pymerpase packages
! from pymerase import output
! from pymerase import input
! from pymerase.util.bool import parseBoolValue
# import warning support
! # note: pymerase.util.Warning adds to builtins
! #import pymerase.util.Warnings
! from pymerase.util.Warnings import DebugWarning
! from pymerase.util.Warnings import InfoWarning
! import pymerase.util.NameMangling
! from pymerase.util.SortMetaInfo import computeDependencyGraph
import warnings
from warnings import warn
***************
*** 78,85 ****
def __init__(self, defaultPackage=None):
self.pymeraseConfigVersion=0
! self.nameManglers = {None: util.NameMangling.CapWord(),
! 'CreateHTMLForm': util.NameMangling.EnglishWord(),
! 'CreatePyTkWidgets': util.NameMangling.EnglishWord(),
! 'CreateSQL': util.NameMangling.underscore_word()}
self.defaultPackage = defaultPackage
--- 78,85 ----
def __init__(self, defaultPackage=None):
self.pymeraseConfigVersion=0
! self.nameManglers = {None: pymerase.util.NameMangling.CapWord(),
! 'CreateHTMLForm': pymerase.util.NameMangling.EnglishWord(),
! 'CreatePyTkWidgets': pymerase.util.NameMangling.EnglishWord(),
! 'CreateSQL': pymerase.util.NameMangling.underscore_word()}
self.defaultPackage = defaultPackage
***************
*** 116,122 ****
for the SQL module.)
"""
! if not isinstance(nameMangler, util.NameMangling.NameMangler):
raise ValueError(
! "NameMangler must be a subclass of util.NameMangling.NameMangler"
)
--- 116,122 ----
for the SQL module.)
"""
! if not isinstance(nameMangler, pymerase.util.NameMangling.NameMangler):
raise ValueError(
! "NameMangler must be a subclass of pymerase.util.NameMangling.NameMangler"
)
|
|
From: <ki...@us...> - 2003-02-05 23:01:45
|
Update of /cvsroot/pymerase/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv31186
Modified Files:
ClassMembers.py
Log Message:
Updated for setup.py install script
Index: ClassMembers.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/ClassMembers.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ClassMembers.py 27 Jan 2003 22:59:56 -0000 1.17
--- ClassMembers.py 5 Feb 2003 23:01:40 -0000 1.18
***************
*** 8,25 ****
import types
! from util.bool import parseBoolValue
# import warning support
! from util.Warnings import DebugWarning
! from util.Warnings import InfoWarning
! import util.NameMangling
! from util.PymeraseType import PymeraseType
import warnings
from warnings import warn
! from output.dbAPI import fkeyTypes
###################
# UTILITY FUNCTIONS
! from util.iPymeraseUtil import getClassByName
def getBasePrimaryKeyName(tables, tbl, TRANSLATOR_NAME):
--- 8,25 ----
import types
! from pymerase.util.bool import parseBoolValue
# import warning support
! from pymerase.util.Warnings import DebugWarning
! from pymerase.util.Warnings import InfoWarning
! import pymerase.util.NameMangling
! from pymerase.util.PymeraseType import PymeraseType
import warnings
from warnings import warn
! from pymerase.output.dbAPI import fkeyTypes
###################
# UTILITY FUNCTIONS
! from pymerase.util.iPymeraseUtil import getClassByName
def getBasePrimaryKeyName(tables, tbl, TRANSLATOR_NAME):
***************
*** 725,729 ****
else:
primaryKeyName = self.getPrimaryKeyName(translatorName)
! self.foreignKeyName = util.NameMangling.RelationalKey().getForeignKey(primaryKeyName)
warn("No foreign key name set for %s, making one up %s" % (self.name,
self.foreignKeyName),
--- 725,729 ----
else:
primaryKeyName = self.getPrimaryKeyName(translatorName)
! self.foreignKeyName = pymerase.util.NameMangling.RelationalKey().getForeignKey(primaryKeyName)
warn("No foreign key name set for %s, making one up %s" % (self.name,
self.foreignKeyName),
|
|
From: <ki...@us...> - 2003-02-05 23:01:12
|
Update of /cvsroot/pymerase/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv30947
Modified Files:
setup.py
Log Message:
1st working install script for pymerase
Index: setup.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/setup.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup.py 30 Oct 2002 00:27:59 -0000 1.1
--- setup.py 5 Feb 2003 23:01:08 -0000 1.2
***************
*** 3,7 ****
# #
# C O P Y R I G H T N O T I C E #
! # Copyright (c) 2001 by: #
# * California Institute of Technology #
# #
--- 3,7 ----
# #
# C O P Y R I G H T N O T I C E #
! # Copyright (c) 2002 by: #
# * California Institute of Technology #
# #
***************
*** 36,67 ****
from distutils.core import Extension
import glob
setup(name="Pymerase",
! version="0.2",
! description="Pymerase is a tool intended to generate a python object model, relational database, and an object-relational model connecting the two.",
author="Diane Trout",
author_email="di...@ca...",
url="http://pymerase.sf.net/",
! packages=["pymerase",
! "pymerase.input",
! "pymerase.util",
! "pymerase.output",
! "pymerase.output.dbAPI",
! "pymerase.output.webUtil",
! "pymerase.output.webUtil.templates"],
! data_files=[('pymerase/bin', ['pymerase/bin/pymerase', 'pymerase/bin/pymerasegui.py']),
! ('pymerase', ['pymerase/README']),
! ('pymerase/examples', ['pymerase/examples/README.examples']),
! ('pymerase/examples/school', ['pymerase/examples/school/createapi.py',
! 'pymerase/examples/school/createsql.py',
! 'pymerase/examples/school/TestSchool.py',
! 'pymerase/examples/school/data.sql',
! 'pymerase/examples/school/dataCapWord.sql']),
! ('pymerase/templates/webUtil', glob.glob("pymerase/output/webUtil/templates/*.html")),
! ('pymerase/examples/school/schema', ['pymerase/examples/school/schema/table.dtd']),
! ('pymerase/examples/school/schema', glob.glob('pymerase/examples/school/schema/*.xml')),
! ('pymerase/examples/xmiSchool', ['pymerase/examples/xmiSchool/createapi.py',
! 'pymerase/examples/xmiSchool/createint.py',
! 'pymerase/examples/xmiSchool/createsql.py',
! 'pymerase/examples/xmiSchool/Makefile',
! 'pymerase/examples/xmiSchool/school.zargo'])])
--- 36,160 ----
from distutils.core import Extension
import glob
+ import shutil
+ import os
+ import sys
+
+ ########################################
+ # Copy lib files to prep for install
+ cwd = os.getcwd()
+ tempDir = os.path.join(cwd, "pymerase")
+ if os.path.exists(tempDir):
+ print tempDir, " already exists, please remove it and run setup.py again."
+ sys.exit(0)
+ else:
+ os.mkdir(tempDir)
+ shutil.copytree(os.path.join(cwd,"input"), os.path.join(tempDir, "input"))
+ shutil.copytree(os.path.join(cwd,"output"), os.path.join(tempDir, "output"))
+ shutil.copytree(os.path.join(cwd,"util"), os.path.join(tempDir, "util"))
+ shutil.copy(os.path.join(cwd, "ClassMembers.py"), tempDir)
+ shutil.copy(os.path.join(cwd, "pymerase.py"), os.path.join(tempDir, "__init__.py"))
+
+
+ ########################################
+ # Setup Configuration
+ PACKAGES=["pymerase",
+ "pymerase.input",
+ "pymerase.util",
+ "pymerase.output",
+ "pymerase.output.dbAPI",
+ "pymerase.output.webUtil",
+ "pymerase.output.webUtil.templates",
+ "pymerase.output.PyTkWidgets",
+ "pymerase.output.PyTkWidgets.lib",
+ "pymerase.output.PythonAPI"]
+
+ if sys.platform == 'linux2':
+ dataFilesPath = '/usr/local/pymerase'
+ else:
+ dataFilesPath = 'pymerase'
+
+ BIN_TUPLE=(os.path.join(dataFilesPath, 'bin'),
+ ['bin/pymerase', 'bin/pymerasegui.py'])
+
+ README_TUPLE=(dataFilesPath,
+ ['README', 'INSTALL'])
+
+ EXAMPLES_TUPLE=(os.path.join(dataFilesPath, 'examples'),
+ ['examples/README.examples'])
+
+ EXAMPLES_SCHOOL_TUPLE=(os.path.join(dataFilesPath, 'examples/school'),
+ ['examples/school/createapi.py',
+ 'examples/school/createsql.py',
+ 'examples/school/TestSchool.py',
+ 'examples/school/data.sql',
+ 'examples/school/dataCapWord.sql'])
+
+ EXAMPLES_SCHOOL_SCHEMA_TUPLE=(os.path.join(dataFilesPath,
+ 'examples/school/schema'),
+ glob.glob('examples/school/schema/*.xml'))
+
+ EXAMPLES_SCHOOL_SCHEMA_DTD_TUPLE=(os.path.join(dataFilesPath,
+ 'examples/school/schema'),
+ ['examples/school/schema/table.dtd'])
+
+ EXAMPLES_XMISCHOOL_TUPLE=(os.path.join(dataFilesPath, 'examples/xmiSchool'),
+ ['examples/xmiSchool/createapi.py',
+ 'examples/xmiSchool/createint.py',
+ 'examples/xmiSchool/createsql.py',
+ 'examples/xmiSchool/Makefile',
+ 'examples/xmiSchool/school.zargo'])
+
+ EXAMPLES_DVD_TUPLE=(os.path.join(dataFilesPath, 'examples/dvd'),
+ ['examples/dvd/createapi.py',
+ 'examples/dvd/creategraphvizuml.py',
+ 'examples/dvd/createsql.py',
+ 'examples/dvd/createpytkwidgets.py',
+ 'examples/dvd/createpytkdbwidgets.py',
+ 'examples/dvd/createreport.py',
+ 'examples/dvd/dvd.zargo',
+ 'examples/dvd/dvd_.xmi'])
+
+ EXAMPLES_DVD_SCHEMA_TUPLE=(os.path.join(dataFilesPath, 'examples/dvd/schema/'),
+ glob.glob('examples/dvd/schema/*.xml'))
+
+ EXAMPLES_DVD_SCHEMA_DTD_TUPLE=(os.path.join(dataFilesPath,
+ 'examples/dvd/schema'),
+ ['examples/dvd/schema/table.dtd'])
+
+
+ EXAMPLES_VARTYPES_TUPLE=(os.path.join(dataFilesPath, 'examples/varTypes'),
+ ['examples/varTypes/createpytkwidgets.py',
+ 'examples/varTypes/createpytkdbwidgets.py',
+ 'examples/varTypes/createreport.py',
+ 'examples/varTypes/createapi.py',
+ 'examples/varTypes/createsql.py',
+ 'examples/varTypes/varTypes.zargo',
+ 'examples/varTypes/varTypes_.xmi'])
+
+ WEBUTIL_TEMPLATES_TUPLE=(os.path.join(dataFilesPath, 'templates/webUtil'),
+ glob.glob("pymerase/output/webUtil/templates/*.html"))
+
+
+ DATA_FILES=[BIN_TUPLE,
+ README_TUPLE,
+ EXAMPLES_TUPLE,
+ EXAMPLES_SCHOOL_TUPLE,
+ EXAMPLES_SCHOOL_SCHEMA_TUPLE,
+ EXAMPLES_SCHOOL_SCHEMA_DTD_TUPLE,
+ EXAMPLES_XMISCHOOL_TUPLE,
+ EXAMPLES_DVD_TUPLE,
+ EXAMPLES_DVD_SCHEMA_TUPLE,
+ EXAMPLES_DVD_SCHEMA_DTD_TUPLE,
+ EXAMPLES_VARTYPES_TUPLE,
+ WEBUTIL_TEMPLATES_TUPLE]
setup(name="Pymerase",
! version="0.1",
! description="Pymerase is a tool intended to generate a python " \
! "object model, relational database, and an object-relational " \
! "model connecting the two.",
author="Diane Trout",
author_email="di...@ca...",
url="http://pymerase.sf.net/",
! packages=PACKAGES,
! data_files=DATA_FILES)
|
Update of /cvsroot/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv29696
Modified Files:
CreatePyTkWidgets.py CreateHtmlForms.py CreateDBEditor.py
CreateReport.py CreateDBAPI.py CreateSQL.py iPymerase.py
CreatePythonAPI.py
Log Message:
Updated for setup.py install script
Index: CreatePyTkWidgets.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreatePyTkWidgets.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CreatePyTkWidgets.py 31 Jan 2003 19:32:34 -0000 1.10
--- CreatePyTkWidgets.py 5 Feb 2003 22:58:33 -0000 1.11
***************
*** 40,48 ****
import shutil
! from output.PyTkWidgets import HelperUtil
! from output.PyTkWidgets.Templates import Templates
! from util import PymeraseType
! from ClassMembers import getAllAttributes
! from ClassMembers import getAllAssociations
############################
--- 40,48 ----
import shutil
! from pymerase.output.PyTkWidgets import HelperUtil
! from pymerase.output.PyTkWidgets.Templates import Templates
! from pymerase.util import PymeraseType
! from pymerase.ClassMembers import getAllAttributes
! from pymerase.ClassMembers import getAllAssociations
############################
Index: CreateHtmlForms.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateHtmlForms.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CreateHtmlForms.py 11 Dec 2002 20:26:31 -0000 1.17
--- CreateHtmlForms.py 5 Feb 2003 22:58:33 -0000 1.18
***************
*** 41,48 ****
sys.path.append("../pymerase")
! from output.webUtil import HTMLUtil
! from util import PymeraseType
! from ClassMembers import getAllAttributes
! from ClassMembers import getAllAssociations
############################
--- 41,48 ----
sys.path.append("../pymerase")
! from pymerase.output.webUtil import HTMLUtil
! from pymerase.util import PymeraseType
! from pymerase.ClassMembers import getAllAttributes
! from pymerase.ClassMembers import getAllAssociations
############################
Index: CreateDBEditor.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateDBEditor.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CreateDBEditor.py 11 Dec 2002 22:34:51 -0000 1.13
--- CreateDBEditor.py 5 Feb 2003 22:58:33 -0000 1.14
***************
*** 38,47 ****
#from mx import DateTime
! from output.webUtil import makePackage
! from output.webUtil import CodeUtil
! from output.webUtil import HTMLUtil
! from util.fk_util import fk_util
! from ClassMembers import getAllAttributes
! from ClassMembers import getAllAssociations
codeUtil = CodeUtil.CodeUtil()
--- 38,47 ----
#from mx import DateTime
! from pymerase.output.webUtil import makePackage
! from pymerase.output.webUtil import CodeUtil
! from pymerase.output.webUtil import HTMLUtil
! from pymerase.util.fk_util import fk_util
! from pymerase.ClassMembers import getAllAttributes
! from pymerase.ClassMembers import getAllAssociations
codeUtil = CodeUtil.CodeUtil()
Index: CreateReport.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateReport.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CreateReport.py 31 Jan 2003 18:04:30 -0000 1.2
--- CreateReport.py 5 Feb 2003 22:58:33 -0000 1.3
***************
*** 39,44 ****
import string
! from ClassMembers import getAllAttributes
! from ClassMembers import getAllAssociations
############################
--- 39,44 ----
import string
! from pymerase.ClassMembers import getAllAttributes
! from pymerase.ClassMembers import getAllAssociations
############################
Index: CreateDBAPI.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateDBAPI.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CreateDBAPI.py 18 Jan 2003 01:35:32 -0000 1.25
--- CreateDBAPI.py 5 Feb 2003 22:58:33 -0000 1.26
***************
*** 44,53 ****
import types
import shutil
! from util.output import *
! from util.SortMetaInfo import forwardDeclarationSort
! from output.dbAPI import fkeyTypes
import warnings
! from util.Warnings import DebugWarning
from warnings import warn
--- 44,53 ----
import types
import shutil
! from pymerase.util.output import *
! from pymerase.util.SortMetaInfo import forwardDeclarationSort
! from pymerase.output.dbAPI import fkeyTypes
import warnings
! from pymerase.util.Warnings import DebugWarning
from warnings import warn
***************
*** 422,427 ****
# write the package definition
if 1:
! import output.dbAPI
! module_pathname = output.dbAPI.__path__[0]
module_path = module_pathname
else:
--- 422,427 ----
# write the package definition
if 1:
! import pymerase.output.dbAPI
! module_pathname = pymerase.output.dbAPI.__path__[0]
module_path = module_pathname
else:
Index: CreateSQL.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateSQL.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CreateSQL.py 19 Nov 2002 00:47:51 -0000 1.13
--- CreateSQL.py 5 Feb 2003 22:58:33 -0000 1.14
***************
*** 39,47 ****
import string
import types
! from util.output import *
! from util.SortMetaInfo import forwardDeclarationSort
import warnings
! from util.Warnings import DebugWarning
from warnings import warn
--- 39,47 ----
import string
import types
! from pymerase.util.output import *
! from pymerase.util.SortMetaInfo import forwardDeclarationSort
import warnings
! from pymerase.util.Warnings import DebugWarning
from warnings import warn
Index: iPymerase.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/iPymerase.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** iPymerase.py 30 Oct 2002 23:05:15 -0000 1.5
--- iPymerase.py 5 Feb 2003 22:58:33 -0000 1.6
***************
*** 42,46 ****
from IPython.Shell import IPythonShellEmbed
#import convienance functions
! from util.iPymeraseUtil import *
msg = []
--- 42,46 ----
from IPython.Shell import IPythonShellEmbed
#import convienance functions
! from pymerase.util.iPymeraseUtil import *
msg = []
Index: CreatePythonAPI.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreatePythonAPI.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CreatePythonAPI.py 15 Aug 2002 00:49:19 -0000 1.1
--- CreatePythonAPI.py 5 Feb 2003 22:58:33 -0000 1.2
***************
*** 45,54 ****
import shutil
import inspect
! from util.output import *
! from util.SortMetaInfo import forwardDeclarationSort
! from output.PythonAPI import fkeyTypes
import warnings
! from util.Warnings import DebugWarning
from warnings import warn
--- 45,54 ----
import shutil
import inspect
! from pymerase.util.output import *
! from pymerase.util.SortMetaInfo import forwardDeclarationSort
! from pymerase.output.PythonAPI import fkeyTypes
import warnings
! from pymerase.util.Warnings import DebugWarning
from warnings import warn
|
|
From: <ki...@us...> - 2003-02-05 22:54:32
|
Update of /cvsroot/pymerase/pymerase/output/PyTkWidgets In directory sc8-pr-cvs1:/tmp/cvs-serv27835/PyTkWidgets Modified Files: HelperUtil.py Log Message: Updated for setup.py install script Index: HelperUtil.py =================================================================== RCS file: /cvsroot/pymerase/pymerase/output/PyTkWidgets/HelperUtil.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** HelperUtil.py 31 Jan 2003 19:34:55 -0000 1.10 --- HelperUtil.py 5 Feb 2003 22:54:27 -0000 1.11 *************** *** 33,37 **** import string import re ! #from output.PyTkWidgets import ValidatingEntry class HelperUtil: --- 33,37 ---- import string import re ! #from pymerase.output.PyTkWidgets import ValidatingEntry class HelperUtil: |
|
From: <ki...@us...> - 2003-02-05 22:53:22
|
Update of /cvsroot/pymerase/pymerase/output/webUtil In directory sc8-pr-cvs1:/tmp/cvs-serv27247 Modified Files: CodeUtil.py makePackage.py Log Message: Updated for setup.py install script Index: CodeUtil.py =================================================================== RCS file: /cvsroot/pymerase/pymerase/output/webUtil/CodeUtil.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** CodeUtil.py 15 Aug 2002 00:09:21 -0000 1.16 --- CodeUtil.py 5 Feb 2003 22:53:18 -0000 1.17 *************** *** 38,46 **** import re ! from util.fk_util import fk_util ! from util import PymeraseType ! from ClassMembers import getAllAttributes ! from ClassMembers import getAllAssociations ! from ClassMembers import getBasePrimaryKeyName class CodeUtil: --- 38,46 ---- import re ! from pymerase.util.fk_util import fk_util ! from pymerase.util import PymeraseType ! from pymerase.ClassMembers import getAllAttributes ! from pymerase.ClassMembers import getAllAssociations ! from pymerase.ClassMembers import getBasePrimaryKeyName class CodeUtil: Index: makePackage.py =================================================================== RCS file: /cvsroot/pymerase/pymerase/output/webUtil/makePackage.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makePackage.py 16 Aug 2002 18:53:29 -0000 1.7 --- makePackage.py 5 Feb 2003 22:53:18 -0000 1.8 *************** *** 37,41 **** import sys import re ! from util import xor_string def makePackage(destination, webUtilPath): --- 37,41 ---- import sys import re ! from pymerase.util import xor_string def makePackage(destination, webUtilPath): |
|
From: <ki...@us...> - 2003-02-05 22:50:08
|
Update of /cvsroot/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv25986
Modified Files:
CreateGraphvizUML.py
Log Message:
Added support for inheritance
Index: CreateGraphvizUML.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateGraphvizUML.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CreateGraphvizUML.py 1 Feb 2003 02:09:05 -0000 1.3
--- CreateGraphvizUML.py 5 Feb 2003 22:50:04 -0000 1.4
***************
*** 38,43 ****
import re
! from ClassMembers import getAllAttributes
! from ClassMembers import getAllAssociations
############################
--- 38,43 ----
import re
! from pymerase.ClassMembers import getAllAttributes
! from pymerase.ClassMembers import getAllAssociations
############################
***************
*** 105,112 ****
#reset counter
counter = 0
#Iterate through the tables/classes and process the data
for tbl in tables:
!
label = indent + "c%s [label=\"{<CLASS_NAME>\\n|<ATTRIB_NAME>| }\"]" % (counter)
--- 105,114 ----
#reset counter
counter = 0
+
#Iterate through the tables/classes and process the data
for tbl in tables:
! print "Class(%s)-->Base(%s)" % (tbl.getName(TRANSLATOR_NAME),
! tbl.getBaseClassNames(TRANSLATOR_NAME))
label = indent + "c%s [label=\"{<CLASS_NAME>\\n|<ATTRIB_NAME>| }\"]" % (counter)
***************
*** 127,130 ****
--- 129,140 ----
if linkage is not None:
text.append(linkage)
+
+ for tbl in tables:
+ baseTable = tbl.getBaseClassNames(TRANSLATOR_NAME)
+ if len(baseTable) >= 1:
+ for xTbl in baseTable:
+ text.append(indent + "c%s -> c%s [dir=back,arrowtail=empty, style=dashed];" % \
+ (class2num[baseTable[0]],
+ class2num[tbl.getName(TRANSLATOR_NAME)]))
text.append("}")
|
|
From: <ki...@us...> - 2003-02-01 02:11:30
|
Update of /cvsroot/pymerase/pymerase/examples/dvd
In directory sc8-pr-cvs1:/tmp/cvs-serv13173
Added Files:
creategraphvizuml.py
Log Message:
graphviz!
--- NEW FILE: creategraphvizuml.py ---
#!/usr/bin/env python
import sys
import os
import pymerase
import input.parseXMI
import output.CreateGraphvizUML
if __name__ == "__main__":
schema = os.path.abspath("./dvd_.xmi")
outputPath = os.path.abspath("./dvd.dot")
pymerase.run(schema, input.parseXMI, outputPath, output.CreateGraphvizUML)
|
|
From: <ki...@us...> - 2003-02-01 02:09:08
|
Update of /cvsroot/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv12532
Modified Files:
CreateGraphvizUML.py
Log Message:
Generates links but not inheritance
Index: CreateGraphvizUML.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateGraphvizUML.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CreateGraphvizUML.py 1 Feb 2003 01:15:06 -0000 1.2
--- CreateGraphvizUML.py 1 Feb 2003 02:09:05 -0000 1.3
***************
*** 45,48 ****
--- 45,49 ----
TRANSLATOR_NAME='CreateGraphvizUML'
+ classLinks = {}
def getAttributeString(attrib):
***************
*** 51,54 ****
--- 52,76 ----
return text
+ def getAssocString(assoc, class2num):
+ thisClassName = assoc.getClassName(TRANSLATOR_NAME)
+ oppositeClassName = assoc.getOppositeEnd().getClassName(TRANSLATOR_NAME)
+
+ if thisClassName not in classLinks[oppositeClassName]:
+ text = "c%s -> c%s [taillabel=\"<TAIL_LABEL>\", label=\"\", " \
+ "headlabel=\"<HEAD_LABEL>\", arrowhead=<ARROW_HEAD>, " \
+ "arrowtail=<ARROW_TAIL>]" % (class2num[thisClassName],
+ class2num[oppositeClassName])
+
+ text = re.sub("<TAIL_LABEL>", assoc.getOppositeEnd().getName(TRANSLATOR_NAME), text)
+ text = re.sub("<HEAD_LABEL>", assoc.getName(TRANSLATOR_NAME), text)
+ text = re.sub("<ARROW_TAIL>", "none", text)
+ text = re.sub("<ARROW_HEAD>", "none", text)
+ classLinks[thisClassName].append(oppositeClassName)
+ classLinks[oppositeClassName].append(thisClassName)
+ return text
+ else:
+ return None
+
+
############################
# Writer components
***************
*** 58,61 ****
--- 80,84 ----
Create graphviz output in destination dirctory.
"""
+ class2num = {}
indent = " " * 8
***************
*** 71,75 ****
--- 94,109 ----
text.append(indent + "node [fontname=\"Helvetica\",fontsize=10,shape=record];")
+ #Create class2num dictionary
counter = 0
+ for tbl in tables:
+ class2num[tbl.getName(TRANSLATOR_NAME)] = counter
+ counter += 1
+
+ #dict for keeping track of linking
+ classLinks[tbl.getName(TRANSLATOR_NAME)] = []
+
+ #reset counter
+ counter = 0
+
#Iterate through the tables/classes and process the data
for tbl in tables:
***************
*** 88,91 ****
--- 122,130 ----
text.append(label)
counter += 1
+
+ for assocEnd in tbl.getAssociationEnds().values():
+ linkage = getAssocString(assocEnd, class2num)
+ if linkage is not None:
+ text.append(linkage)
text.append("}")
|
|
From: <ki...@us...> - 2003-02-01 01:23:00
|
Update of /cvsroot/pymerase/pymerase/examples/xmiSchool
In directory sc8-pr-cvs1:/tmp/cvs-serv27389
Added Files:
creategraphvizuml.py
Log Message:
graphviz!
--- NEW FILE: creategraphvizuml.py ---
#!/usr/bin/env python
import sys
import os
import pymerase
# NOTE: Jython can't use the python way to load modules based on their name
# NOTE: so we have to manually import the modules we're using
# NOTE: and pass them to pymerase.run
import input.parseXMI
import output.CreateGraphvizUML
if __name__ == "__main__":
schema = os.path.abspath("./school.xmi")
outputPath = os.path.abspath("./school.dot")
#pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
pymerase.run(schema, input.parseXMI, outputPath, output.CreateGraphvizUML)
|
|
From: <ki...@us...> - 2003-02-01 01:15:10
|
Update of /cvsroot/pymerase/pymerase/output In directory sc8-pr-cvs1:/tmp/cvs-serv23236 Modified Files: CreateGraphvizUML.py Log Message: forgot to import some functions. =) Index: CreateGraphvizUML.py =================================================================== RCS file: /cvsroot/pymerase/pymerase/output/CreateGraphvizUML.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CreateGraphvizUML.py 1 Feb 2003 01:12:00 -0000 1.1 --- CreateGraphvizUML.py 1 Feb 2003 01:15:06 -0000 1.2 *************** *** 38,41 **** --- 38,44 ---- import re + from ClassMembers import getAllAttributes + from ClassMembers import getAllAssociations + ############################ # Globals |
|
From: <ki...@us...> - 2003-02-01 01:12:08
|
Update of /cvsroot/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv21512
Added Files:
CreateGraphvizUML.py
Log Message:
First attempt at creating graphviz UML diagrams
-Currently creates classes and attributes
--- NEW FILE: CreateGraphvizUML.py ---
###########################################################################
# #
# C O P Y R I G H T N O T I C E #
# Copyright (c) 2002 by: #
# * California Institute of Technology #
# #
# All Rights Reserved. #
# #
# Permission is hereby granted, free of charge, to any person #
# obtaining a copy of this software and associated documentation files #
# (the "Software"), to deal in the Software without restriction, #
# including without limitation the rights to use, copy, modify, merge, #
# publish, distribute, sublicense, and/or sell copies of the Software, #
# and to permit persons to whom the Software is furnished to do so, #
# subject to the following conditions: #
# #
# The above copyright notice and this permission notice shall be #
# included in all copies or substantial portions of the Software. #
# #
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, #
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF #
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND #
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS #
# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN #
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN #
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #
# SOFTWARE. #
###########################################################################
#
# Authors: Brandon King
# Last Modified: $Date: 2003/02/01 01:12:00 $
#
"""Creates a Graphviz UML diagram of each Class/Table"""
import os
import string
import re
############################
# Globals
TRANSLATOR_NAME='CreateGraphvizUML'
def getAttributeString(attrib):
text = "+%s: %s\l<ATTRIB_NAME>" % (attrib.getName(TRANSLATOR_NAME),
attrib.getType().getSQLType())
return text
############################
# Writer components
def write(destination, tables):
"""
Create graphviz output in destination dirctory.
"""
indent = " " * 8
text = []
text.append("#!/usr/bin/dot")
text.append("#Generated by Pymerase (Output Module: CreateGraphvizUML)")
text.append("#http://pymerase.sourceforge.net/")
text.append("")
text.append("digraph G {")
text.append(indent + "edge [fontname=\"Helvetica\",fontsize=10," \
"labelfontname=\"Helvetica\",labelfontsize=10];")
text.append(indent + "node [fontname=\"Helvetica\",fontsize=10,shape=record];")
counter = 0
#Iterate through the tables/classes and process the data
for tbl in tables:
label = indent + "c%s [label=\"{<CLASS_NAME>\\n|<ATTRIB_NAME>| }\"]" % (counter)
label = re.sub("<CLASS_NAME>", tbl.getName(TRANSLATOR_NAME), label)
#Process each attribute in a given table (class)
for attribute in getAllAttributes(tables, tbl, TRANSLATOR_NAME):
#Insert Each Attribute
label = re.sub("<ATTRIB_NAME>", getAttributeString(attribute), label)
#REMOVE <ATTRIB_NAME> from label
label = re.sub("<ATTRIB_NAME>", "", label)
text.append(label)
counter += 1
text.append("}")
text = string.join(text, '\n')
f = open(destination, 'w')
f.write(text)
f.close()
print os.linesep \
+ "Graphviz UML Generation Complete... Good Bye." \
+ os.linesep
|
|
From: <ki...@us...> - 2003-01-31 19:38:09
|
Update of /cvsroot/pymerase/pymerase/output/PyTkWidgets
In directory sc8-pr-cvs1:/tmp/cvs-serv32217
Modified Files:
Templates.py
Log Message:
added support for different modes
Index: Templates.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/PyTkWidgets/Templates.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Templates.py 14 Jan 2003 22:41:28 -0000 1.4
--- Templates.py 31 Jan 2003 19:38:06 -0000 1.5
***************
*** 74,83 ****
import Tkinter
import ValidatingEntry
class %CLASSNAME%Widget(Tkinter.Frame):
! def __init__(self, master=None, **kw):
Tkinter.Frame.__init__(self, master, kw)
self.parent = master
%VAR_ELEMENT%
--- 74,87 ----
import Tkinter
import ValidatingEntry
+ import modes
+
+ from ExtendedOptionMenu import ExtendedOptionMenu
class %CLASSNAME%Widget(Tkinter.Frame):
! def __init__(self, master=None, mode=modes.DEFAULT, **kw):
Tkinter.Frame.__init__(self, master, kw)
self.parent = master
+ self.mode = mode
%VAR_ELEMENT%
***************
*** 106,110 ****
root = Tkinter.Tk()
root.title(\"%CLASSNAME%\")
! %CLASSNAME%gui = %CLASSNAME%Widget(root)
root.mainloop()
"""
--- 110,114 ----
root = Tkinter.Tk()
root.title(\"%CLASSNAME%\")
! %CLASSNAME%gui = %CLASSNAME%Widget(root, modes.DEFAULT)
root.mainloop()
"""
***************
*** 154,160 ****
from dbSession import sessionObj
class %CLASSNAME%DbWidget(%CLASSNAME%Widget):
! def __init__(self, master, session=None):
self.master = master
--- 158,166 ----
from dbSession import sessionObj
+ import modes
+
class %CLASSNAME%DbWidget(%CLASSNAME%Widget):
! def __init__(self, master, mode=modes.DEFAULT, session=None):
self.master = master
***************
*** 164,168 ****
self.footerFrame.grid(row=1)
! %CLASSNAME%Widget.__init__(self, self.bodyFrame)
if session is None:
--- 170,174 ----
self.footerFrame.grid(row=1)
! %CLASSNAME%Widget.__init__(self, self.bodyFrame, mode)
if session is None:
***************
*** 173,176 ****
--- 179,184 ----
self.curDBObj = None
+
+ #%OPTION_MENU_DICT%
self.navBar = NavBar(self.footerFrame, self, self.dbs.%CLASSNAME%, self.session)
***************
*** 179,183 ****
--- 187,193 ----
self.SaveWidget = SaveWidget(self.footerFrame, self)
self.SaveWidget.pack()
+
+ #%UPDATE_FUNCTIONS%
def setCurrentDBObj(self, obj):
|
|
From: <ki...@us...> - 2003-01-31 19:35:03
|
Update of /cvsroot/pymerase/pymerase/output/PyTkWidgets
In directory sc8-pr-cvs1:/tmp/cvs-serv29850
Modified Files:
HelperUtil.py
Log Message:
Added support for modes.OPTION_MENU
Index: HelperUtil.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/PyTkWidgets/HelperUtil.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HelperUtil.py 14 Jan 2003 22:40:24 -0000 1.9
--- HelperUtil.py 31 Jan 2003 19:34:55 -0000 1.10
***************
*** 32,35 ****
--- 32,36 ----
#
import string
+ import re
#from output.PyTkWidgets import ValidatingEntry
***************
*** 367,368 ****
--- 368,509 ----
return string.join(code, '\n')
+
+
+ def processFkVarElement(self, attrib, assoc, TRANSLATOR, code):
+
+ attribName = attrib.getName(TRANSLATOR)
+
+ counter = self.getRowCounter()
+
+ newCode = []
+ #Create Label Code
+ newCode.append(" #%s Label" % (attribName))
+ newCode.append(" self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
+ (attribName, assoc.getName(TRANSLATOR)))
+ newCode.append(" self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % \
+ (attribName, counter))
+ newCode.append("")
+
+ #Create OPTION_MENU Mode
+ newCode.append(" #%s OPTION MODE" % (attribName))
+ newCode.append(" if mode == modes.OPTION_MENU:")
+ newCode.append(" self.%sVar = Tkinter.StringVar()" % \
+ (attribName))
+ newCode.append(" self.%sOptionMenu = ExtendedOptionMenu(self.parent," % \
+ (attribName))
+ newCode.append(" self.%sVar," % \
+ (attribName))
+ newCode.append(" '<EMPTY>')")
+ newCode.append(" self.%sOptionMenu.grid(row=%s, column=1, sticky=Tkinter.W)" % \
+ (attribName, counter))
+ newCode.append(" self.%sOptionMenu['menu'].delete(0, Tkinter.END)" % \
+ (attribName))
+ newCode.append(" self.%sOptionMenu['width'] = 20" % \
+ (attribName))
+
+ #Create DEFAULT Mode
+ newCode.append("")
+ newCode.append(" #%s DEFAULT MODE" %(attribName))
+ newCode.append(" else:")
+ newCode.append(" self.%sEntry = ValidatingEntry.IntegerEntry(self.parent)" % \
+ (attribName))
+ newCode.append(" self.%sEntry.grid(row=%s, column=1, sticky=Tkinter.W)" % \
+ (attribName, counter))
+ newCode.append("")
+ newCode.append("%VAR_ELEMENT%")
+
+ newCode = string.join(newCode, "\n")
+
+ return re.sub("%VAR_ELEMENT%", newCode, code)
+
+ def makeGetOptionMenu(self, name):
+
+ code = []
+
+ code.append(" def get%sOptionMenu(self):" % (name))
+ code.append(" return self.%sVar.get()" % (name))
+ code.append("")
+ code.append("%GET_FUNCTION%")
+
+ return string.join(code, "\n")
+
+ def makeSetOptionMenu(self, name):
+
+ code = []
+
+ code.append(" def set%sOptionMenu(self, list):" % (name))
+ code.append(" self.%sOptionMenu.setMenuFromList(list)" % (name))
+ code.append("")
+ code.append("%SET_FUNCTION%")
+
+ return string.join(code, '\n')
+
+
+ def makeSelectOptionMenuItem(self, name):
+
+ code = []
+
+ code.append(" def select%sOptionMenuItem(self, name):" % \
+ (name))
+ code.append(" self.%sOptionMenu.selectItemByName(name)" % \
+ (name))
+ code.append("")
+ code.append("%SET_FUNCTION%")
+
+ return string.join(code, '\n')
+
+
+ def makeAppendOptionMenu(self, name):
+
+ code = []
+ code.append(" def append%sOptionMenu(self, list):" % (name))
+ code.append(" self.%sOptionMenu.appendListToMenu(list)" % (name))
+ code.append("")
+ code.append("%SET_FUNCTION%")
+
+ return string.join(code, '\n')
+
+
+ def makeOptionMenuDict(self, name):
+
+ code = []
+ code.append(" self.%sOptionMenuDict = {}" % (name))
+ code.append(" self.update%sOptionMenu()" % (name))
+ code.append("")
+ code.append("%OPTION_MENU_DICT%")
+
+ def makeUpdateOptionMenu(self, className, attribName, getterName):
+ #FIXME: Grabbing wrong end of Association
+ code = []
+ code.append(" def update%sOptionMenu(self):" % (attribName))
+ code.append(" %sList = self.dbs.getAllObjects(self.dbs.%s)" % \
+ (className, className))
+ code.append(" %sNameList = []" % (className))
+ code.append("")
+ code.append(" counter = 0")
+ code.append(" for obj in %sList:" % \
+ (className))
+ code.append(" %sNameList.append(obj.%s())" % \
+ (className, getterName))
+ code.append(" self.%sOptionMenuDict[obj.%s()] = counter" % \
+ (attribName, getterName))
+ code.append(" counter += 1")
+ code.append("")
+ code.append(" self.set%sOptionMenu(%sNameList)" % \
+ (attribName, className))
+ code.append("")
+ code.append("%UPDATE_FUNCTIONS%")
+
+ return string.join(code, '\n')
+
+
+ def makeSaveFk(self, className, attribName, sqlName):
+ #FIXME: Grabbing wrong end of association
+ newCode = []
+ newCode.append(" if self.mode == modes.OPTION_MENU:")
+ newCode.append(" var = self.get%sOptionMenu()" % \
+ (attribName))
+ newCode.append(" %sList = self.dbs.getObjectsWhere(self.dbs.%s, '%s = \'%s\'' % var" % \
+ (className, className, sqlName, '%s'))
+ #FIXME: Not finished yet
+
|
|
From: <ki...@us...> - 2003-01-31 19:33:30
|
Update of /cvsroot/pymerase/pymerase/output/PyTkWidgets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv28856 Added Files: modes.py Log Message: Modes for PyTkWidgets --- NEW FILE: modes.py --- #!/usr/bin/env python ########################################################################### # # # C O P Y R I G H T N O T I C E # # Copyright (c) 2003 by: # # * California Institute of Technology # # # # All Rights Reserved. # # # # Permission is hereby granted, free of charge, to any person # # obtaining a copy of this software and associated documentation files # # (the "Software"), to deal in the Software without restriction, # # including without limitation the rights to use, copy, modify, merge, # # publish, distribute, sublicense, and/or sell copies of the Software, # # and to permit persons to whom the Software is furnished to do so, # # subject to the following conditions: # # # # The above copyright notice and this permission notice shall be # # included in all copies or substantial portions of the Software. # # # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND # # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS # # BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN # # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # # SOFTWARE. # ########################################################################### # # Author: Brandon King # URL: http://pymerase.sourceforge.net # Last Modified: $Date: 2003/01/31 19:33:27 $ # #Modes for DbWidgets FK_ENTRY = 'FkEntry' OPTION_MENU = 'OptionMenu' DEFAULT = FK_ENTRY |
|
From: <ki...@us...> - 2003-01-31 19:32:38
|
Update of /cvsroot/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv28047
Modified Files:
CreatePyTkWidgets.py
Log Message:
Now creates widgets with modes that deal with foreign key/object linking
Index: CreatePyTkWidgets.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreatePyTkWidgets.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CreatePyTkWidgets.py 6 Jan 2003 22:48:03 -0000 1.9
--- CreatePyTkWidgets.py 31 Jan 2003 19:32:34 -0000 1.10
***************
*** 119,122 ****
--- 119,131 ----
print ""
+
+ def getAssociationByName(assocList, name):
+
+ for assoc in assocList:
+ if assoc.getOppositeEnd().getAttributeName(DBAPI_TRANSLATOR) == name:
+ return assoc
+ return None
+
+
###############################################
#CreateTkWidgets write function -- called by pymerase
***************
*** 151,167 ****
#Reset Grid Layout rowCounter
util.resetRowCounter()
!
for attrib in getAllAttributes(classList, myClass, DBAPI_TRANSLATOR):
!
type = attrib.getType().getSQLType()
print "Processing(%s:%s)" % (myClass.getName(TRANSLATOR_NAME), type)
print " CapsWord: %s; English: %s" % (myClass.getName(DBAPI_TRANSLATOR),
myClass.getName(TRANSLATOR_NAME))
! #Process Foriegn keys
if attrib.isPrimaryKey() or type == "serial":
print 'Ignoring Primary Key'
#Process Integers and Doubles
! if type == "integer":
code = re.sub('%VAR_ELEMENT%',
util.makeLabelIntegerEntry(attrib.getName(DBAPI_TRANSLATOR),
--- 160,213 ----
#Reset Grid Layout rowCounter
util.resetRowCounter()
!
! #Get a list of attributes which are used for associations
! assocList = myClass.getAssociationEnds().values()
! assocAttribNameList = []
! for assocEnd in assocList:
! assocAttribNameList.append(assocEnd.getOppositeEnd().getAttributeName(DBAPI_TRANSLATOR))
!
! #Process all attributes in a given class
for attrib in getAllAttributes(classList, myClass, DBAPI_TRANSLATOR):
!
type = attrib.getType().getSQLType()
+ if attrib.getName(DBAPI_TRANSLATOR) in assocAttribNameList:
+ type = "FK"
+
print "Processing(%s:%s)" % (myClass.getName(TRANSLATOR_NAME), type)
print " CapsWord: %s; English: %s" % (myClass.getName(DBAPI_TRANSLATOR),
myClass.getName(TRANSLATOR_NAME))
! #Process Primary keys
if attrib.isPrimaryKey() or type == "serial":
print 'Ignoring Primary Key'
+
+ #Process Foreign Keys
+ if type == "FK":
+ assoc = getAssociationByName(assocList, attrib.getName(DBAPI_TRANSLATOR))
+ code = util.processFkVarElement(attrib,
+ assoc.getOppositeEnd(),
+ DBAPI_TRANSLATOR,
+ code)
+ code = re.sub('%GET_FUNCTION%',
+ util.makeGetLabelIntegerEntry(attrib.getName(DBAPI_TRANSLATOR)),
+ code)
+ code = re.sub('%GET_FUNCTION%',
+ util.makeGetOptionMenu(attrib.getName(DBAPI_TRANSLATOR)),
+ code)
+ code = re.sub('%SET_FUNCTION%',
+ util.makeSetLabelEntry(attrib.getName(DBAPI_TRANSLATOR)),
+ code)
+ code = re.sub('%SET_FUNCTION%',
+ util.makeSetOptionMenu(attrib.getName(DBAPI_TRANSLATOR)),
+ code)
+ #code = re.sub('%SET_FUNCTION%',
+ # util.makeSelectOptionMenuItem(attrib.getName(DBAPI_TRANSLATOR)),
+ # code)
+ #code = re.sub('%SET_FUNCTION%',
+ # util.makeAppendOptionMenu(attrib.getName(DBAPI_TRANSLATOR)),
+ # code)
+
#Process Integers and Doubles
! elif type == "integer":
code = re.sub('%VAR_ELEMENT%',
util.makeLabelIntegerEntry(attrib.getName(DBAPI_TRANSLATOR),
***************
*** 263,266 ****
--- 309,322 ----
print "Please e-mail the above line to pym...@li..."
print ""
+
+
+ #Association Processing
+ assocList = myClass.getAssociationEnds().values()
+
+ print "ASSOCIATION ENDS:"
+ for assocEnd in assocList:
+ print " ", assocEnd.getAttributeName(DBAPI_TRANSLATOR)
+ print " ", assocEnd.getName(DBAPI_TRANSLATOR)
+ print "END ASSOCIATIONS"
#Remove '%*%'
|
|
From: <ki...@us...> - 2003-01-31 18:04:35
|
Update of /cvsroot/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv32614
Modified Files:
CreateReport.py
Log Message:
Provides more output, Getter/Setter Names, etc.
Index: CreateReport.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateReport.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CreateReport.py 11 Dec 2002 17:47:32 -0000 1.1
--- CreateReport.py 31 Jan 2003 18:04:30 -0000 1.2
***************
*** 69,72 ****
--- 69,75 ----
text.append(" Name = %s" % (attribute.getName(TRANSLATOR_NAME)))
text.append(" Type = %s" % (type))
+ text.append(" GetterName = %s" % (attribute.getGetterName(TRANSLATOR_NAME)))
+ text.append(" SetterName = %s" % (attribute.getSetterName(TRANSLATOR_NAME)))
+ text.append(" AppenderName = %s" % (attribute.getAppenderName(TRANSLATOR_NAME)))
text.append(" isRequired = %s" % (attribute.isRequired()))
text.append(" isUnique = %s" % (attribute.isUnique()))
***************
*** 76,80 ****
for assocEnd in tbl.getAssociationEnds().values():
text.append(" ASSOC END:")
! text.append(" Name = %s" % (assocEnd.getAttributeName(TRANSLATOR_NAME)))
text.append(" Multiplicity = %s" % (assocEnd.getMultiplicity()))
text.append(" isNavigable = %s" % (assocEnd.isNavigable()))
--- 79,87 ----
for assocEnd in tbl.getAssociationEnds().values():
text.append(" ASSOC END:")
! text.append(" Name = %s" % (assocEnd.getName(TRANSLATOR_NAME)))
! text.append(" AttribName = %s" % (assocEnd.getAttributeName(TRANSLATOR_NAME)))
! text.append(" GetterName = %s" % (assocEnd.getGetterName(TRANSLATOR_NAME)))
! text.append(" SetterName = %s" % (assocEnd.getSetterName(TRANSLATOR_NAME)))
! text.append(" AppenderName = %s" % (assocEnd.getAppenderName(TRANSLATOR_NAME)))
text.append(" Multiplicity = %s" % (assocEnd.getMultiplicity()))
text.append(" isNavigable = %s" % (assocEnd.isNavigable()))
|
|
From: <ki...@us...> - 2003-01-30 00:48:26
|
Update of /cvsroot/pymerase/pymerase/output/PyTkWidgets/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv4965
Modified Files:
dbSession.py
Log Message:
Now will read from a db.cfg file to get connection settings.
Index: dbSession.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/PyTkWidgets/lib/dbSession.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dbSession.py 29 Jan 2003 19:49:02 -0000 1.4
--- dbSession.py 30 Jan 2003 00:48:21 -0000 1.5
***************
*** 37,40 ****
--- 37,42 ----
import tkMessageBox
import sys
+ import os
+ import ConfigParser
from %DBAPI% import DBSession
***************
*** 55,64 ****
self.dbs = None
! if dsn is None and \
! database is None and \
! user is None and \
! password is None:
self.display()
def display(self):
--- 57,122 ----
self.dbs = None
! self.dsn = dsn
! self.database = database
! self.user = user
! self.password = password
!
! self.__readConfigFile()
!
! if self.dsn is None and \
! self.database is None and \
! self.user is None and \
! self.password is None:
self.display()
+ else:
+ try:
+ self.dbs = DBSession(self.dsn, self.database, self.user, self.password)
+ except:
+ self.getDbs()
+
+ def __readConfigFile(self):
+ """
+ Retrives the following config file from the dir that the program
+ was run from.
+
+ [Connect]
+ dsn: localhost
+ database: someDb
+ user: guest
+ password: guest
+ """
+ CONNECT = 'Connect'
+
+ parser = ConfigParser.ConfigParser()
+ filePath = os.path.abspath('./db.cfg')
+
+ if os.path.isfile(filePath):
+ parser.read(filePath)
+
+ #[Connect] Section
+ if parser.has_section(CONNECT):
+ #dsn option
+ if parser.has_option(CONNECT, 'dsn'):
+ dsn = parser.get(CONNECT, 'dsn')
+ if dsn != "":
+ self.dsn = dsn
+ #database option
+ if parser.has_option(CONNECT, 'database'):
+ database = parser.get(CONNECT, 'database')
+ if database != "":
+ self.database = database
+
+ #user option
+ if parser.has_option(CONNECT, 'user'):
+ user = parser.get(CONNECT, 'user')
+ if user != "":
+ self.user = user
+
+ #password option
+ if parser.has_option(CONNECT, 'password'):
+ password = parser.get(CONNECT, 'password')
+ if password != "":
+ self.password = password
def display(self):
***************
*** 80,83 ****
--- 138,144 ----
self.dsnEntry.grid(row=0, column=1, sticky=Tkinter.W)
+ if self.dsn is not None:
+ self.dsnEntry.insert(0, self.dsn)
+
self.databaseLabel = Tkinter.Label(self.BodyFrame, text="Database:")
self.databaseLabel.grid(row=1, column=0, sticky=Tkinter.E)
***************
*** 85,88 ****
--- 146,152 ----
self.databaseEntry.grid(row=1, column=1, sticky=Tkinter.W)
+ if self.database is not None:
+ self.databaseEntry.insert(0, self.database)
+
self.userLabel = Tkinter.Label(self.BodyFrame, text="User:")
self.userLabel.grid(row=2, column=0, sticky=Tkinter.E)
***************
*** 90,97 ****
--- 154,167 ----
self.userEntry.grid(row=2, column=1, sticky=Tkinter.W)
+ if self.user is not None:
+ self.userEntry.insert(0, self.user)
+
self.passwordLabel = Tkinter.Label(self.BodyFrame, text="Password:")
self.passwordLabel.grid(row=3, column=0, sticky=Tkinter.E)
self.passwordEntry = Tkinter.Entry(self.BodyFrame, show="*")
self.passwordEntry.grid(row=3, column=1, sticky=Tkinter.W)
+
+ if self.password is not None:
+ self.passwordEntry.insert(0, self.password)
self.ConnectButton = Tkinter.Button(self.FooterFrame,
|
|
From: <ki...@us...> - 2003-01-30 00:45:20
|
Update of /cvsroot/pymerase/pymerase/examples/dvd/widgets In directory sc8-pr-cvs1:/tmp/cvs-serv4306 Added Files: db.cfg Log Message: Config File read by dbSession.py --- NEW FILE: db.cfg --- [Connect] dsn: localhost database: user: password: |
|
From: <ki...@us...> - 2003-01-30 00:44:15
|
Update of /cvsroot/pymerase/pymerase/examples/dvd/widgets In directory sc8-pr-cvs1:/tmp/cvs-serv4128/widgets Log Message: Directory /cvsroot/pymerase/pymerase/examples/dvd/widgets added to the repository |
