r3262 - software/ui/src

[Enrico Zini]

Author: enrico
Date: 2007-07-06 20:57:17 +0000 (Fri, 06 Jul 2007)
New Revision: 3262

Modified:
   software/ui/src/Engine.cpp
Log:
Support search-as-you-type from new libept

Modified: software/ui/src/Engine.cpp
===================================================================
--- software/ui/src/Engine.cpp	2007-07-06 20:49:56 UTC (rev 3261)
+++ software/ui/src/Engine.cpp	2007-07-06 20:57:17 UTC (rev 3262)
@@ -44,7 +44,7 @@
 	Xapian::Query ifacequery;
 
 	if (!m_filter_keywords.empty())
-		kwquery = m_textsearch.makeORQuery(m_filter_keywords);
+		kwquery = m_textsearch.makePartialORQuery(m_filter_keywords);
 	if (m_filter_type.valid())
 		typequery = Xapian::Query("T"+m_filter_type.fullname());
 	if (m_filter_iface.valid())
@@ -95,12 +95,12 @@
 	m_interfaces.clear();
 	m_res_max = 0;
 
-	cerr << "Engine recompute:" << endl;
+	//cerr << "Engine recompute:" << endl;
 
 	// Compute the types
 	if (m_filter_type.valid())
 	{
-		cerr << "  filter type: " << m_filter_type.fullname() << endl;
+		//cerr << "  filter type: " << m_filter_type.fullname() << endl;
 		Tag tmp = m_filter_type;
 		m_filter_type = Tag();
 		Xapian::Enquire enquire(m_textsearch.db());
@@ -119,13 +119,13 @@
 		}
 		m_filter_type = tmp;
 	} else {
-		cerr << "  no filter type" << endl;
+		//cerr << "  no filter type" << endl;
 	}
 
 	// Compute the interfaces
 	if (m_filter_iface.valid())
 	{
-		cerr << "  filter iface: " << m_filter_iface.fullname() << endl;
+		//cerr << "  filter iface: " << m_filter_iface.fullname() << endl;
 		Tag tmp = m_filter_iface;
 		m_filter_iface = Tag();
 		Xapian::Enquire enquire(m_textsearch.db());
@@ -144,14 +144,14 @@
 		}
 		m_filter_iface = tmp;
 	} else {
-		cerr << "  no filter iface" << endl;
+		//cerr << "  no filter iface" << endl;
 	}
 
 	Xapian::Enquire enquire(m_textsearch.db());
 	// We always want programs, so always AND it here
 	enquire.set_query(makeQuery());
 
-	cerr << "  filter query: " << enquire.get_query().get_description() << endl;
+	//cerr << "  filter query: " << enquire.get_query().get_description() << endl;
 
 	// Get the 100 top matches
 	Xapian::MSet matches = enquire.get_mset(0, 100);