Ticket #512: 2ORchanges.patch

File 2ORchanges.patch, 788 bytes (added by laserbled, 13 years ago)

These are 2 changes to change OR to AND operation.

  • .cc

    old new static void ensure_match();  
    104104
    105105static Xapian::Query query;
    106106//static string url_query_string;
    107 Xapian::Query::op default_op = Xapian::Query::OP_OR; // default matching mode
     107Xapian::Query::op default_op = Xapian::Query::OP_AND; // default matching mode
    108108
    109109static Xapian::QueryParser qp;
    110110static Xapian::NumberValueRangeProcessor * size_vrp = NULL;
    … … run_query()  
    401401                        filter_vec.push_back(Xapian::Query(or_vec[0]));
    402402                        break;
    403403                    default:
    404                         filter_vec.push_back(Xapian::Query(Xapian::Query::OP_OR,
     404                        filter_vec.push_back(Xapian::Query(Xapian::Query::OP_AND,
    405405                                                     or_vec.begin(),
    406406                                                     or_vec.end()));
    407407                        break;