# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1275951573 -7200
# Node ID 76eca0704c6b01c005284bed8be14082e58ca09e
# Parent  79d05f365e2bddabdb13310944c12b509440c5a7
Changed the moinsetup.py script to require a method argument.
Added a regular expression for parsing CSS imports.
Added some notes about Xapian.

diff -r 79d05f365e2b -r 76eca0704c6b TO_DO.txt
--- a/TO_DO.txt	Mon Jun 07 01:18:35 2010 +0200
+++ b/TO_DO.txt	Tue Jun 08 00:59:33 2010 +0200
@@ -1,8 +1,14 @@
+Perhaps switch to a configuration file for all the parameters.
 Avoid reconfiguration of existing moin script.
 Site directory detection.
 Enabled/available site listings.
 HTTP user integration and Apache user/group file editing.
-Support Xapian search.
+Support Xapian search and configuration.
+  xapian_search = 1
+  sudo -u www-data moin/bin/moin --config-dir=hgwiki/conf/ --wiki-url=http://localhost/hgwiki/ index build --mode=rebuild
+  Perhaps configure and install Xapian plus bindings.
+  ./configure --prefix={$moin-prefix} && make && make install
+  ./configure --with-python --prefix={$moin-prefix} XAPIAN_CONFIG={$moin-prefix}/bin/xapian-config PYTHON_LIB={$moin-prefix}/lib/python2.5/site-packages && make && make install
 Support OpenID and other authentication methods.
   Remember anonymous_session_lifetime for 1.8.x and cookie_lifetime for 1.9.x.
 Support integration of additional theme material with themes.
diff -r 79d05f365e2b -r 76eca0704c6b moinsetup.py
--- a/moinsetup.py	Mon Jun 07 01:18:35 2010 +0200
+++ b/moinsetup.py	Tue Jun 08 00:59:33 2010 +0200
@@ -19,6 +19,8 @@
 moin_cgi_fix_script_name = compile_definition("fix_script_name")
 moin_cgi_force_cgi       = re.compile("^#(os.environ\['FCGI_FORCE_CGI'\].*)$", re.MULTILINE)
 
+css_import_stylesheet    = re.compile("^(\s*@import\s+[\"'])(.*?)([\"'].*)$", re.MULTILINE)
+
 # Templates for Apache site definitions.
 
 apache_site = """
@@ -705,7 +707,7 @@
 
 # Command line option syntax.
 
-syntax_description = "<argument> ... [ --method=METHOD [ <method-argument> ... ] ]"
+syntax_description = "<argument> ... --method=METHOD [ <method-argument> ... ]"
 
 # Main program.