Switch to unified view

a/src/rcldb/searchdata.cpp b/src/rcldb/searchdata.cpp
1
#ifndef lint
1
#ifndef lint
2
static char rcsid[] = "@(#$Id: searchdata.cpp,v 1.31 2008-12-19 09:44:39 dockes Exp $ (C) 2006 J.F.Dockes";
2
static char rcsid[] = "@(#$Id: searchdata.cpp,v 1.32 2008-12-19 09:55:36 dockes Exp $ (C) 2006 J.F.Dockes";
3
#endif
3
#endif
4
/*
4
/*
5
 *   This program is free software; you can redistribute it and/or modify
5
 *   This program is free software; you can redistribute it and/or modify
6
 *   it under the terms of the GNU General Public License as published by
6
 *   it under the terms of the GNU General Public License as published by
7
 *   the Free Software Foundation; either version 2 of the License, or
7
 *   the Free Software Foundation; either version 2 of the License, or
...
...
98
    // Add the file type filtering clause if any
98
    // Add the file type filtering clause if any
99
    if (!m_filetypes.empty()) {
99
    if (!m_filetypes.empty()) {
100
    vector<string> exptps;
100
    vector<string> exptps;
101
    exptps.reserve(m_filetypes.size());
101
    exptps.reserve(m_filetypes.size());
102
    // Expand categories
102
    // Expand categories
103
  RclConfig *cfg = RclConfig::getMainConfig();
103
  RclConfig *cfg = db.getConf();
104
    for (vector<string>::iterator it = m_filetypes.begin(); 
104
    for (vector<string>::iterator it = m_filetypes.begin(); 
105
         it != m_filetypes.end(); it++) {
105
         it != m_filetypes.end(); it++) {
106
        if (cfg && cfg->isMimeCategory(*it)) {
106
        if (cfg && cfg->isMimeCategory(*it)) {
107
        list<string>tps;
107
        list<string>tps;
108
        cfg->getMimeCatTypes(*it, tps);
108
        cfg->getMimeCatTypes(*it, tps);