Ticket #234: xapian_omega_add_option_filter_defaultop.diff

query.cc

@@ -322 +322 @@
                     case 1:
                         filter_vec.push_back(Xapian::Query(or_vec[0]));
                         break;
-                    default:
-                        filter_vec.push_back(Xapian::Query(Xapian::Query::OP_OR,
+                    default: {
+                        Xapian::Query::op op = Xapian::Query::OP_OR;
+                        if (option[string("filter_defaultop,")+current] == "AND") op = Xapian::Query::OP_AND;
+                        filter_vec.push_back(Xapian::Query(op,
                                                      or_vec.begin(),
                                                      or_vec.end()));
                         break;
+                    }
                 }
                 or_vec.clear();
                 if (over) break;