r5200 - in trunk/gnue-common: doc scripts

[johannes]

Author: johannes
Date: 2004-03-01 03:50:52 -0600 (Mon, 01 Mar 2004)
New Revision: 5200

Modified:
   trunk/gnue-common/doc/gnue-schema.dtd
   trunk/gnue-common/scripts/gnuedtd
Log:
Fixed imports in gnuedtd and updated the gnue-schema.dtd to reflect the recent
changes in GSParser.py


Modified: trunk/gnue-common/doc/gnue-schema.dtd
===================================================================
--- trunk/gnue-common/doc/gnue-schema.dtd       2004-03-01 09:48:42 UTC (rev 
5199)
+++ trunk/gnue-common/doc/gnue-schema.dtd       2004-03-01 09:50:52 UTC (rev 
5200)
@@ -1,7 +1,7 @@
-<!-- GNUe Schema DTD (Version 0.4.0a) -->
+<!-- GNUe Schema DTD (Version 0.5.2.99) -->
 
 <!--
-     Copyright 2001-2002 Free Software Foundation
+     Copyright 2001-2004 Free Software Foundation
 
      This file is part of GNU Enterprise.
 
@@ -47,7 +47,7 @@
 <!-- ================= -->
 <!-- Top level element -->
 <!-- ================= -->
-<!ELEMENT schema (data?, tables?)>
+<!ELEMENT schema (data?, description?, tables?)>
 <!ATTLIST schema author %text; #IMPLIED>
 <!ATTLIST schema description %text; #IMPLIED>
 <!ATTLIST schema title %text; #IMPLIED>
@@ -59,13 +59,15 @@
 <!-- ======================== -->
 <!ELEMENT data (tabledata*)>
 
-<!ELEMENT tables (table*)>
+<!ELEMENT description EMPTY>
 
+<!ELEMENT tables (import-table*, table*)>
 
+
 <!-- ====================== -->
 <!-- Child elements of data -->
 <!-- ====================== -->
-<!ELEMENT tabledata (rows?)>
+<!ELEMENT tabledata (definition?, rows?)>
 <!ATTLIST tabledata name %name; #REQUIRED>
 <!ATTLIST tabledata tablename %name; #REQUIRED>
 
@@ -73,7 +75,13 @@
 <!-- ======================== -->
 <!-- Child elements of tables -->
 <!-- ======================== -->
-<!ELEMENT table (constraints?, fields?, indexes?, primarykey?)>
+<!ELEMENT import-table EMPTY>
+<!ATTLIST import-table name ID #REQUIRED>
+<!ATTLIST import-table library %name; #REQUIRED>
+<!ATTLIST import-table description %text; #IMPLIED>
+
+<!ELEMENT table (constraints?, fields?, import-fields?, indexes?, 
+                 primarykey?)>
 <!ATTLIST table name ID #REQUIRED>
 <!ATTLIST table description %text; #IMPLIED>
 
@@ -81,6 +89,8 @@
 <!-- =========================== -->
 <!-- Child elements of tabledata -->
 <!-- =========================== -->
+<!ELEMENT definition (column*)>
+
 <!ELEMENT rows (row*)>
 
 
@@ -89,14 +99,25 @@
 <!-- ======================= -->
 <!ELEMENT constraints (constraint*)>
 
-<!ELEMENT fields (field*)>
+<!ELEMENT fields (field*, import-field*)>
 
+<!ELEMENT import-fields EMPTY>
+<!ATTLIST import-fields library %name; #REQUIRED>
+
 <!ELEMENT indexes (index*)>
 
 <!ELEMENT primarykey (pkfield*)>
 <!ATTLIST primarykey name %name; #REQUIRED>
 
 
+<!-- ============================ -->
+<!-- Child elements of definition -->
+<!-- ============================ -->
+<!ELEMENT column EMPTY>
+<!ATTLIST column field %name; #REQUIRED>
+<!ATTLIST column type %name; #REQUIRED>
+
+
 <!-- ====================== -->
 <!-- Child elements of rows -->
 <!-- ====================== -->
@@ -117,12 +138,27 @@
 <!ELEMENT field EMPTY>
 <!ATTLIST field name ID #REQUIRED>
 <!ATTLIST field type %name; #REQUIRED>
+<!ATTLIST field auto %boolean;>
 <!ATTLIST field default %text; #IMPLIED>
+<!ATTLIST field defaultwith (constant | serial | timestamp) "constant">
 <!ATTLIST field description %text; #IMPLIED>
+<!ATTLIST field length %whole; #IMPLIED>
 <!ATTLIST field nullable %boolean;>
-<!ATTLIST field size %whole; #IMPLIED>
+<!ATTLIST field precision %whole; "0">
 
+<!ELEMENT import-field EMPTY>
+<!ATTLIST import-field name ID #REQUIRED>
+<!ATTLIST import-field library %name; #REQUIRED>
+<!ATTLIST import-field type %name; #REQUIRED>
+<!ATTLIST import-field auto %boolean;>
+<!ATTLIST import-field default %text; #IMPLIED>
+<!ATTLIST import-field defaultwith (constant | serial | timestamp) "constant">
+<!ATTLIST import-field description %text; #IMPLIED>
+<!ATTLIST import-field length %whole; #IMPLIED>
+<!ATTLIST import-field nullable %boolean;>
+<!ATTLIST import-field precision %whole; "0">
 
+
 <!-- ========================= -->
 <!-- Child elements of indexes -->
 <!-- ========================= -->
@@ -142,7 +178,8 @@
 <!-- Child elements of row -->
 <!-- ===================== -->
 <!ELEMENT value EMPTY>
-<!ATTLIST value field %name; #REQUIRED>
+<!ATTLIST value field %name; #IMPLIED>
+<!ATTLIST value key %boolean;>
 <!ATTLIST value type %name; "text">
 
 
@@ -165,5 +202,5 @@
 
 
 <!-- This DTD was created by gnuedtd
-     Updated: 2002-07-25 01:08:58   -->
+     Updated: 2004-03-01 10:45:52   -->
 

Modified: trunk/gnue-common/scripts/gnuedtd
===================================================================
--- trunk/gnue-common/scripts/gnuedtd   2004-03-01 09:48:42 UTC (rev 5199)
+++ trunk/gnue-common/scripts/gnuedtd   2004-03-01 09:50:52 UTC (rev 5200)
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 #
 # This file is part of GNU Enterprise.
 #
@@ -17,7 +17,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2001-2003 Free Software Foundation
+# Copyright 2001-2004 Free Software Foundation
 #
 #
 # FILE:
@@ -29,12 +29,14 @@
 #
 # NOTES:
 #
+# $Id$
 
 import sys, string, time
-from gnue.common import GParser, GTypecast
+from gnue.common.definitions import GParser
+from gnue.common.formatting import GTypecast
 
 # This is simply to initialize gettext support :(
-from gnue.common import GBaseApp
+from gnue.common.apps import GBaseApp
 
 class GenerateDTD:
   def __init__ (self, tool, dest=sys.__stdout__):
@@ -106,7 +108,7 @@
 
     dest.write ("""
 <!--
-     Copyright 2001-2003 Free Software Foundation
+     Copyright 2001-2004 Free Software Foundation
 
      This file is part of GNU Enterprise.
 


Property changes on: trunk/gnue-common/scripts/gnuedtd
___________________________________________________________________
Name: svn:keywords
   + Id