Skip to content

Commit

Permalink
Added display of Supersedes or Superseded by for Types
Browse files Browse the repository at this point in the history
Fix for (#1109)  emulates what already happens for Supersedes or Superseded by attributes
  • Loading branch information
Richard Wallis committed Apr 19, 2016
1 parent e45a3a3 commit 1c248e5
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions sdoapp.py
Expand Up @@ -181,6 +181,10 @@ def traverseForHTML(self, node, depth = 1, hashorslash="/", layers='core', buff=
"""Generate a hierarchical tree view of the types. hashorslash is used for relative link prefixing."""

log.debug("traverseForHTML: node=%s hashorslash=%s" % ( node.id, hashorslash ))

if node.superseded(layers=layers):
return False

localBuff = False
if buff == None:
localBuff = True
Expand Down Expand Up @@ -840,10 +844,6 @@ def emitAttributeProperties(self, node, layers="core", out=None, hashorslash="/"
domains = sorted(GetTargets(di, node, layers=layers), key=lambda u: u.id)
first_range = True

newerprop = node.supersededBy(layers=layers) # None of one. e.g. we're on 'seller'(new) page, we get 'vendor'(old)
olderprop = node.supersedes(layers=layers) # None or one
olderprops = sorted(node.supersedes_all(layers=layers),key=lambda u: u.id) # list, e.g. 'seller' has 'vendor', 'merchant'.

inverseprop = node.inverseproperty(layers=layers)
subprops = sorted(node.subproperties(layers=layers),key=lambda u: u.id)
superprops = sorted(node.superproperties(layers=layers),key=lambda u: u.id)
Expand Down Expand Up @@ -894,6 +894,15 @@ def emitAttributeProperties(self, node, layers="core", out=None, hashorslash="/"
tt = "%s: ''%s''" % ( spp.id, c)
out.write("\n <tr><td><code>%s</code></td></tr>\n" % (self.ml(spp, spp.id, tt,hashorslash)))
out.write("\n</table>\n\n")

self.emitSupersedes(node,layers=layers,out=out,hashorslash=hashorslash)

def emitSupersedes(self, node, layers="core", out=None, hashorslash="/"):
"""Write out Supersedes and/or Superseded by for this term"""

if not out:
out = self


# Supersedes
if (olderprops != None and len(olderprops) > 0):
Expand Down Expand Up @@ -1157,6 +1166,9 @@ def emitExactTermPage(self, node, layers="core"):
self.emitClassExtensionSuperclasses(node,layers)

self.emitClassExtensionProperties(p,layers)

self.emitSupersedes(node,layers=layers)


elif (Unit.isAttribute(node, layers=layers)):
self.write(self.moreInfoBlock(node))
Expand All @@ -1175,6 +1187,8 @@ def emitExactTermPage(self, node, layers="core"):

firstext=True
for c in children:
if c.superseded(layers=layers):
continue
if inLayer(layers, c):
buff.write("<li> %s </li>" % (self.ml(c)))
else:
Expand Down

0 comments on commit 1c248e5

Please sign in to comment.