From owner-svn-soc-all@FreeBSD.ORG Mon Jul 8 01:22:57 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8006FCA9 for ; Mon, 8 Jul 2013 01:22:57 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) by mx1.freebsd.org (Postfix) with ESMTP id 715101F17 for ; Mon, 8 Jul 2013 01:22:57 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r681Mvwf070314 for ; Mon, 8 Jul 2013 01:22:57 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r681MvrI070305 for svn-soc-all@FreeBSD.org; Mon, 8 Jul 2013 01:22:57 GMT (envelope-from mattbw@FreeBSD.org) Date: Mon, 8 Jul 2013 01:22:57 GMT Message-Id: <201307080122.r681MvrI070305@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r254393 - soc2013/mattbw/backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jul 2013 01:22:57 -0000 Author: mattbw Date: Mon Jul 8 01:22:56 2013 New Revision: 254393 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254393 Log: eventual filters support Modified: soc2013/mattbw/backend/pk-backend-pkgng.c soc2013/mattbw/backend/query.c Modified: soc2013/mattbw/backend/pk-backend-pkgng.c ============================================================================== --- soc2013/mattbw/backend/pk-backend-pkgng.c Mon Jul 8 01:06:44 2013 (r254392) +++ soc2013/mattbw/backend/pk-backend-pkgng.c Mon Jul 8 01:22:56 2013 (r254393) @@ -115,6 +115,7 @@ /* TODO: support more filters */ return pk_bitfield_from_enums(PK_FILTER_ENUM_INSTALLED, + PK_FILTER_ENUM_NOT_INSTALLED, -1); } Modified: soc2013/mattbw/backend/query.c ============================================================================== --- soc2013/mattbw/backend/query.c Mon Jul 8 01:06:44 2013 (r254392) +++ soc2013/mattbw/backend/query.c Mon Jul 8 01:22:56 2013 (r254393) @@ -77,6 +77,7 @@ gboolean try_local; gboolean try_remote; int match; + PkBitfield filters; const char *name; gchar *match_id; struct pkg *match_pkg; @@ -102,6 +103,13 @@ try_remote = (q->local_repo == FALSE); } + /* Apply filters, if any */ + filters = pk_backend_get_uint(q->backend, "filters"); + if (pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED)) + try_remote = FALSE; + if (pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED)) + try_local = FALSE; + /* Try a local search first, if applicable. */ it = (try_local ? pkgdb_query(db, name, match) : NULL); if (it != NULL)