Switch to unified view

a/src/common/rclconfig.cpp b/src/common/rclconfig.cpp
...
...
49
#include "readfile.h"
49
#include "readfile.h"
50
#include "fstreewalk.h"
50
#include "fstreewalk.h"
51
51
52
// Static, logically const, RclConfig members are initialized once from the
52
// Static, logically const, RclConfig members are initialized once from the
53
// first object build during process initialization.
53
// first object build during process initialization.
54
#ifndef RCL_INDEX_STRIPCHARS
54
55
// We default to a case- and diacritics-less index for now
55
// We default to a case- and diacritics-less index for now
56
bool o_index_stripchars = true;
56
bool o_index_stripchars = true;
57
#endif
57
58
string RclConfig::o_localecharset; 
58
string RclConfig::o_localecharset; 
59
59
60
bool ParamStale::needrecompute()
60
bool ParamStale::needrecompute()
61
{
61
{
62
    LOGDEB2(("ParamStale:: needrecompute. parent gen %d mine %d\n", 
62
    LOGDEB2(("ParamStale:: needrecompute. parent gen %d mine %d\n", 
...
...
136
        return;
136
        return;
137
    }
137
    }
138
    } else {
138
    } else {
139
    const char *cp = getenv("RECOLL_CONFDIR");
139
    const char *cp = getenv("RECOLL_CONFDIR");
140
    if (cp) {
140
    if (cp) {
141
        m_confdir = cp;
141
        m_confdir = path_canon(cp);
142
    } else {
142
    } else {
143
        autoconfdir = true;
143
        autoconfdir = true;
144
        m_confdir = path_cat(path_home(), ".recoll/");
144
        m_confdir = path_cat(path_home(), ".recoll/");
145
    }
145
    }
146
    }
146
    }
...
...
272
    if (getConfParam("skippedPathsFnmPathname", &fnmpathname)
272
    if (getConfParam("skippedPathsFnmPathname", &fnmpathname)
273
    && fnmpathname == false) {
273
    && fnmpathname == false) {
274
    FsTreeWalker::setNoFnmPathname();
274
    FsTreeWalker::setNoFnmPathname();
275
    }
275
    }
276
276
277
#ifndef RCL_INDEX_STRIPCHARS
278
    static int m_index_stripchars_init = 0;
277
    static int m_index_stripchars_init = 0;
279
    if (!m_index_stripchars_init) {
278
    if (!m_index_stripchars_init) {
280
    getConfParam("indexStripChars", &o_index_stripchars);
279
    getConfParam("indexStripChars", &o_index_stripchars);
281
    m_index_stripchars_init = 1;
280
    m_index_stripchars_init = 1;
282
    }
281
    }
283
#endif
284
282
285
    return true;
283
    return true;
286
}
284
}
287
285
288
ConfNull *RclConfig::cloneMainConfig()
286
ConfNull *RclConfig::cloneMainConfig()