r4867 - in software/ui: . src

Enrico Zini enrico at alioth.debian.org
Sat Dec 8 20:07:47 UTC 2007


Author: enrico
Date: 2007-12-08 20:07:47 +0000 (Sat, 08 Dec 2007)
New Revision: 4867

Modified:
   software/ui/
   software/ui/configure.ac
   software/ui/src/Engine.cpp
Log:
Port to use the xapian index of apt-xapian-index


Property changes on: software/ui
___________________________________________________________________
Name: bzr:revision-info
   + timestamp: 2007-12-08 20:07:23.335000038 +0000
committer: enrico at enricozini.org
properties: 
	branch-nick: goplay

Name: bzr:file-ids
   + 
Name: bzr:revision-id:v3-single-software/ui
   + 108 enrico at enricozini.org-20071208200723-y4vsdj5bsmuf0uqa


Modified: software/ui/configure.ac
===================================================================
--- software/ui/configure.ac	2007-12-07 18:56:33 UTC (rev 4866)
+++ software/ui/configure.ac	2007-12-08 20:07:47 UTC (rev 4867)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(goplay, 0.1, [Miriam Ruiz <little_miry at yahoo.es>, Enrico Zini <enrico at debian.org>])
+AC_INIT(goplay, 0.2, [Miriam Ruiz <little_miry at yahoo.es>, Enrico Zini <enrico at debian.org>])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign])

Modified: software/ui/src/Engine.cpp
===================================================================
--- software/ui/src/Engine.cpp	2007-12-07 18:56:33 UTC (rev 4866)
+++ software/ui/src/Engine.cpp	2007-12-08 20:07:47 UTC (rev 4867)
@@ -57,7 +57,7 @@
 	vector<string> terms;
 	for (set<Tag>::const_iterator i = games.begin();
 			i != games.end(); ++i)
-		terms.push_back("T" + i->fullname());
+		terms.push_back("XT" + i->fullname());
 	return Xapian::Query(Xapian::Query::OP_OR, terms.begin(), terms.end());
 }
 
@@ -71,9 +71,9 @@
 	if (!m_filter_keywords.empty())
 		kwquery = m_textsearch.makePartialORQuery(m_filter_keywords);
 	if (m_filter_type.valid())
-		typequery = Xapian::Query("T"+m_filter_type.fullname());
+		typequery = Xapian::Query("XT"+m_filter_type.fullname());
 	if (m_filter_iface.valid())
-		ifacequery = Xapian::Query("T"+m_filter_iface.fullname());
+		ifacequery = Xapian::Query("XT"+m_filter_iface.fullname());
 		
 	if (kwquery.empty())
 		if (typequery.empty())
@@ -108,7 +108,7 @@
 
 	// We always want programs, so always AND it here
 	return Xapian::Query(Xapian::Query::OP_AND,
-						Xapian::Query("Trole::program"),
+						Xapian::Query("XTrole::program"),
 						query);
 }
 
@@ -230,7 +230,7 @@
 	Xapian::Enquire enquire(m_textsearch.db());
 	
 	// Retrieve the document for the given package
-	enquire.set_query(Xapian::Query("pkg:"+name));
+	enquire.set_query(Xapian::Query("XP"+name));
 	Xapian::MSet matches = enquire.get_mset(0, 1);
 	Xapian::MSetIterator mi = matches.begin();
 	if (mi == matches.end()) return std::vector<Result>();




More information about the Pkg-games-commits mailing list