[tracker: 5/5] Merge branch 'fts-limits'

From: Jürg Billeter <juergbi src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker: 5/5] Merge branch 'fts-limits'
Date: Thu, 25 Feb 2010 14:08:02 +0000 (UTC)

commit 9679f5362322e83f2b27a60adc57e19ca35742b5
Merge: ec3e810 89d7f45
Author: JÃ¼rg Billeter <j bitron ch>
Date:   Thu Feb 25 15:06:17 2010 +0100

    Merge branch 'fts-limits'

 configure.ac                                   |    8 ++-
 data/ontologies/11-rdf.ontology                |    5 ++
 data/ontologies/30-nie.ontology                |    1 +
 data/ontologies/32-nco.ontology                |   13 ++++-
 data/ontologies/38-nmm.ontology                |    2 +
 src/libtracker-common/tracker-property.c       |   44 ++++++++++++++++-
 src/libtracker-common/tracker-property.h       |    3 +
 src/libtracker-data/tracker-data-manager.c     |   32 +++++++++++--
 src/libtracker-data/tracker-data-update.c      |    7 ++-
 src/libtracker-fts/tracker-fts.c               |   63 +++++++++++++----------
 src/libtracker-fts/tracker-fts.h               |    2 +-
 src/libtracker-fts/tracker-parser.c            |    9 +---
 src/libtracker-fts/tracker-parser.h            |    6 ++-
 tests/libtracker-fts/Makefile.am               |    4 ++
 tests/libtracker-fts/data.ontology             |    6 ++
 tests/libtracker-fts/limits/Makefile.am        |    8 +++
 tests/libtracker-fts/limits/fts3limits-1.out   |    5 ++
 tests/libtracker-fts/limits/fts3limits-1.rq    |    1 +
 tests/libtracker-fts/limits/fts3limits-2.rq    |    1 +
 tests/libtracker-fts/limits/fts3limits-3.out   |    7 +++
 tests/libtracker-fts/limits/fts3limits-3.rq    |    1 +
 tests/libtracker-fts/limits/fts3limits-4.rq    |    1 +
 tests/libtracker-fts/limits/fts3limits-data.rq |   13 +++++
 tests/libtracker-fts/prefix/Makefile.am        |    7 +++
 tests/libtracker-fts/prefix/fts3prefix-1.out   |    3 +
 tests/libtracker-fts/prefix/fts3prefix-1.rq    |    1 +
 tests/libtracker-fts/prefix/fts3prefix-2.out   |    5 ++
 tests/libtracker-fts/prefix/fts3prefix-2.rq    |    1 +
 tests/libtracker-fts/prefix/fts3prefix-3.out   |    7 +++
 tests/libtracker-fts/prefix/fts3prefix-3.rq    |    1 +
 tests/libtracker-fts/prefix/fts3prefix-data.rq |   13 +++++
 tests/libtracker-fts/tracker-fts-test.c        |    2 +
 32 files changed, 232 insertions(+), 50 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]