recollq and python module

src/query/recollq.cpp

@@ -16,7 +16,6 @@
  */
 // Takes a query and run it, no gui, results to stdout
 
-#ifndef TEST_RECOLLQ
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -416,17 +415,3 @@ endopts:
 
     return 0;
 }
-
-#else // TEST_RECOLLQ The test driver is actually the useful program...
-#include <stdlib.h>
-
-#include "rclconfig.h"
-#include "recollq.h"
-
-static RclConfig *rclconfig;
-
-int main(int argc, char **argv)
-{
-    return(recollq(&rclconfig, argc, argv));
-}
-#endif // TEST_RECOLLQ

src/query/recollqmain.cpp

@@ -0,0 +1,30 @@
+/* Copyright (C) 2006 J.F.Dockes
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+// Takes a query and run it, no gui, results to stdout
+#include "autoconfig.h"
+
+#include <stdlib.h>
+
+#include "rclconfig.h"
+#include "recollq.h"
+
+static RclConfig *rclconfig;
+
+int main(int argc, char **argv)
+{
+    return(recollq(&rclconfig, argc, argv));
+}