other minor tweaks - doc generation should still be broken

[plcapi.git] / doc / DocBookLocal.py

diff --git a/doc/DocBookLocal.py b/doc/DocBookLocal.py
index f1624fd..2bed21a 100755 (executable)
--- a/doc/DocBookLocal.py
+++ b/doc/DocBookLocal.py
@@ -1,11 +1,27 @@
 #!/usr/bin/env python
 
 from PLC.API import PLCAPI
+from PLC.Faults import PLCInvalidAPIMethod
 from DocBook import DocBook
+import sys
 
-def api_methods():
-    api = PLCAPI(None)
-    methods = api.methods
-    return [api.callable(method) for method in methods]
+api = PLCAPI(None)
+methods = api.all_methods
+methods.sort()
+good_apis = []
+bad_apis = []
+for method in methods:
+    try:
+        good_api = api.callable(method)
+        good_apis.append(good_api)
+    except PLCInvalidAPIMethod as exc:
+        bad_apis.append((method, exc))
 
-DocBook(api_methods ()).Process()
+DocBook(good_apis).Process()
+
+if bad_apis:
+    sys.stderr.write("UNEXPECTED: There are %d non-callable methods:\n"
+                     % (len(bad_apis)))
+    for method, exc in bad_apis:
+        sys.stderr.write("\tmethod=<%s> exc=%s\n" % (method, exc))
+    sys.exit(-1)