Ticket #295: weightnames.patch

include/xapian/enquire.h

@@ -1122 +1122 @@
 
         /** Name of the weighting scheme.
          *
-         *  If the subclass is called FooWeight, this should return "Foo".
+         *  This should return the fully-namespaced name of the weighting
+         *  class, so if the subclass is called Xapian::FooWeight, this should
+         *  return "Xapian::FooWeight".
          */
         virtual std::string name() const = 0;
 

matcher/scaleweight.cc

@@ -33 +33 @@
 
 std::string
 ScaleWeight::name() const {
-    return "Scale";
+    return "Xapian::ScaleWeight";
 }
 
 std::string

matcher/tradweight.cc

@@ -40 +40 @@
     return new TradWeight(param_k);
 }
 
-string TradWeight::name() const { return "Trad"; }
+string TradWeight::name() const { return "Xapian::TradWeight"; }
 
 string TradWeight::serialise() const {
     return serialise_double(param_k);

matcher/bm25weight.cc

@@ -40 +40 @@
     return new BM25Weight(k1, k2, k3, b, min_normlen);
 }
 
-string BM25Weight::name() const { return "BM25"; }
+string BM25Weight::name() const { return "Xapian::BM25Weight"; }
 
 string BM25Weight::serialise() const {
     string result = serialise_double(k1);

matcher/weight.cc

@@ -55 +55 @@
 
 BoolWeight::~BoolWeight() { }
 
-std::string BoolWeight::name() const { return "Bool"; }
+std::string BoolWeight::name() const { return "Xapian::BoolWeight"; }
 
 std::string BoolWeight::serialise() const { return ""; }