Fixing regexp to treat /xx special.

[treecutter.git] / src / tree-cutter.py

diff --git a/src/tree-cutter.py b/src/tree-cutter.py
index 37ee80134b4a90f6a2ca3646479eff84e2faf170..79bd372aee24cbfa0e54495d56a1b02a66da3b8a 100755 (executable)
--- a/src/tree-cutter.py
+++ b/src/tree-cutter.py
@@ -36,7 +36,7 @@ def mkdir_p(path):
         else: raise
 
 def publish(src,target):
-    cmd = ["rsync","-a",src,target]
+    cmd = ["rsync","-a","--delete",src,target]
     retcode = subprocess.call(cmd)
     if retcode:
         print 'Error: '+' '.join(cmd)+' Returncode ['+str(retcode)+']'
@@ -51,6 +51,7 @@ def generateSitemap():
       sitemap.append(dict(link=f))
   except IOError, what_error:
     print 'Sitemap missing - generating one.'
+
   for dirname, dirnames, filenames in os.walk('.'):
     for filename in filenames:
       if fnmatch.fnmatch(filename, '*.xml'):
@@ -74,7 +75,7 @@ def generateSitemap():
           found = 0
           base = xfile.split('.')[1]
           link = base.replace('index','')
-          level = len(filter(None,re.split(r'(/\w*/)',link)))
+          level = len(filter(None,re.split(r'(^/\w*/|\w*/)',link)))
           res = []
           for r in resource:
               rf = os.path.join(dirname,r.href)