From 8cb7a8b2c906f5d4d678cc58328a2018a19567d3 Mon Sep 17 00:00:00 2001
From: Fredrik Unger <fred@tree.se>
Date: Mon, 2 Apr 2012 21:41:54 +0200
Subject: [PATCH] Fixing the def main function, properly calling it from
 treecutter.

There are several ways to do this in python and it can be that
it has to be redone. seems to work for now.
---
 bin/treecutter     |  2 +-
 treecutter/main.py | 61 +++++++++++++++++++++++++---------------------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/bin/treecutter b/bin/treecutter
index d07d18a..5555cc4 100755
--- a/bin/treecutter
+++ b/bin/treecutter
@@ -2,4 +2,4 @@
 
 from treecutter import main
 
-#main.run()
+main.main()
diff --git a/treecutter/main.py b/treecutter/main.py
index ba09eaf..b53a92f 100644
--- a/treecutter/main.py
+++ b/treecutter/main.py
@@ -5,36 +5,41 @@ import argparse
 from treecutter.directory import Directory
 from treecutter.sitemap import Sitemap
 
-parser = argparse.ArgumentParser(description='Process docbook article tree.')
-parser.add_argument('--style', nargs='?',
-                    default=os.path.dirname(os.getcwd())+'/style/default/')
-parser.add_argument('--output', nargs='?',
-                    default=os.path.dirname(os.getcwd())+'/htdocs/')
-args = parser.parse_args()
+def main():
+    parser = argparse.ArgumentParser(description='Process docbook article tree.')
+    parser.add_argument('--style', nargs='?',
+                        default=os.path.dirname(os.getcwd())+'/style/default/')
+    parser.add_argument('--output', nargs='?',
+                        default=os.path.dirname(os.getcwd())+'/htdocs/')
+    args = parser.parse_args()
 
-ts = time.time()
-dir_ = Directory()
-sitemap = Sitemap()
+    ts = time.time()
+    dir_ = Directory()
+    sitemap = Sitemap()
 
-dir_.scan()
-sitemap.read_map()
+    dir_.scan()
+    sitemap.read_map()
 
-missing = dir_.set() - sitemap.set()
-removed = sitemap.set() - dir_.set()
-for page in removed:
-    print page+' pages missing!!'
-for page in missing:
-    print 'adding missing page '+page
-    sitemap.add_link(page)
-if len(missing)+len(removed) != 0:
-    print 'writing new sitemap - please adjust if needed'
-    sitemap.write_map()
-sitemap.graph()
+    missing = dir_.set() - sitemap.set()
+    removed = sitemap.set() - dir_.set()
+    for page in removed:
+        print page+' pages missing!!'
+    for page in missing:
+        print 'adding missing page '+page
+        sitemap.add_link(page)
+    if len(missing)+len(removed) != 0:
+        print 'writing new sitemap - please adjust if needed'
+        sitemap.write_map()
+    sitemap.graph()
 
-sitemap.process(args.style)
+    sitemap.process(args.style)
 
-t1 = time.time()
-sitemap.publish(args.output,args.style)
-t2 = time.time()
-print "Publish  [%5.2f s]" % (round(t2-t1,2))
-print "Total    [%5.2f s]" % (round(t2-ts,2))
+    t1 = time.time()
+    sitemap.publish(args.output,args.style)
+    t2 = time.time()
+    print "Publish  [%5.2f s]" % (round(t2-t1,2))
+    print "Total    [%5.2f s]" % (round(t2-ts,2))
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())
-- 
2.30.2