Switch to unified view

a/src/rcldb/rcldb.cpp b/src/rcldb/rcldb.cpp
1
#ifndef lint
1
#ifndef lint
2
static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.37 2005-11-16 17:29:38 dockes Exp $ (C) 2004 J.F.Dockes";
2
static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.38 2005-11-17 17:36:06 dockes Exp $ (C) 2004 J.F.Dockes";
3
#endif
3
#endif
4
#include <stdio.h>
4
#include <stdio.h>
5
#include <sys/stat.h>
5
#include <sys/stat.h>
6
6
7
#include <iostream>
7
#include <iostream>
...
...
917
        string term = "T" + *it;
917
        string term = "T" + *it;
918
        LOGDEB(("Adding file type term: [%s]\n", term.c_str()));
918
        LOGDEB(("Adding file type term: [%s]\n", term.c_str()));
919
        tq = tq.empty() ? Xapian::Query(term) : 
919
        tq = tq.empty() ? Xapian::Query(term) : 
920
        Xapian::Query(Xapian::Query::OP_OR, tq, Xapian::Query(term));
920
        Xapian::Query(Xapian::Query::OP_OR, tq, Xapian::Query(term));
921
    }
921
    }
922
    xq = xq.empty() ? tq : Xapian::Query(Xapian::Query::OP_AND, xq, tq);
922
    xq = xq.empty() ? tq : Xapian::Query(Xapian::Query::OP_FILTER, xq, tq);
923
    }
923
    }
924
924
925
    ndb->query = xq;
925
    ndb->query = xq;
926
    delete ndb->enquire;
926
    delete ndb->enquire;
927
    ndb->enquire = new Xapian::Enquire(ndb->db);
927
    ndb->enquire = new Xapian::Enquire(ndb->db);