projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
classifier: Remove unused functions cls_rule_moved(), cls_rule_replace().
[openvswitch]
/
ovsdb
/
ovsdb-doc.in
diff --git
a/ovsdb/ovsdb-doc.in
b/ovsdb/ovsdb-doc.in
index 4950e47e4ce90a1f3b199f0d46677dc377df2f3f..9e0a318d2b9fb41366cae87e4d77d0589029fa7d 100755
(executable)
--- a/
ovsdb/ovsdb-doc.in
+++ b/
ovsdb/ovsdb-doc.in
@@
-7,10
+7,9
@@
import re
import sys
import xml.dom.minidom
import sys
import xml.dom.minidom
-sys.path.insert(0, "@abs_top_srcdir@/ovsdb")
-import simplejson as json
-
-from OVSDB import *
+import ovs.json
+from ovs.db import error
+import ovs.db.schema
argv0 = sys.argv[0]
argv0 = sys.argv[0]
@@
-29,7
+28,7
@@
def textToNroff(s, font=r'\fR'):
elif c == "'":
return r'\(cq'
else:
elif c == "'":
return r'\(cq'
else:
- raise Error("bad escape")
+ raise
error.
Error("bad escape")
# Escape - \ " ' as needed by nroff.
s = re.sub('([-"\'\\\\])', escape, s)
# Escape - \ " ' as needed by nroff.
s = re.sub('([-"\'\\\\])', escape, s)
@@
-44,7
+43,7
@@
def inlineXmlToNroff(node, font):
if node.nodeType == node.TEXT_NODE:
return textToNroff(node.data, font)
elif node.nodeType == node.ELEMENT_NODE:
if node.nodeType == node.TEXT_NODE:
return textToNroff(node.data, font)
elif node.nodeType == node.ELEMENT_NODE:
- if node.tagName
== 'code' or node.tagName == 'em'
:
+ if node.tagName
in ['code', 'em', 'option']
:
s = r'\fB'
for child in node.childNodes:
s += inlineXmlToNroff(child, r'\fB')
s = r'\fB'
for child in node.childNodes:
s += inlineXmlToNroff(child, r'\fB')
@@
-58,7
+57,7
@@
def inlineXmlToNroff(node, font):
elif node.hasAttribute('group'):
s += node.attributes['group'].nodeValue
else:
elif node.hasAttribute('group'):
s += node.attributes['group'].nodeValue
else:
- raise Error("'ref' lacks column and table attributes")
+ raise
error.
Error("'ref' lacks column and table attributes")
return s + font
elif node.tagName == 'var':
s = r'\fI'
return s + font
elif node.tagName == 'var':
s = r'\fI'
@@
-66,9
+65,9
@@
def inlineXmlToNroff(node, font):
s += inlineXmlToNroff(child, r'\fI')
return s + font
else:
s += inlineXmlToNroff(child, r'\fI')
return s + font
else:
- raise Error("element <%s> unknown or invalid here" % node.tagName)
+ raise
error.
Error("element <%s> unknown or invalid here" % node.tagName)
else:
else:
- raise Error("unknown node %s in inline xml" % node)
+ raise
error.
Error("unknown node %s in inline xml" % node)
def blockXmlToNroff(nodes, para='.PP'):
s = ''
def blockXmlToNroff(nodes, para='.PP'):
s = ''
@@
-77,17
+76,23
@@
def blockXmlToNroff(nodes, para='.PP'):
s += textToNroff(node.data)
s = s.lstrip()
elif node.nodeType == node.ELEMENT_NODE:
s += textToNroff(node.data)
s = s.lstrip()
elif node.nodeType == node.ELEMENT_NODE:
- if node.tagName
== 'ul'
:
+ if node.tagName
in ['ul', 'ol']
:
if s != "":
s += "\n"
s += ".RS\n"
if s != "":
s += "\n"
s += ".RS\n"
+ i = 0
for liNode in node.childNodes:
if (liNode.nodeType == node.ELEMENT_NODE
and liNode.tagName == 'li'):
for liNode in node.childNodes:
if (liNode.nodeType == node.ELEMENT_NODE
and liNode.tagName == 'li'):
- s += ".IP \\(bu\n" + blockXmlToNroff(liNode.childNodes, ".IP")
+ i += 1
+ if node.tagName == 'ul':
+ s += ".IP \\bu\n"
+ else:
+ s += ".IP %d. .25in\n" % i
+ s += blockXmlToNroff(liNode.childNodes, ".IP")
elif (liNode.nodeType != node.TEXT_NODE
or not liNode.data.isspace()):
elif (liNode.nodeType != node.TEXT_NODE
or not liNode.data.isspace()):
- raise
Error("<ul> element may only have <li> children"
)
+ raise
error.Error("<%s> element may only have <li> children" % node.tagName
)
s += ".RE\n"
elif node.tagName == 'dl':
if s != "":
s += ".RE\n"
elif node.tagName == 'dl':
if s != "":
@@
-109,7
+114,7
@@
def blockXmlToNroff(nodes, para='.PP'):
prev = 'dd'
elif (liNode.nodeType != node.TEXT_NODE
or not liNode.data.isspace()):
prev = 'dd'
elif (liNode.nodeType != node.TEXT_NODE
or not liNode.data.isspace()):
- raise Error("<dl> element may only have <dt> and <dd> children")
+ raise
error.
Error("<dl> element may only have <dt> and <dd> children")
s += blockXmlToNroff(liNode.childNodes, ".IP")
s += ".RE\n"
elif node.tagName == 'p':
s += blockXmlToNroff(liNode.childNodes, ".IP")
s += ".RE\n"
elif node.tagName == 'p':
@@
-121,7
+126,7
@@
def blockXmlToNroff(nodes, para='.PP'):
else:
s += inlineXmlToNroff(node, r'\fR')
else:
else:
s += inlineXmlToNroff(node, r'\fR')
else:
- raise Error("unknown node %s in block xml" % node)
+ raise
error.
Error("unknown node %s in block xml" % node)
if s != "" and not s.endswith('\n'):
s += '\n'
return s
if s != "" and not s.endswith('\n'):
s += '\n'
return s
@@
-165,7
+170,7
@@
def columnGroupToNroff(table, groupXml):
body += '.ST "%s:"\n' % textToNroff(title)
body += subIntro + subBody
else:
body += '.ST "%s:"\n' % textToNroff(title)
body += subIntro + subBody
else:
- raise Error("unknown element %s in <table>" % node.tagName)
+ raise
error.
Error("unknown element %s in <table>" % node.tagName)
return summary, intro, body
def tableSummaryToNroff(summary, level=0):
return summary, intro, body
def tableSummaryToNroff(summary, level=0):
@@
-214,7
+219,7
@@
Column Type
return s
def docsToNroff(schemaFile, xmlFile, erFile, title=None):
return s
def docsToNroff(schemaFile, xmlFile, erFile, title=None):
- schema =
DbSchema.fromJson(json.load(open(schemaFile, "r")
))
+ schema =
ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schemaFile
))
doc = xml.dom.minidom.parse(xmlFile).documentElement
schemaDate = os.stat(schemaFile).st_mtime
doc = xml.dom.minidom.parse(xmlFile).documentElement
schemaDate = os.stat(schemaFile).st_mtime
@@
-352,7
+357,7
@@
if __name__ == "__main__":
if len(line):
print line
if len(line):
print line
- except Error, e:
+ except
error.
Error, e:
sys.stderr.write("%s: %s\n" % (argv0, e.msg))
sys.exit(1)
sys.stderr.write("%s: %s\n" % (argv0, e.msg))
sys.exit(1)