Switch to unified view

a/src/rcldb/rcldb.h b/src/rcldb/rcldb.h
...
...
324
     * @param result is the main output
324
     * @param result is the main output
325
     * @param max defines the maximum result count
325
     * @param max defines the maximum result count
326
     * @param field if set, defines the field within with the expansion should
326
     * @param field if set, defines the field within with the expansion should
327
     *        be performed. Only used for wildcards and regexps, stemming is
327
     *        be performed. Only used for wildcards and regexps, stemming is
328
     *        always global. If this is set, the resulting output terms 
328
     *        always global. If this is set, the resulting output terms 
329
     *        will be appropriately prefix and the prefix value will be set 
329
     *        will be appropriately prefixed and the prefix value will be set 
330
     *        in the TermMatchResult header
330
     *        in the TermMatchResult header
331
     */
331
     */
332
    enum MatchType {ET_NONE=0, ET_WILD=1, ET_REGEXP=2, ET_STEM=3, 
332
    enum MatchType {ET_NONE=0, ET_WILD=1, ET_REGEXP=2, ET_STEM=3, 
333
            ET_DIACSENS=8, ET_CASESENS=16};
333
            ET_DIACSENS=8, ET_CASESENS=16};
334
    int matchTypeTp(int tp) 
334
    int matchTypeTp(int tp) 
...
...
438
438
439
    // Internal form of close, can be called during destruction
439
    // Internal form of close, can be called during destruction
440
    bool i_close(bool final);
440
    bool i_close(bool final);
441
    // Reinitialize when adding/removing additional dbs
441
    // Reinitialize when adding/removing additional dbs
442
    bool adjustdbs(); 
442
    bool adjustdbs(); 
443
#ifdef RCL_INDEX_STRIPCHARS
444
    bool stemExpand(const string &lang, const string &s, 
445
          TermMatchResult& result);
446
#endif
447
    bool idxTermMatch(int typ_sens, const string &lang, const string &term, 
443
    bool idxTermMatch(int typ_sens, const string &lang, const string &term, 
448
              TermMatchResult& result, int max = -1, 
444
              TermMatchResult& result, int max = -1, 
449
              const string& field = cstr_null);
445
              const string& field = cstr_null);
450
446
451
    // Flush when idxflushmb is reached
447
    // Flush when idxflushmb is reached
...
...
463
459
464
extern const string pathelt_prefix;
460
extern const string pathelt_prefix;
465
extern const string udi_prefix;
461
extern const string udi_prefix;
466
extern const string parent_prefix;
462
extern const string parent_prefix;
467
extern const string mimetype_prefix;
463
extern const string mimetype_prefix;
464
extern const string unsplitFilenameFieldName;
468
#ifdef RCL_INDEX_STRIPCHARS
465
#ifdef RCL_INDEX_STRIPCHARS
469
extern const string start_of_field_term;
466
extern const string start_of_field_term;
470
extern const string end_of_field_term;
467
extern const string end_of_field_term;
471
#else
468
#else
472
extern string start_of_field_term;
469
extern string start_of_field_term;