pymerase-cvs-commit — CVS Commits to Pymerase Project

[Pymerase-cvs-commit] pymerase/pymerase/output CreatePyTkDBWidgets.py,1.6,1.7

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

Update of /cvsroot/pymerase/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv22199

Modified Files:
	CreatePyTkDBWidgets.py 
Log Message:
updated print statements to warning system


Index: CreatePyTkDBWidgets.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase/output/CreatePyTkDBWidgets.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CreatePyTkDBWidgets.py	8 Apr 2003 22:42:26 -0000	1.6
--- CreatePyTkDBWidgets.py	30 May 2003 00:58:52 -0000	1.7
***************
*** 48,51 ****
--- 48,55 ----
  from pymerase.ClassMembers import getAllAssociationEnds
  
+ from pymerase.util.Warnings import DebugWarning
+ from pymerase.util.Warnings import InfoWarning
+ import warnings
+ from warnings import warn
  
  ############################
***************
*** 66,70 ****
      os.mkdir(destination)
    elif os.path.isdir(destination) == 0:
!     print "%s exists but is not a directory." % (destination)
      sys.exit(2)
          
--- 70,74 ----
      os.mkdir(destination)
    elif os.path.isdir(destination) == 0:
!     warn("%s exists but is not a directory." % (destination), RuntimeWarning)
      sys.exit(2)
          
***************
*** 128,136 ****
          type = "FK"
          
!       print "Processing(%s:%s)" % (myClass.getName(TRANSLATOR_NAME), type)
  
        #Process Primary Keys
        if attrib.isPrimaryKey() or type == "serial":
!         print 'Ignoring Primary Key'
        #Process Foriegn keys
        elif type == "FK":
--- 132,140 ----
          type = "FK"
          
!       warn("Processing(%s:%s)" % (myClass.getName(TRANSLATOR_NAME), type), DebugWarning)
  
        #Process Primary Keys
        if attrib.isPrimaryKey() or type == "serial":
!         warn('Ignoring Primary Key', InfoWarning)
        #Process Foriegn keys
        elif type == "FK":
***************
*** 181,185 ****
                        code)
        elif type == "name":
!         print "FIXME: Ignoring name type"
        #Process Text
        elif type == "text":
--- 185,189 ----
                        code)
        elif type == "name":
!         warn("FIXME: Ignoring name type", InfoWarning)
        #Process Text
        elif type == "text":
***************
*** 216,229 ****
        #Process Time Stamps
        elif type == "timestamp with time zone":
!         print "FIXME: Ignoring timestamp"
        #Write out what is not being handled.
        else:
!         print ""
!         print "Table(%s), Type(%s), Attribute(%s) not processed." % \
!               (myClass.getName(TRANSLATOR_NAME),
!                type,
!                attrib.getName(TRANSLATOR_NAME))
!         print "Please e-mail the above line to pym...@li..."
!         print ""
      
      #Remove '%*%'
--- 220,233 ----
        #Process Time Stamps
        elif type == "timestamp with time zone":
!         warn("FIXME: Ignoring timestamp", InfoWarning)
        #Write out what is not being handled.
        else:
!         warn("Table(%s), Type(%s), Attribute(%s) not processed.\n" \
!              "Please e-mail the above line to pym...@li..." % \
!              (myClass.getName(TRANSLATOR_NAME),
!               type,
!               attrib.getName(TRANSLATOR_NAME)),
!              InfoWarning)
! 
      
      #Remove '%*%'
***************
*** 241,245 ****
      f.close()
      
!   print os.linesep \
!         + "Python Tkinter DB Aware Widget Generation Complete... Good Bye." \
!         + os.linesep
--- 245,248 ----
      f.close()
      
!     warn("Python Tkinter DB Aware Widget Generation Complete... Good Bye.", InfoWarning)
! 

[Pymerase-cvs-commit] pymerase/pymerase/util PymeraseType.py,1.14,1.15

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/pymerase/util
In directory sc8-pr-cvs1:/tmp/cvs-serv20866

Modified Files:
	PymeraseType.py 
Log Message:
Added more native types to the native type checker (including varients
of int like integer)
Added a verb to an error message.


Index: PymeraseType.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase/util/PymeraseType.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PymeraseType.py	9 May 2003 19:11:03 -0000	1.14
--- PymeraseType.py	30 May 2003 00:55:39 -0000	1.15
***************
*** 82,86 ****
      return maxlength
  
! NativeTypes = {'python': ('serial', 'String', 'Date', 'float', 'int')}
                 
          
--- 82,86 ----
      return maxlength
  
