r6508 - in trunk/gnue-appserver: doc src src/gcd

[johannes]

Author: johannes
Date: 2004-10-19 03:40:53 -0500 (Tue, 19 Oct 2004)
New Revision: 6508

Modified:
   trunk/gnue-appserver/doc/gcd.dtd
   trunk/gnue-appserver/src/data.py
   trunk/gnue-appserver/src/gcd/GCParser.py
Log:
Fixed typos in GCParser, which caused gnuedtd to crash


Modified: trunk/gnue-appserver/doc/gcd.dtd
===================================================================
--- trunk/gnue-appserver/doc/gcd.dtd    2004-10-18 19:00:16 UTC (rev 6507)
+++ trunk/gnue-appserver/doc/gcd.dtd    2004-10-19 08:40:53 UTC (rev 6508)
@@ -0,0 +1,104 @@
+<!-- GNUe Class Definitions DTD (Version 0.3.0.99) -->
+
+<!--
+     Copyright 2001-2004 Free Software Foundation
+
+     This file is part of GNU Enterprise.
+
+     GNU Enterprise is free software; you can redistribute it
+     and/or modify it under the terms of the GNU General Public
+     License as published by the Free Software Foundation; either
+     version 2, or (at your option) any later version.
+
+     GNU Enterprise is distributed in the hope that it will be
+     useful, but WITHOUT ANY WARRANTY; without even the implied
+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE. See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public
+     License along with program; see the file COPYING. If not,
+     write to the Free Software Foundation, Inc., 59 Temple Place
+     - Suite 330, Boston, MA 02111-1307, USA.
+-->
+
+<!-- Entities for characters/symbols -->
+<!ENTITY % lt "&#38;#60;">
+<!ENTITY % gt "&#62;">
+<!ENTITY % amp "&#38;#38;">
+
+<!--  =================================================  -->
+<!--  Datatype entities to make DTD more human readable  -->
+<!--  =================================================  -->
+
+<!ENTITY % text "CDATA">
+
+<!ENTITY % true "Y">
+<!ENTITY % false "N">
+<!ENTITY % boolean "(%true;|%false;) #IMPLIED">
+
+<!ENTITY % integer "NMTOKEN">
+<!-- [-]?[0-9]+ -->
+
+<!ENTITY % name "NMTOKEN">
+<!-- [A-Za-z]([A-Z][a-z][0-9][#$_-])* -->
+
+
+
+<!-- ================= -->
+<!-- Top level element -->
+<!-- ================= -->
+<!ELEMENT module (class*)>
+<!ATTLIST module name ID #REQUIRED>
+<!ATTLIST module comment %text; #IMPLIED>
+
+
+<!-- ======================== -->
+<!-- Child elements of module -->
+<!-- ======================== -->
+<!ELEMENT class (index*, procedure*, property*)>
+<!ATTLIST class name ID #REQUIRED>
+<!ATTLIST class comment %text; #IMPLIED>
+<!ATTLIST class filter %name; #IMPLIED>
+<!ATTLIST class module %name; #IMPLIED>
+
+
+<!-- ======================= -->
+<!-- Child elements of class -->
+<!-- ======================= -->
+<!ELEMENT index EMPTY>
+<!ATTLIST index name ID #REQUIRED>
+<!ATTLIST index unique %boolean;>
+
+<!ELEMENT procedure (parameter*, #PCDATA)>
+<!ATTLIST procedure name ID #REQUIRED>
+<!ATTLIST procedure comment %text; #IMPLIED>
+<!ATTLIST procedure language %name; "python">
+<!ATTLIST procedure length %integer; #IMPLIED>
+<!ATTLIST procedure nullable %boolean;>
+<!ATTLIST procedure scale %integer; #IMPLIED>
+<!ATTLIST procedure type %text; #IMPLIED>
+
+<!ELEMENT property EMPTY>
+<!ATTLIST property name ID #REQUIRED>
+<!ATTLIST property type %text; #REQUIRED>
+<!ATTLIST property comment %text; #IMPLIED>
+<!ATTLIST property language %name; "python">
+<!ATTLIST property length %integer; #IMPLIED>
+<!ATTLIST property nullable %boolean;>
+<!ATTLIST property scale %integer; #IMPLIED>
+
+
+<!-- =========================== -->
+<!-- Child elements of procedure -->
+<!-- =========================== -->
+<!ELEMENT parameter EMPTY>
+<!ATTLIST parameter name ID #REQUIRED>
+<!ATTLIST parameter type %text; #REQUIRED>
+<!ATTLIST parameter comment %text; #IMPLIED>
+<!ATTLIST parameter length %integer; #IMPLIED>
+<!ATTLIST parameter scale %integer; #IMPLIED>
+
+
+<!-- This DTD was created by gnuedtd
+     Updated: 2004-10-19 10:16:16   -->
+

Modified: trunk/gnue-appserver/src/data.py
===================================================================
--- trunk/gnue-appserver/src/data.py    2004-10-18 19:00:16 UTC (rev 6507)
+++ trunk/gnue-appserver/src/data.py    2004-10-19 08:40:53 UTC (rev 6508)
@@ -897,6 +897,11 @@
       # If we find the field in the cache, use it
       return self.__cache.read (self.__table, self.__row, field)
     else:
+      # if state is one of 'in*' the record is new and cannot exist in the
+      # backend.
+      if self.status () in ['initializing', 'initialized', 'inserted']:
+        return None
+
       # Not found in cache, so get it from the db
       resultSet = _find (self.__connections, self.__database, self.__table,
                          self.__row, [field])

Modified: trunk/gnue-appserver/src/gcd/GCParser.py
===================================================================
--- trunk/gnue-appserver/src/gcd/GCParser.py    2004-10-18 19:00:16 UTC (rev 
6507)
+++ trunk/gnue-appserver/src/gcd/GCParser.py    2004-10-19 08:40:53 UTC (rev 
6508)
@@ -197,7 +197,7 @@
           'name': {
             'Required': True,
             'Unique'  : True,
-            'Typecase': GTypecast.name},
+            'Typecast': GTypecast.name},
           'unique': {
             'Typecast': GTypecast.boolean,
             'Default': True},
@@ -210,7 +210,7 @@
           'name': {
             'Required': True,
             'Unique': True,
-            'Typecase': GTypecast.name},
+            'Typecast': GTypecast.name},
         },
         'Parenttags': ('index',)
       },