indents

src/index/Makefile

@@ -1,18 +0,0 @@
-PROGS = subtreelist mimetype
-all: $(PROGS)
-
-SUBTREELIST_OBJS= subtreelist.o
-subtreelist : $(SUBTREELIST_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o subtreelist $(SUBTREELIST_OBJS) \
-	       $(LIBRECOLL)
-subtreelist.o : subtreelist.cpp 
-	$(CXX) $(ALL_CXXFLAGS) -DTEST_SUBTREELIST -c subtreelist.cpp
-
-MIMETYPE_OBJS= trmimetype.o
-mimetype : $(MIMETYPE_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o mimetype $(MIMETYPE_OBJS) $(LIBRECOLL)
-trmimetype.o : mimetype.cpp
-	$(CXX) $(ALL_CXXFLAGS) -DTEST_MIMETYPE -c -o trmimetype.o \
-	       mimetype.cpp
-
-include ../utils/utmkdefs.mk

src/index/indexer.cpp

@@ -432,4 +432,3 @@ vector<string> ConfIndexer::getStemmerNames()
 {
     return Rcl::Db::getStemmerNames();
 }
-

src/index/subtreelist.cpp

@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef TEST_SUBTREELIST
 #include "autoconfig.h"
 
 #include <memory>
@@ -33,7 +32,8 @@ bool subtreelist(RclConfig *config, const string& top,
     LOGDEB("subtreelist: top: ["  << (top) << "]\n" );
     Rcl::Db rcldb(config);
     if (!rcldb.open(Rcl::Db::DbRO)) {
-    LOGERR("subtreelist: can't open database in ["  << (config->getDbDir()) << "]: "  << (rcldb.getReason()) << "\n" );
+        LOGERR("subtreelist: can't open database in [" << config->getDbDir() <<
+               "]: " << rcldb.getReason() << "\n");
         return false;
     }
 
@@ -56,76 +56,3 @@ bool subtreelist(RclConfig *config, const string& top,
     }
     return true;
 }
-
-#else // TEST
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#include <iostream>
-#include <vector>
-#include <string>
-using namespace std;
-
-#include "subtreelist.h"
-#include "rclconfig.h"
-#include "rclinit.h"
-
-static char *thisprog;
-static char usage [] =
-" <path> : list document paths in this tree\n"
-;
-static void
-Usage(void)
-{
-    cerr << thisprog <<  ": usage:" << endl << usage;
-    exit(1);
-}
-
-static int     op_flags;
-#define OPT_o     0x2 
-
-int main(int argc, char **argv)
-{
-    string top;
-
-    thisprog = argv[0];
-    argc--; argv++;
-
-    while (argc > 0 && **argv == '-') {
-        (*argv)++;
-        if (!(**argv))
-            /* Cas du "adb - core" */
-            Usage();
-        while (**argv)
-            switch (*(*argv)++) {
-            default: Usage();   break;
-            }
-    argc--; argv++;
-    }
-    if (argc < 1)
-    Usage();
-    top = *argv++;argc--;
-    string reason;
-    RclConfig *config = recollinit(0, 0, 0, reason, 0);
-    if (!config || !config->ok()) {
-    fprintf(stderr, "Recoll init failed: %s\n", reason.c_str());
-    exit(1);
-    }
-
-    vector<string> paths;
-    if (!subtreelist(config, top, paths)) {
-    cerr << "subtreelist failed" << endl;
-    exit(1);
-    }
-    for (vector<string>::const_iterator it = paths.begin(); 
-     it != paths.end(); it++) {
-    cout << *it << endl;
-    }
-    exit(0);
-}
-#endif
-

src/testmains/trsubtreelist.cpp

@@ -0,0 +1,64 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+
+#include <iostream>
+#include <vector>
+#include <string>
+using namespace std;
+
+#include "subtreelist.h"
+#include "rclconfig.h"
+#include "rclinit.h"
+
+static char *thisprog;
+static char usage [] = " <path> : list document paths in this tree\n";
+static void Usage(void)
+{
+    std::cerr << thisprog <<  ": usage:" << endl << usage;
+    exit(1);
+}
+
+static int     op_flags;
+#define OPT_o     0x2 
+
+int main(int argc, char **argv)
+{
+    string top;
+
+    thisprog = argv[0];
+    argc--; argv++;
+
+    while (argc > 0 && **argv == '-') {
+        (*argv)++;
+        if (!(**argv))
+            /* Cas du "adb - core" */
+            Usage();
+        while (**argv)
+            switch (*(*argv)++) {
+            default: Usage();   break;
+            }
+        argc--; argv++;
+    }
+    if (argc < 1)
+        Usage();
+    top = *argv++;argc--;
+    string reason;
+    RclConfig *config = recollinit(0, 0, 0, reason, 0);
+    if (!config || !config->ok()) {
+        fprintf(stderr, "Recoll init failed: %s\n", reason.c_str());
+        exit(1);
+    }
+
+    vector<string> paths;
+    if (!subtreelist(config, top, paths)) {
+        cerr << "subtreelist failed" << endl;
+        exit(1);
+    }
+    for (vector<string>::const_iterator it = paths.begin(); 
+         it != paths.end(); it++) {
+        cout << *it << endl;
+    }
+    exit(0);
+}