! NativeTypes = {'python': ('serial', 'String', 'Date', 'float', 'double', 'int.*')}
                 
          
***************
*** 127,131 ****
        return "character(1)"
      else:
!       raise NotImplementedError("Type %s unknown" % self.type_string)
      
    def getPythonTypeStr(self):
--- 127,131 ----
        return "character(1)"
      else:
!       raise NotImplementedError("Type %s is unknown" % self.type_string)
      
    def getPythonTypeStr(self):
***************
*** 162,168 ****
    
    def isNativeType(self, language="python"):
!       """return true if type is a 'native' type of a langage
!       """
!       return self.type_string in NativeTypes["python"]
    
    
--- 162,173 ----
    
    def isNativeType(self, language="python"):
!     """return true if type is a 'native' type of a langage
!     """
!     for re_string in NativeTypes["python"]:
!       if re.match(re_string, self.type_string):
!         return 1
!     else:
!       return 0
!     #return self.type_string in NativeTypes["python"]
    
    

[Pymerase-cvs-commit] pymerase/pymerase/input parseGenexSchemaXML.py,1.28,1.29

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/pymerase/input
In directory sc8-pr-cvs1:/tmp/cvs-serv20337

Modified Files:
	parseGenexSchemaXML.py 
Log Message:
Fixed bug where pymerase would crash if <unique column_id /> named a
column that didn't exist.
Renamed some variables to make more sense
Changed a print statement to an appropriate warning.


Index: parseGenexSchemaXML.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase/input/parseGenexSchemaXML.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** parseGenexSchemaXML.py	25 Apr 2003 23:52:56 -0000	1.28
--- parseGenexSchemaXML.py	30 May 2003 00:54:32 -0000	1.29
***************
*** 201,205 ****
      self.current_pathname = pathname
      # create parser
-     #print sax2exts.XMLParserFactory.get_parser_list()
      
      parser = sax2exts.make_parser()
--- 201,204 ----
***************
*** 376,384 ****
      elif name == "unique":
        # get the list of unique fields and set an inidcator flag
!       class_names = attributes['column_ids']
!       class_name_list = re.split("\s+", class_names)
!       for class_name in class_name_list:
!         classAttribute = self.currentTable.getAttributeByName(class_name, None)
!         classAttribute.setUnique(1)
  
      elif name == "index":
--- 375,390 ----
      elif name == "unique":
        # get the list of unique fields and set an inidcator flag
!       attribute_names = attributes['column_ids']
!       attribute_name_list = re.split("\s+", attribute_names)
!       for attribute_name in attribute_name_list:
!         classAttribute = self.currentTable.getAttributeByName(attribute_name, None)
!         if classAttribute is None:
!           warn("In %s attribute %s was declared unique but not found among %s" % (
!             self.current_pathname,
!             attribute_name,
!             str(self.currentTable.getAttributeNames(None))),
!             SyntaxWarning)
!         else:
!           classAttribute.setUnique(1)
  
      elif name == "index":
***************
*** 396,400 ****
          self.currentTable = None
        else:
!         print "syntax error: table %s not defined" % (self.currentTable.getName(None))
  
  
--- 402,407 ----
          self.currentTable = None
        else:
!         warn("syntax error: table %s not defined" %(self.currentTable.getName(None)),
!              SyntaxWarning)
  
  
***************
*** 418,422 ****
      if element.getDefined() == 0:
        errors += 1
!       warn(RuntimeWarning, "SyntaxError: %s was not defined" % (element.getName(None)))
  
    if errors > 0:
--- 425,430 ----
      if element.getDefined() == 0:
        errors += 1
!       warn("SyntaxError: %s was not defined" % (element.getName(None)),
!            RuntimeWarning)
  
    if errors > 0:

[Pymerase-cvs-commit] pymerase/pymerase ClassMembers.py,1.23,1.24

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv19611

Modified Files:
	ClassMembers.py 
Log Message:
Added getAttributeNames, first used for to report list of valid attributes for an error message

Index: ClassMembers.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase/ClassMembers.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ClassMembers.py	25 Apr 2003 23:51:28 -0000	1.23
--- ClassMembers.py	30 May 2003 00:53:06 -0000	1.24
***************
*** 614,617 ****
--- 614,622 ----
      return map(lambda x: self.attributes[x], self.attributes_order)
  
