gnue/common scripts/gnuedtd src/commdrivers/_pa...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  02/05/01 20:37:36

Modified files:
        common/scripts : gnuedtd 
        common/src/commdrivers/_parser: Parser.py 

Log message:
        updated gnuedtd to produce dtd for grpc files

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/scripts/gnuedtd.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/_parser/Parser.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/common/scripts/gnuedtd
diff -c gnue/common/scripts/gnuedtd:1.2 gnue/common/scripts/gnuedtd:1.3
*** gnue/common/scripts/gnuedtd:1.2     Wed Jul  4 20:39:28 2001
--- gnue/common/scripts/gnuedtd Wed May  1 20:37:36 2002
***************
*** 50,57 ****
        name = PACKAGE
        version = VERSION
  
      else: 
!       print "\nSyntax: gnuedtd <forms|reports>\n"
        sys.exit()
  
      self.parentMappings = {}
--- 50,64 ----
        name = PACKAGE
        version = VERSION
  
+     elif tool == 'gnurpc': 
+       from gnue.common.commdrivers._parser import Parser
+       xmlElements = Parser.getXMLelements()
+       topLevelElement = 'gnurpc'
+       name = 'GNURPC'
+       version = '0.0001'
+ 
      else: 
!       print "\nSyntax: gnuedtd <forms|reports|gnurpc>\n"
        sys.exit()
  
      self.parentMappings = {}
***************
*** 73,79 ****
  
        # Find out what Typecasts are being used
        if xmlElements[element].has_key('Attributes'): 
!         for att in xmlElements[element]['Attributes'].keys():  
            self.typecasts[xmlElements[element]['Attributes'][att]['Typecast']] 
\
                        = 'CDATA'
  
--- 80,86 ----
  
        # Find out what Typecasts are being used
        if xmlElements[element].has_key('Attributes'): 
!         for att in xmlElements[element]['Attributes'].keys():
            self.typecasts[xmlElements[element]['Attributes'][att]['Typecast']] 
\
                        = 'CDATA'
  
***************
*** 147,157 ****
   
      dest.write('\n')
  
!     self.elementStack = [['Top level element','form']]
  
!     while len(self.elementStack): 
!       i = 1 
!       while i < len(self.elementStack[0]): 
          if self.processedTags.has_key(self.elementStack[0][i]): 
            self.elementStack[0].pop(i)
          else: 
--- 154,169 ----
   
      dest.write('\n')
  
!     self.elementStack = [['Top level element',topLevelElement]]
! 
!     while len(self.elementStack) and \
!               (self.elementStack!=[['Child elements of service']]): 
!       i = 1
!       #print "first loop: %s, %s " % \
!       #      (len(self.elementStack),self.elementStack)
  
!       ## remove allready processed tags
!       while i < len(self.elementStack[0]):        
          if self.processedTags.has_key(self.elementStack[0][i]): 
            self.elementStack[0].pop(i)
          else: 
***************
*** 166,171 ****
--- 178,185 ----
          for element in elements: 
            self.handleElement(element)
          self.elementStack.pop(0)
+ #      else:
+ #        self.elementStack.pop(0)
  
  
      dest.write ("\n<!-- This DTD was created by gnuedtd\n"
***************
*** 219,224 ****
--- 233,240 ----
      #
      # Create the ELEMENT tag
      #
+    # for i in self.xmlElements.keys():
+     #  print "element: %s" % i
  
      if self.default(self.xmlElements[element],'Deprecated',0): 
        self.dest.write(self.wrap(17, 
Index: gnue/common/src/commdrivers/_parser/Parser.py
diff -c gnue/common/src/commdrivers/_parser/Parser.py:1.6 
gnue/common/src/commdrivers/_parser/Parser.py:1.7
*** gnue/common/src/commdrivers/_parser/Parser.py:1.6   Tue Apr 30 19:52:30 2002
--- gnue/common/src/commdrivers/_parser/Parser.py       Wed May  1 20:37:36 2002
***************
*** 76,82 ****
        'gnurpc': {
           'BaseClass': Objects.GnuRpc,
           'Required': 1,
!          'SingleInstance': 1,
           'ParentTags': None },
  
        'service': {
--- 76,82 ----
        'gnurpc': {
           'BaseClass': Objects.GnuRpc,
           'Required': 1,
! #         'SingleInstance': 1,
           'ParentTags': None },
  
        'service': {
***************
*** 95,101 ****
        'method': {
           'BaseClass': Objects.RpcMethod,
           'Required': 1,
!          'SingleInstance': 1,
           'Attributes': {
              'name': {
                 'Typecast': GTypecast.name,
--- 95,101 ----
        'method': {
           'BaseClass': Objects.RpcMethod,
           'Required': 1,
! #         'SingleInstance': 1,
           'Attributes': {
              'name': {
                 'Typecast': GTypecast.name,
***************
*** 104,114 ****
                 'Typecast': GTypecast.name },
              'helptext': {
                 'Typecast': GTypecast.name } },
!          'ParentTags': ('gnurpc','service') },
  
        'object': {
           'BaseClass': Objects.RpcObject,
!          'SingleInstance': 1,
           'Attributes': {
              'name': {
                 'Typecast': GTypecast.name,
--- 104,114 ----
                 'Typecast': GTypecast.name },
              'helptext': {
                 'Typecast': GTypecast.name } },
!          'ParentTags': ('gnurpc','service','object') },
  
        'object': {
           'BaseClass': Objects.RpcObject,
! #         'SingleInstance': 1,
           'Attributes': {
              'name': {
                 'Typecast': GTypecast.name,