gnue/designer/src/schema/parser GSParser.py gnu...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/07/15 16:12:50

Modified files:
        designer/src/schema/parser: GSParser.py gnue-schema.dtd 

Log message:
        fixed incorrect parenttag of pkfield

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/parser/GSParser.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/parser/gnue-schema.dtd.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/designer/src/schema/parser/GSParser.py
diff -c gnue/designer/src/schema/parser/GSParser.py:1.3 
gnue/designer/src/schema/parser/GSParser.py:1.4
*** gnue/designer/src/schema/parser/GSParser.py:1.3     Wed Jul 10 18:27:38 2002
--- gnue/designer/src/schema/parser/GSParser.py Mon Jul 15 16:12:50 2002
***************
*** 141,147 ****
              'name':        {
                 'Required': 1,
                 'Typecast': GTypecast.name } },
!          'ParentTags':  ('table',) },
  
        'constraints':   {
           'BaseClass': Objects.GSConstraints,
--- 141,147 ----
              'name':        {
                 'Required': 1,
                 'Typecast': GTypecast.name } },
!          'ParentTags':  ('primarykey',) },
  
        'constraints':   {
           'BaseClass': Objects.GSConstraints,
***************
*** 171,177 ****
           'BaseClass': Objects.GSData,
           'SingleInstance': 1,
           'ParentTags':  ('schema',) },
!       
        'tabledata':   {
           'BaseClass': Objects.GSTableData,
           'Attributes': {
--- 171,177 ----
           'BaseClass': Objects.GSData,
           'SingleInstance': 1,
           'ParentTags':  ('schema',) },
! 
        'tabledata':   {
           'BaseClass': Objects.GSTableData,
           'Attributes': {
***************
*** 187,206 ****
           'BaseClass': Objects.GSRows,
           'SingleInstance': 1,
           'ParentTags':  ('tabledata',) },
!       
        'row':   {
           'BaseClass': Objects.GSRow,
           'ParentTags':  ('rows',) },
!       
        'value':   {
           'BaseClass': Objects.GSValue,
           'Attributes': {
              'field':        {
!                'Required': 0,
                 'Typecast': GTypecast.name },
              'type':        {
                 'Required': 0,
!                'Typecast': GTypecast.name } },
           'ParentTags':  ('row',),
           'MixedContent': 1, },
  
--- 187,207 ----
           'BaseClass': Objects.GSRows,
           'SingleInstance': 1,
           'ParentTags':  ('tabledata',) },
! 
        'row':   {
           'BaseClass': Objects.GSRow,
           'ParentTags':  ('rows',) },
! 
        'value':   {
           'BaseClass': Objects.GSValue,
           'Attributes': {
              'field':        {
!                'Required': 1,
                 'Typecast': GTypecast.name },
              'type':        {
                 'Required': 0,
!                'Typecast': GTypecast.name, 
!                'Default':  'text' } },
           'ParentTags':  ('row',),
           'MixedContent': 1, },
  
Index: gnue/designer/src/schema/parser/gnue-schema.dtd
diff -c gnue/designer/src/schema/parser/gnue-schema.dtd:1.3 
gnue/designer/src/schema/parser/gnue-schema.dtd:1.4
*** gnue/designer/src/schema/parser/gnue-schema.dtd:1.3 Mon Jul 15 16:00:18 2002
--- gnue/designer/src/schema/parser/gnue-schema.dtd     Mon Jul 15 16:12:50 2002
***************
*** 73,79 ****
  <!-- ======================== -->
  <!-- Child elements of tables -->
  <!-- ======================== -->
! <!ELEMENT table (constraints?, fields?, pkfield*, primarykey?)>
  <!ATTLIST table name ID #REQUIRED>
  <!ATTLIST table description %text; #IMPLIED>
  
--- 73,79 ----
  <!-- ======================== -->
  <!-- Child elements of tables -->
  <!-- ======================== -->
! <!ELEMENT table (constraints?, fields?, primarykey?)>
  <!ATTLIST table name ID #REQUIRED>
  <!ATTLIST table description %text; #IMPLIED>
  
***************
*** 91,100 ****
  
  <!ELEMENT fields (field*)>
  
! <!ELEMENT pkfield EMPTY>
! <!ATTLIST pkfield name %name; #REQUIRED>
! 
! <!ELEMENT primarykey EMPTY>
  <!ATTLIST primarykey name %name; #REQUIRED>
  
  
--- 91,97 ----
  
  <!ELEMENT fields (field*)>
  
! <!ELEMENT primarykey (pkfield*)>
  <!ATTLIST primarykey name %name; #REQUIRED>
  
  
***************
*** 124,135 ****
  <!ATTLIST field size %whole; #IMPLIED>
  
  
  <!-- ===================== -->
  <!-- Child elements of row -->
  <!-- ===================== -->
  <!ELEMENT value EMPTY>
! <!ATTLIST value field %name; #IMPLIED>
! <!ATTLIST value type %name; #IMPLIED>
  
  
  <!-- ============================ -->
--- 121,139 ----
  <!ATTLIST field size %whole; #IMPLIED>
  
  
+ <!-- ============================ -->
+ <!-- Child elements of primarykey -->
+ <!-- ============================ -->
+ <!ELEMENT pkfield EMPTY>
+ <!ATTLIST pkfield name %name; #REQUIRED>
+ 
+ 
  <!-- ===================== -->
  <!-- Child elements of row -->
  <!-- ===================== -->
  <!ELEMENT value EMPTY>
! <!ATTLIST value field %name; #REQUIRED>
! <!ATTLIST value type %name; #DEFAULT "text">
  
  
  <!-- ============================ -->
***************
*** 140,144 ****
  
  
  <!-- This DTD was created by gnuedtd
!      Updated: 2002-07-15 14:51:40   -->
  
--- 144,148 ----
  
  
  <!-- This DTD was created by gnuedtd
!      Updated: 2002-07-15 15:12:27   -->