[Docstring-checkins] CVS: dps/dps nodes.py,1.4,1.5

[David G. <go...@us...>]

Update of /cvsroot/docstring/dps/dps
In directory usw-pr-cvs1:/tmp/cvs-serv26154/dps/dps

Modified Files:
	nodes.py 
Log Message:
  - Duplicate hyperlink names -> dupname attribute.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nodes.py	2001/08/25 01:44:16	1.4
--- nodes.py	2001/08/28 03:27:31	1.5
***************
*** 274,280 ****
                or self.implicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
!                   0, 'duplicate implicit link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.implicitlinks)
              self.implicitlinks.setdefault(name, []).append(linknode)
          else:
--- 274,281 ----
                or self.implicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.implicitlinks)
+             linknode['dupname'] = name
              self.implicitlinks.setdefault(name, []).append(linknode)
          else:
***************
*** 287,299 ****
          if self.explicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
!                   1, 'duplicate explicit link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.explicitlinks, self.implicitlinks,
                                  self.indirectlinks)
              self.explicitlinks.setdefault(name, []).append(linknode)
              return
          elif self.implicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
!                   0, 'duplicate implicit link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.implicitlinks)
--- 288,301 ----
          if self.explicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
!                   1, 'Duplicate explicit link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.explicitlinks, self.implicitlinks,
                                  self.indirectlinks)
+             linknode['dupname'] = name
              self.explicitlinks.setdefault(name, []).append(linknode)
              return
          elif self.implicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.implicitlinks)
***************
*** 305,308 ****
--- 307,311 ----
              for node in linkdict.get(name, []):
                  if node.has_key('name'):
+                     node['dupname'] = node['name']
                      del node['name']
  
***************
*** 311,319 ****
  
      def addindirectlink(self, name, reference, linknode, innode):
-         #print >>sys.stderr, 'Adding indirect link: %s -> %s' % (name, reference)
-         #print >>sys.stderr, 'self.indirectlinks=%r' % self.indirectlinks
-         #print >>sys.stderr, 'self.explicitlinks=%r' % self.explicitlinks
          if self.explicitlinks.has_key(name):
-             #print >>sys.stderr, "already has explicit link"
              level = 0
              for t in self.explicitlinks.get(name, []):
--- 314,318 ----
***************
*** 322,326 ****
                      break
              sw = self.errorhandler.system_warning(
!                   level, 'duplicate indirect link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.explicitlinks, self.indirectlinks,
--- 321,325 ----
                      break
              sw = self.errorhandler.system_warning(
!                   level, 'Duplicate indirect link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.explicitlinks, self.indirectlinks,
***************
*** 329,333 ****
              print >>sys.stderr, "already has explicit link"
              sw = self.errorhandler.system_warning(
!                   0, 'duplicate implicit link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.implicitlinks)
--- 328,332 ----
              print >>sys.stderr, "already has explicit link"
              sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit link name: "%s"' % name)
              innode += sw
              self.clearlinknames(name, self.implicitlinks)