Switch to unified view

a/src/rcldb/searchdata.cpp b/src/rcldb/searchdata.cpp
...
...
257
    pvpath.push_back(pathelt_prefix);
257
    pvpath.push_back(pathelt_prefix);
258
    for (vector<string>::const_iterator it = vpath.begin(); 
258
    for (vector<string>::const_iterator it = vpath.begin(); 
259
         it != vpath.end(); it++){
259
         it != vpath.end(); it++){
260
        pvpath.push_back(pathelt_prefix + *it);
260
        pvpath.push_back(pathelt_prefix + *it);
261
    }
261
    }
262
  xq = Xapian::Query(m_topdirexcl ? 
262
    xq = Xapian::Query(Xapian::Query::OP_FILTER, xq, 
263
             Xapian::Query::OP_AND_NOT:Xapian::Query::OP_FILTER, 
263
               Xapian::Query(Xapian::Query::OP_PHRASE, 
264
               xq, Xapian::Query(Xapian::Query::OP_PHRASE, 
264
                     pvpath.begin(), pvpath.end()));
265
                         pvpath.begin(), pvpath.end()));
265
    }
266
    }
266
267
267
    *((Xapian::Query *)d) = xq;
268
    *((Xapian::Query *)d) = xq;
268
    return true;
269
    return true;
269
}
270
}
...
...
353
    for (qlist_it_t it = m_query.begin(); it != m_query.end(); it++)
354
    for (qlist_it_t it = m_query.begin(); it != m_query.end(); it++)
354
    delete *it;
355
    delete *it;
355
    m_query.clear();
356
    m_query.clear();
356
    m_filetypes.clear();
357
    m_filetypes.clear();
357
    m_topdir.erase();
358
    m_topdir.erase();
359
    m_topdirexcl = false;
358
    m_description.erase();
360
    m_description.erase();
359
    m_reason.erase();
361
    m_reason.erase();
360
    m_haveDates = false;
362
    m_haveDates = false;
361
}
363
}
362
364