r5444 - trunk/www/utils/webhelpers

[jcater]

Author: jcater
Date: 2004-03-21 12:25:16 -0600 (Sun, 21 Mar 2004)
New Revision: 5444

Modified:
   trunk/www/utils/webhelpers/twiki.py
Log:
minor tweaks for twiki

Modified: trunk/www/utils/webhelpers/twiki.py
===================================================================
--- trunk/www/utils/webhelpers/twiki.py 2004-03-21 18:25:05 UTC (rev 5443)
+++ trunk/www/utils/webhelpers/twiki.py 2004-03-21 18:25:16 UTC (rev 5444)
@@ -9,7 +9,12 @@
   os.system('mkdir -p %s' % TWIKI_BASE)
   for file in glob.glob('%s/www/misc/twiki/*.tmpl' % SVN_BASE):
     f = file.split('/')[-1]
-    os.system("""(echo '<?php $GEXEDIR="%s/www/web/shared/"; $BASEDIR=".."; 
?>'; cat %s ) |
-                  php4 -d include_path=%s/www/web/shared/ > %s"""% (
+
+    # NOTE: We put the grep in here to remove blank
+    #       (or all space) lines. twiki interprets thoses
+    #       as paragraphs (<p>'s) :(
+
+    os.system("""(echo '<?php $GEXEDIR="%s/www/web/"; $BASEDIR=""; ?>'; cat %s 
) |
+                  php4 -d include_path=%s/www/web/shared/ | grep -v '^[ 
\\t]*$' > %s"""% (
               SVN_BASE, file, SVN_BASE, os.path.join(TWIKI_BASE,f)))