Context Navigation

Ticket #350: 0001-Add-set_max_wildcard_expansion-method-to-the-queryp2.patch

File 0001-Add-set_max_wildcard_expansion-method-to-the-queryp2.patch, 4.1 KB (added by Adam Sjøgren, 16 years ago)
Patch to add set_max_wildcard_expansion() to the QueryParser

diff --git a/search-xapian/XS/QueryParser.xs b/search-xapian/XS/QueryParser.xs
index 3bec548..fbc9ca9 100644

                QueryParser::set_database(database)
     CODE:
         THIS->set_database(*database);
+void
+QueryParser::set_max_wildcard_expansion(max)
+    termcount max
+    CODE:
+        THIS->set_max_wildcard_expansion(max);
 Query *
 QueryParser::parse_query(q, flags = 7)
     string q

diff --git a/search-xapian/Xapian/QueryParser.pm b/search-xapian/Xapian/QueryParser.pm
index f48a12e..3778be3 100644

                prefix	The term prefix to map this to
 Returns a string describing this object.
+=item set_max_wildcard_expansion <max>
+If the queryparser expands a wildcard to more than max terms, an
+exception will be thrown.
+=cut
 =back
 =head1 REFERENCE

diff --git a/xapian-core/include/xapian/queryparser.h b/xapian-core/include/xapian/queryparser.h
index b03a295..1c79b27 100644

                class XAPIAN_VISIBILITY_DEFAULT QueryParser {
     /// Specify the database being searched.
     void set_database(const Database &db);
+    /// Specify the maximum expansion of a wildcard term.
+    void set_max_wildcard_expansion(Xapian::termcount);
     /** Parse a query.
+     *
      *  @param query_string  A free-text query as entered by a user

diff --git a/xapian-core/queryparser/queryparser.cc b/xapian-core/queryparser/queryparser.cc
index 9d9f2df..684733d 100644

                QueryParser::set_database(const Database &db) {
     internal->db = db;
+}
+void
+QueryParser::set_max_wildcard_expansion(Xapian::termcount max)
+{
+    internal->max_wildcard_expansion = max;
+}
 Query
 QueryParser::parse_query(const string &query_string, unsigned flags,
                          const string &default_prefix)

diff --git a/xapian-core/queryparser/queryparser.lemony b/xapian-core/queryparser/queryparser.lemony
index b6dc261..328f63f 100644

                class State {
     Database get_database() const {
         return qpi->db;
+    }
+    Xapian::termcount get_max_wildcard_expansion() {
+        return qpi->max_wildcard_expansion;
+    }
 };
 string
-…
+               Term::as_wildcarded_query(State * state_) const
     Database db = state_->get_database();
     vector<Query> subqs;
     list<string>::const_iterator piter;
+    long expansion_count = 0;
+    Xapian::termcount max = state_->get_max_wildcard_expansion();
     for (piter = prefixes.begin(); piter != prefixes.end(); ++piter) {
         string root = *piter;
         root += name;
-…
+               Term::as_wildcarded_query(State * state_) const
         while (t != db.allterms_end(root)) {
             subqs.push_back(Query(*t, 1, pos));
             ++t;
+            if (max != 0 && ++expansion_count > max) {
+                throw Xapian::QueryParserError("Wildcard "+unstemmed+"* expands too much");
+            }
+        }
+    }
     delete this;

diff --git a/xapian-core/queryparser/queryparser_internal.h b/xapian-core/queryparser/queryparser_internal.h
index 88cbb8f..439f583 100644

                class QueryParser::Internal : public Xapian::Internal::RefCntBase {
     string corrected_query;
+    Xapian::termcount max_wildcard_expansion;
     void add_prefix(const string &field, const string &prefix, bool filter);
     std::string parse_term(Utf8Iterator &it, const Utf8Iterator &end,
-…
+               class QueryParser::Internal : public Xapian::Internal::RefCntBase {
   public:
     Internal() : stem_action(STEM_NONE), stopper(NULL),
         default_op(Query::OP_OR), errmsg(NULL) { }
+        default_op(Query::OP_OR), errmsg(NULL) { max_wildcard_expansion=0; }
     Query parse_query(const string & query_string, unsigned int flags, const string & default_prefix);
 };