[damned-lies] Support for Mallard documents

[Frederic Peters <fpeters src gnome org>]

commit 1fc77069df51af41448798401169eedf2fa7f288
Author: Frédéric Péters <fpeters 0d be>
Date:   Tue Jul 28 09:04:05 2009 +0200

    Support for Mallard documents

 stats/utils.py |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)
---
diff --git a/stats/utils.py b/stats/utils.py
index 494dcd3..2358f5f 100644
--- a/stats/utils.py
+++ b/stats/utils.py
@@ -107,18 +107,29 @@ def generate_doc_pot_file(vcs_path, potbase, moduleid, verbose):
     """ Return the pot file for a document-type domain, and the error if any """
 
     errors = []
-    modulename = read_makefile_variable([vcs_path], "DOC_MODULE")
-    if not modulename:
-        return "", (("error", ugettext_noop("Module %s doesn't look like gnome-doc-utils module.") % moduleid),)
-    if not os.access(os.path.join(vcs_path, "C", modulename + ".xml"), os.R_OK):
-        if os.access(os.path.join(vcs_path, "C", moduleid + ".xml"), os.R_OK):
-            errors.append(("warn", ugettext_noop("DOC_MODULE doesn't resolve to a real file, using '%s.xml'.") % (moduleid)))
-            modulename = moduleid
-        else:
-            errors.append(("error", ugettext_noop("DOC_MODULE doesn't point to a real file, probably a macro.")))
-            return "", errors
+    if os.access(os.path.join(vcs_path, "C", "index.page"), os.R_OK):
+        # a Mallard document
+        files = os.path.join("C", "index.page")
+
+        pages = read_makefile_variable([vcs_path], "DOC_PAGES")
+        if pages:
+            for f in pages.split(" "):
+                if f.strip() != "":
+                    files += " %s" % (os.path.join("C", f.strip()))
+
+    else:
+        modulename = read_makefile_variable([vcs_path], "DOC_MODULE")
+        if not modulename:
+            return "", (("error", ugettext_noop("Module %s doesn't look like gnome-doc-utils module.") % moduleid),)
+        if not os.access(os.path.join(vcs_path, "C", modulename + ".xml"), os.R_OK):
+            if os.access(os.path.join(vcs_path, "C", moduleid + ".xml"), os.R_OK):
+                errors.append(("warn", ugettext_noop("DOC_MODULE doesn't resolve to a real file, using '%s.xml'.") % (moduleid)))
+                modulename = moduleid
+            else:
+                errors.append(("error", ugettext_noop("DOC_MODULE doesn't point to a real file, probably a macro.")))
+                return "", errors
+        files = os.path.join("C", modulename + ".xml")
 
-    files = os.path.join("C", modulename + ".xml")
     includes = read_makefile_variable([vcs_path], "DOC_INCLUDES")
     if includes:
         for f in includes.split(" "):