+   def getAttributeNames(self, translatorName):
+     """Return list of attribute names
+     """
+     return map(lambda x: x.getName(translatorName), self.getAttributes())
+ 
    def addAttribute(self, class_attribute, insert=0):
      """Store field object in a way to allow random and sequential access.

[Pymerase-cvs-commit] pymerase/pymerase/output CreateGraphvizUML.py,1.7,1.8

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

Update of /cvsroot/pymerase/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv11859

Modified Files:
	CreateGraphvizUML.py 
Log Message:
changed print statements to warn system


Index: CreateGraphvizUML.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase/output/CreateGraphvizUML.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CreateGraphvizUML.py	1 Apr 2003 22:17:22 -0000	1.7
--- CreateGraphvizUML.py	30 May 2003 00:37:41 -0000	1.8
***************
*** 42,45 ****
--- 42,50 ----
  #from pymerase.ClassMembers import getAllAssociationEnds
  
+ from pymerase.util.Warnings import DebugWarning
+ from pymerase.util.Warnings import InfoWarning
+ import warnings
+ from warnings import warn
+ 
  ############################
  # Globals
***************
*** 133,138 ****
    #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)
      
--- 138,144 ----
    #Iterate through the tables/classes and process the data
    for tbl in tables:
!    warn("Class(%s)-->Base(%s)" % (tbl.getName(TRANSLATOR_NAME),
!                                   tbl.getBaseClassNames(TRANSLATOR_NAME)),
!         DebugWarning)
      label = indent + "c%s [label=\"{<CLASS_NAME>\\n|<ATTRIB_NAME>| }\"]" % (counter)
      
***************
*** 169,173 ****
    f.write(text)
    f.close()
!   print os.linesep \
!          + "Graphviz UML Generation Complete... Good Bye." \
!          + os.linesep
--- 175,178 ----
    f.write(text)
    f.close()
!   warn("Graphviz UML Generation Complete... Good Bye.", InfoWarning)
! 

[Pymerase-cvs-commit] pymerase/pymerase/input parseXMI.py,1.18,1.19

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/pymerase/input
In directory sc8-pr-cvs1:/tmp/cvs-serv7383

Modified Files:
	parseXMI.py 
Log Message:
Tried to move closer to classesInModel dictionary index being UUID based. Fixed the sigmoid bug by chainging a return into a continue.

Index: parseXMI.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase/input/parseXMI.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** parseXMI.py	9 May 2003 19:11:02 -0000	1.18
--- parseXMI.py	29 May 2003 07:20:08 -0000	1.19
***************
*** 264,274 ****
        otherEnd = thisEnd.getOppositeEnd()
        otherEndType = otherEnd.getType()
-       print "Mult: ", thisEnd.getMultiplicity(), otherEnd.getMultiplicity()
        if thisEnd.getMultiplicity() != fkeyTypes.OneToOne and otherEnd.getMultiplicity() != fkeyTypes.OneToOne:
          err = "Pymerase doesn't support Many To Many relationships"+ os.linesep
          err += "please add a linking table"
-         print err
          warn(err, RuntimeWarning)
-         print "add link"
        elif thisEnd.getMultiplicity() != fkeyTypes.OneToOne:
          # put the key in this end
--- 264,271 ----
***************
*** 282,287 ****
                                             fkeyName)
            thisEndType.addAttribute(foreignKey)
-           print "added %s to %s" % (fkeyName, thisEndType.getName(None))
-         print "onetoone"
        elif otherEnd.getMultiplicity() != fkeyTypes.OneToOne:
          # put the key in the other end
--- 279,282 ----
***************
*** 296,303 ****
                                             fkeyName)
            otherEndType.addAttribute(foreignKey)
-           print "added %s to %s" % (fkeyName, otherEndType.getName(None))
-         print "manytoone"
        else:
!         print "other"
          
    
--- 291,296 ----
                                             fkeyName)
            otherEndType.addAttribute(foreignKey)
        else:
!         raise SyntaxError("Unrecognized multiplicity")
          
    
***************
*** 316,322 ****
  
      if attributeType.isNativeType(language="python"):
!       return
!     
!     otherEndType = classesInModel.get(attributeType.getTypeString(), None)
      if otherEndType is not None:
        #print "NEED to convert %s to relation" % (attributeType)
--- 309,327 ----
  
      if attributeType.isNativeType(language="python"):
!       continue
! 
!     # Map type name to UUID:
!     for uuid, classModel in classesInModel.items():
!       if attributeType.getTypeString() == classModel.name:
!         attributeUUID = uuid
!         break
!     else:
!       warn("In %s couldn't find %s" % (
!         thisEndType.getName(None),
!         attributeType.getTypeString()),
!         RuntimeWarning)
!            
!       
!     otherEndType = classesInModel.get(attributeUUID, None)
      if otherEndType is not None:
        #print "NEED to convert %s to relation" % (attributeType)
***************
*** 340,347 ****
        association = createAssociation(pymeraseConfig, thisEnd, otherEnd)
        
!       # modify current attribute to be of FK type
        attribute.setType(PymeraseType('integer'))
        # FIXME: converting to fk type needs to have a more general solution
        attribute.setName(attribute.getName(None) + "_fk")
  
  def constructForeignKey(pymeraseConfig, classesInModel, attributeName):
--- 345,358 ----
        association = createAssociation(pymeraseConfig, thisEnd, otherEnd)
        
!       # modify current attribute to be of FK type?
        attribute.setType(PymeraseType('integer'))
        # FIXME: converting to fk type needs to have a more general solution
        attribute.setName(attribute.getName(None) + "_fk")
+     else:
+       warn("Attribute %s of type %s in class %s was not defined in model" % (
+         attribute.getName(None),
+         attributeType.getTypeString(),
+         thisEndType.getName(None)),
+            RuntimeWarning)           
  
  def constructForeignKey(pymeraseConfig, classesInModel, attributeName):
***************
*** 393,405 ****
    def parseXMIClass(self, classesInModel, xmiClass):
      name = xmiClass.name
      warn("Parsing class %s" % (name), DebugWarning)
    
      # FIXME: bad hack to ignore garbage provided by NSUML
      # FIXME: perhaps we should ignore things that are part of the java package?
!     if name == "String":
!       warn("Skipping String", DebugWarning)
!       return None
    
!     classMetaInfo = classesInModel.setdefault(name,
                                           XMIClassMetaInfo(self.pymeraseConfig, name))
      
--- 404,417 ----
    def parseXMIClass(self, classesInModel, xmiClass):
      name = xmiClass.name
+     UUID = self.getUUID(xmiClass)
      warn("Parsing class %s" % (name), DebugWarning)
    
      # FIXME: bad hack to ignore garbage provided by NSUML
      # FIXME: perhaps we should ignore things that are part of the java package?
!     #if name == "String":
!     #  warn("Skipping String", DebugWarning)
!     #  return None
    
!     classMetaInfo = classesInModel.setdefault(UUID,
                                           XMIClassMetaInfo(self.pymeraseConfig, name))
      
***************
*** 409,413 ****
      for generalization in xmiClass.generalization:
        baseClassName = generalization.parent.name
!       baseClassRef = classesInModel.setdefault(baseClassName,
                                                 XMIClassMetaInfo(self.pymeraseConfig,
                                                                  baseClassName))
--- 421,426 ----
      for generalization in xmiClass.generalization:
        baseClassName = generalization.parent.name
!       baseClassUUID = self.getUUID(generalization)
!       baseClassRef = classesInModel.setdefault(baseClassUUID,
                                                 XMIClassMetaInfo(self.pymeraseConfig,
                                                                  baseClassName))
***************
*** 451,461 ****
      # get names of types
      thisEndTypeName = self.getEndClassName(end)
      otherEndTypeName = self.getEndClassName(self.getOppositeEnd(end))
    
      # get references to type objects from the master class list
!     thisEndType = classesInModel.setdefault(thisEndTypeName,
                                              XMIClassMetaInfo(self.pymeraseConfig,
                                                               thisEndTypeName))
!     otherEndType = classesInModel.setdefault(otherEndTypeName,
                                               XMIClassMetaInfo(self.pymeraseConfig,
                                                                otherEndTypeName))
--- 464,476 ----
      # get names of types
      thisEndTypeName = self.getEndClassName(end)
+     thisEndTypeUUID = self.getUUID(end)
      otherEndTypeName = self.getEndClassName(self.getOppositeEnd(end))
+     otherEndTypeUUID = self.getUUID(self.getOppositeEnd(end))
    
      # get references to type objects from the master class list
!     thisEndType = classesInModel.setdefault(thisEndTypeUUID,
                                              XMIClassMetaInfo(self.pymeraseConfig,
                                                               thisEndTypeName))
!     otherEndType = classesInModel.setdefault(otherEndTypeUUID,
                                               XMIClassMetaInfo(self.pymeraseConfig,
                                                                otherEndTypeName))
***************
*** 512,515 ****
--- 527,535 ----
      else:
        raise RuntimeError("Couldn't find opposite end")
+ 
+   def getUUID(self, model_element):
+     """Return the unique id of a UML model element
+     """
+     return model_element.name
        
  
***************
*** 553,558 ****
      parsedClass = umlParser.parseXMIClass(classesInModel, xmiClass)
      if parsedClass is not None:
!       classesInModel[parsedClass.getName(None)] = parsedClass
! 
    addForeignKeys(pymeraseConfig, classesInModel)
  
--- 573,578 ----
      parsedClass = umlParser.parseXMIClass(classesInModel, xmiClass)
      if parsedClass is not None:
!       classesInModel[parsedClass.getUUID()] = parsedClass
!   
    addForeignKeys(pymeraseConfig, classesInModel)
  

[Pymerase-cvs-commit] pymerase/pymerase/output CreateSQL.py,1.14,1.15

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv6933

Modified Files:
	CreateSQL.py 
Log Message:
changed warning message to be better linguistically.

Index: CreateSQL.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase/output/CreateSQL.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CreateSQL.py	5 Feb 2003 22:58:33 -0000	1.14
--- CreateSQL.py	29 May 2003 07:18:43 -0000	1.15
***************
*** 255,259 ****
        writeTable(outputStream, t)
      except NotImplementedError, e:
!       warn("Skipping %s because of %s" % (t.getName(TRANSLATOR_NAME), str(e)),
             RuntimeWarning)
  
--- 255,259 ----
        writeTable(outputStream, t)
      except NotImplementedError, e:
!       warn("Skipping %s because: %s" % (t.getName(TRANSLATOR_NAME), str(e)),
             RuntimeWarning)
  

[Pymerase-cvs-commit] htdocs/menus main_menu.shtml,1.9,1.10

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

Update of /cvsroot/pymerase/htdocs/menus
In directory sc8-pr-cvs1:/tmp/cvs-serv23113

Modified Files:
	main_menu.shtml 
Log Message:
better formatting of daily poll


Index: main_menu.shtml
===================================================================
RCS file: /cvsroot/pymerase/htdocs/menus/main_menu.shtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** main_menu.shtml	15 May 2003 22:43:31 -0000	1.9
--- main_menu.shtml	28 May 2003 20:07:38 -0000	1.10
***************
*** 28,37 ****
         <tr>
           <td>
! 	   <div align="center">
! 	   <h2>Daily Poll</h2>
! 	   <table align="center" border=0 width="90%" bgcolor="#6C8AFF">
  	   <!--#include virtual="/poll.html" -->
  	   </table>
  	   </div>
  	 </td>
         </tr>
--- 28,41 ----
         <tr>
           <td>
! 	   <div align="center"><h2>Daily Poll</h2>
! 	   <table border=0 width="85%">
! 	   <tr align="left">
! 	   <td>
  	   <!--#include virtual="/poll.html" -->
+ 	   </tr>
+ 	   </td>
  	   </table>
  	   </div>
+ 	   <br>
  	 </td>
         </tr>

[Pymerase-cvs-commit] htdocs/sysreq index.shtml,1.5,1.6

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

Update of /cvsroot/pymerase/htdocs/sysreq
In directory sc8-pr-cvs1:/tmp/cvs-serv21154

Modified Files:
	index.shtml 
Log Message:
added smw debian package


Index: index.shtml
===================================================================
RCS file: /cvsroot/pymerase/htdocs/sysreq/index.shtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** index.shtml	9 May 2003 02:12:04 -0000	1.5
--- index.shtml	28 May 2003 20:03:03 -0000	1.6
***************
*** 179,182 ****
--- 179,196 ----
  		</td>
                </tr>
+ 	      <tr>
+                 <td width="33%" align="center">SMW</td>
+                 <td width="10%" align="center">No</td>
+                 <td width="90%" align="left">Required by parseXMI<br>
+ 		<br>
+ 	The System Modeling Workbench is a collection of tools to
+         edit, store, analyze and verify models. It is based on the OMG
+         MOF and UML standards and it is implemented using the Python
+         programming language. SMW is a research tool. It is the test
+         bed for our work on UML semantics, model transformation and
+         model-based development. However, it is not a replacement for
+         the existing UML tools.
+ 	        </td>	
+ 	      </tr>
                <tr>
                  <td width="33%" align="center">apache</td>

[Pymerase-cvs-commit] pymerase/pymerase .cvsignore,NONE,1.1

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv29505

Added Files:
	.cvsignore 
Log Message:
Ignore .py[co] files

--- NEW FILE: .cvsignore ---
*.py[co]
*.class

[Pymerase-cvs-commit] pymerase/pymerase/output/PythonAPI .cvsignore,NONE,1.1

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/pymerase/output/PythonAPI
In directory sc8-pr-cvs1:/tmp/cvs-serv29213

Added Files:
	.cvsignore 
Log Message:
Ignore .py[co] files

--- NEW FILE: .cvsignore ---
*.py[co]
*.class

[Pymerase-cvs-commit] htdocs poll.html,1.1,NONE

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

Update of /cvsroot/pymerase/htdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv28146

Removed Files:
	poll.html 
Log Message:
handled by script


--- poll.html DELETED ---

[Pymerase-cvs-commit] htdocs/menus main_menu.shtml,1.8,1.9

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

Update of /cvsroot/pymerase/htdocs/menus
In directory sc8-pr-cvs1:/tmp/cvs-serv29453

Modified Files:
	main_menu.shtml 
Log Message:
formatting


Index: main_menu.shtml
===================================================================
RCS file: /cvsroot/pymerase/htdocs/menus/main_menu.shtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main_menu.shtml	15 May 2003 22:42:41 -0000	1.8
--- main_menu.shtml	15 May 2003 22:43:31 -0000	1.9
***************
*** 28,35 ****
--- 28,37 ----
         <tr>
           <td>
+ 	   <div align="center">
  	   <h2>Daily Poll</h2>
  	   <table align="center" border=0 width="90%" bgcolor="#6C8AFF">
  	   <!--#include virtual="/poll.html" -->
  	   </table>
+ 	   </div>
  	 </td>
         </tr>

[Pymerase-cvs-commit] htdocs/menus main_menu.shtml,1.7,1.8

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

Update of /cvsroot/pymerase/htdocs/menus
In directory sc8-pr-cvs1:/tmp/cvs-serv29110

Modified Files:
	main_menu.shtml 
Log Message:
formatting


Index: main_menu.shtml
===================================================================
RCS file: /cvsroot/pymerase/htdocs/menus/main_menu.shtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** main_menu.shtml	15 May 2003 22:40:22 -0000	1.7
--- main_menu.shtml	15 May 2003 22:42:41 -0000	1.8
***************
*** 29,33 ****
--- 29,35 ----
           <td>
  	   <h2>Daily Poll</h2>
+ 	   <table align="center" border=0 width="90%" bgcolor="#6C8AFF">
  	   <!--#include virtual="/poll.html" -->
+ 	   </table>
  	 </td>
         </tr>

[Pymerase-cvs-commit] htdocs/menus main_menu.shtml,1.6,1.7

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

Update of /cvsroot/pymerase/htdocs/menus
In directory sc8-pr-cvs1:/tmp/cvs-serv28218

Modified Files:
	main_menu.shtml 
Log Message:
added title


Index: main_menu.shtml
===================================================================
RCS file: /cvsroot/pymerase/htdocs/menus/main_menu.shtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** main_menu.shtml	15 May 2003 22:38:16 -0000	1.6
--- main_menu.shtml	15 May 2003 22:40:22 -0000	1.7
***************
*** 28,31 ****
--- 28,32 ----
         <tr>
           <td>
+ 	   <h2>Daily Poll</h2>
  	   <!--#include virtual="/poll.html" -->
  	 </td>

[Pymerase-cvs-commit] htdocs/menus main_menu.shtml,1.5,1.6

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

Update of /cvsroot/pymerase/htdocs/menus
In directory sc8-pr-cvs1:/tmp/cvs-serv27407

Modified Files:
	main_menu.shtml 
Log Message:
added poll


Index: main_menu.shtml
===================================================================
RCS file: /cvsroot/pymerase/htdocs/menus/main_menu.shtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main_menu.shtml	8 May 2003 01:18:10 -0000	1.5
--- main_menu.shtml	15 May 2003 22:38:16 -0000	1.6
***************
*** 5,8 ****
--- 5,11 ----
        <img border="0" src="http://pymerase.sf.net/images/pymerase-title-style2-v3.jpg" width="241" height="54"></td>
      </tr>
+     <tr bgcolor="#6C8AFF">
+       
+     </tr>
      <tr>
        <td width="200" align="center" valign="top">
***************
*** 22,25 ****
--- 25,35 ----
      <img border="0" src="http://pymerase.sf.net/images/pymerase-sysreq.jpg"></a><br>
  
+       <table border=0 width="100%" bgcolor="#6C8AFF">
+        <tr>
+          <td>
+ 	   <!--#include virtual="/poll.html" -->
+ 	 </td>
+        </tr>
+       </table>
        <!--#include virtual="/projhtml.cache" -->
  

[Pymerase-cvs-commit] htdocs poll.html,NONE,1.1

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

Update of /cvsroot/pymerase/htdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv7782

Added Files:
	poll.html 
Log Message:
for having polls on pymerase.sf.net


--- NEW FILE: poll.html ---
<form action="/cgi-bin/poll.py" method="POST" enctype="multipart/form-data">
  Question
  <input type="radio" name="poll" value="option1">
  <input type="radio" name="poll" value="option2">
  <input type="radio" name="poll" value="option3">
  <input type="radio" name="poll" value="option4">
</form>

[Pymerase-cvs-commit] pymerase/examples/school school.smw,NONE,1.1

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/examples/school
In directory sc8-pr-cvs1:/tmp/cvs-serv30313

Added Files:
	school.smw 
Log Message:
commit version of school model written up in SMW's UML editor

--- NEW FILE: school.smw ---
SMW_MODEL
METAMODEL smw.metamodel.UML14
PROFILE UML14
(ismw.metamodel.UML14
Model
p1
(dp2
S'isAbstract'
p3
I0
sS'isSpecification'
p4
I0
sS'__uniqueID__'
p5
S'DCE:EBF8E346-79DD-11D7-B5AF-0003938AB1FE'
p6
sS'modulestring'
p7
[...9183 lines suppressed...]
(ismw.metamodel.MetaMM
MMAssociationEnd
p1689
(dp1690
g11
(I3
g50
I0
g51
I0
I0
tp1691
sg15
g47
sg16
g1
sg17
(lp1692
g118
asbsb.

[Pymerase-cvs-commit] pymerase/debian changelog,1.2,1.3

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv11983

Modified Files:
	changelog 
Log Message:
update to latest cvs release

Index: changelog
===================================================================
RCS file: /cvsroot/pymerase/pymerase/debian/changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** changelog	9 May 2003 19:11:49 -0000	1.2
--- changelog	12 May 2003 22:29:26 -0000	1.3
***************
*** 1,2 ****
--- 1,8 ----
+ pymerase (0.1.99.0-5) woldlab; urgency=low
+ 
+   * updated to current version of cvs
+ 
+  -- Diane Trout <di...@ca...>  Mon, 12 May 2003 14:53:26 -0700
+ 
  pymerase (0.1.99.0-4) woldlab; urgency=low
  

[Pymerase-cvs-commit] pymerase/tests TestImportAll.py,1.4,1.5

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv24799

Modified Files:
	TestImportAll.py 
Log Message:
now expect parseXMI to be importable, so change the expected error to expected success

Index: TestImportAll.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/tests/TestImportAll.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestImportAll.py	3 Apr 2003 00:42:49 -0000	1.4
--- TestImportAll.py	12 May 2003 21:51:01 -0000	1.5
***************
*** 53,63 ****
  
    def testInputParseXMI(self):
!     try:
!       from pymerase.input import parseXMI
!     except ImportError, e:
!       return
!     # FIXME: need to differentiate between
!     # FIXME: python & jython
!     self.fail("parseXMI should fail to import under python")
      
    def testOutputCreateDBAPI(self):
--- 53,57 ----
  
    def testInputParseXMI(self):
!     from pymerase.input import parseXMI
      
    def testOutputCreateDBAPI(self):

[Pymerase-cvs-commit] pymerase/examples/xmiSchool createapi.py,1.5,1.6 creategraphvizuml.py,1.2,1.3

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/examples/xmiSchool
In directory sc8-pr-cvs1:/tmp/cvs-serv24284

Modified Files:
	createapi.py creategraphvizuml.py 
Log Message:
switched back to speficying input & output translators by name instead of imported module

Index: createapi.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/xmiSchool/createapi.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** createapi.py	5 Feb 2003 23:07:59 -0000	1.5
--- createapi.py	12 May 2003 21:50:09 -0000	1.6
***************
*** 5,20 ****
  
  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 pymerase.input.parseXMI
- import pymerase.output.CreateDBAPI
  
  if __name__ == "__main__":
!   schema = os.path.abspath("./school.xmi")
    outputPath = os.path.abspath("./school")
      
!   #pymerase.run(schema, 'parseXMI', output, 'CreateDBAPI')
!   pymerase.run(schema, pymerase.input.parseXMI, outputPath, pymerase.output.CreateDBAPI)
  
  
--- 5,15 ----
  
  import pymerase
  
  if __name__ == "__main__":
!   schema = os.path.abspath("./school.zargo")
    outputPath = os.path.abspath("./school")
      
!   pymerase.run(schema, 'parseXMI', outputPath, 'CreateDBAPI')
! 
  
  

Index: creategraphvizuml.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/xmiSchool/creategraphvizuml.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** creategraphvizuml.py	5 Feb 2003 23:07:59 -0000	1.2
--- creategraphvizuml.py	12 May 2003 21:50:09 -0000	1.3
***************
*** 5,20 ****
  
  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 pymerase.input.parseXMI
- import pymerase.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, pymerase.input.parseXMI, outputPath, pymerase.output.CreateGraphvizUML)
  
  
--- 5,15 ----
  
  import pymerase
  
  if __name__ == "__main__":
!   schema = os.path.abspath("./school.zargo")
    outputPath = os.path.abspath("./school.dot")
      
!   pymerase.run(schema, 'parseXMI', outputPath, 'CreateDBAPI')
! 
  
  

[Pymerase-cvs-commit] pymerase README,1.6,1.7

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv23687

Modified Files:
	README 
Log Message:
Told people to look at sourceforge to see what's currently not working
with pymerase.


Index: README
===================================================================
RCS file: /cvsroot/pymerase/pymerase/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** README	19 Feb 2003 00:52:08 -0000	1.6
--- README	12 May 2003 21:49:06 -0000	1.7
***************
*** 26,30 ****
  ------
  
! Currently self referential objects can only be initialized in the
! one-to-one direction. The other direction doesn't put the primary key
! of the one object in the foreign key for the many objects.
\ No newline at end of file
--- 26,30 ----
  ------
  
! Check the sourceforge page for the current list of open bugs
!  http://sourceforge.net/tracker/?atid=505345&group_id=63836&func=browse
! 

[Pymerase-cvs-commit] pymerase setup.py,1.9,1.10

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

Update of /cvsroot/pymerase/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv18134

Modified Files:
	setup.py 
Log Message:
updated win32 defaults


Index: setup.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/setup.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** setup.py	9 May 2003 22:50:38 -0000	1.9
--- setup.py	10 May 2003 00:01:45 -0000	1.10
***************
*** 98,102 ****
    #NOTE: can override with command line
    elif sys.platform == 'win32':
!     binPath = 'C:\\Program Files\\Pymerase\\bin'
    else:
      binPath = 'pymerase'
--- 98,102 ----
    #NOTE: can override with command line
    elif sys.platform == 'win32':
!     binPath = '..\\Program Files\\Pymerase\\bin'
    else:
      binPath = 'pymerase'
***************
*** 112,116 ****
    #NOTE: can override with command line
    elif sys.platform == 'win32':
!     docPath = 'C:\\Program Files\\Pymerase\\docs'
    else:
      docPath = 'pymerase'
--- 112,116 ----
    #NOTE: can override with command line
    elif sys.platform == 'win32':
!     docPath = '..\\Program Files\\Pymerase\\docs'
    else:
      docPath = 'pymerase'

[Pymerase-cvs-commit] pymerase setup.py,1.8,1.9

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

Update of /cvsroot/pymerase/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv22782

Modified Files:
	setup.py 
Log Message:
updated version number


Index: setup.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/setup.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** setup.py	9 May 2003 01:59:02 -0000	1.8
--- setup.py	9 May 2003 22:50:38 -0000	1.9
***************
*** 140,144 ****
  #Run setup! =o)
  setup(name="Pymerase",
!       version="0.1",
        description="Pymerase is a tool intended to generate a python " \
        "object model, relational database, and an object-relational " \
--- 140,144 ----
  #Run setup! =o)
  setup(name="Pymerase",
!       version="0.1.99.0",
        description="Pymerase is a tool intended to generate a python " \
        "object model, relational database, and an object-relational " \

[Pymerase-cvs-commit] pymerase/bin pymerasegui.py,1.9,1.10

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

Update of /cvsroot/pymerase/pymerase/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv29668/bin

Modified Files:
	pymerasegui.py 
Log Message:
Updated to display the correct Pymerase Version Number


Index: pymerasegui.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/bin/pymerasegui.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pymerasegui.py	18 Apr 2003 21:55:56 -0000	1.9
--- pymerasegui.py	9 May 2003 20:45:20 -0000	1.10
***************
*** 113,117 ****
      # TITLE
      self.title = Label(titleFrame,
!                        text="Pymerase v0.1",
                         fg="blue",
                         font=("Times", 30))
--- 113,117 ----
      # TITLE
      self.title = Label(titleFrame,
!                        text="Pymerase %s" % (PymVERSION),
                         fg="blue",
                         font=("Times", 30))