[tracker/libtracker-miner: 258/263] Merge branch 'master' into libtracker-miner
- From: Carlos Garnacho <carlosg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/libtracker-miner: 258/263] Merge branch 'master' into libtracker-miner
- Date: Fri, 4 Sep 2009 09:45:01 +0000 (UTC)
commit 087c55a8a6c4d08fa57389953b21aee2814668ba
Merge: 6cddca2... e40100b...
Author: Carlos Garnacho <carlos lanedo com>
Date: Thu Sep 3 16:55:01 2009 +0200
Merge branch 'master' into libtracker-miner
Conflicts:
data/dbus/org.freedesktop.Tracker.Miner.Files.service.in
data/dbus/tracker-miner.xml
src/Makefile.am
src/libtracker-common/Makefile.am
src/libtracker-common/tracker-module-config.c
src/libtracker-common/tracker-module-config.h
src/tracker-miner-fs/Makefile.am
src/tracker-miner-fs/modules/evolution-imap.c
src/tracker-miner-fs/modules/evolution-pop.c
src/tracker-miner-fs/tracker-crawler.c
src/tracker-miner-fs/tracker-indexer.c
src/tracker-miner-fs/tracker-main.c
src/tracker-miner-fs/tracker-miner-applications.c
src/tracker-miner-fs/tracker-miner.h
src/tracker-utils/tracker-status.c
configure.ac | 51 +-
.../org.freedesktop.Tracker.Extract.service.in | 2 +-
.../org.freedesktop.Tracker.Miner.Files.service.in | 2 +-
data/dbus/org.freedesktop.Tracker.service.in | 2 +-
data/dbus/tracker-backup.xml | 8 +-
data/dbus/tracker-extract.xml | 13 +-
data/dbus/tracker-miner.xml | 2 +-
data/dbus/tracker-resources-class.xml | 3 +-
data/dbus/tracker-resources.xml | 4 +-
data/dbus/tracker-statistics.xml | 2 +-
data/ontologies/11-rdf.ontology | 2 +-
data/ontologies/20-dc.ontology | 2 -
data/ontologies/30-nie.ontology | 5 +-
data/ontologies/31-nao.ontology | 3 +-
data/ontologies/32-nco.ontology | 3 +
data/ontologies/33-nfo.ontology | 10 -
data/ontologies/34-nmo.ontology | 20 +-
data/ontologies/36-scal.ontology | 242 ++
data/ontologies/38-nmm.ontology | 15 +-
data/ontologies/39-mto.ontology | 12 +
data/ontologies/41-mfo.ontology | 186 ++
data/ontologies/90-tracker.ontology | 7 +-
data/ontologies/Makefile.am | 2 +
docs/manpages/tracker-store.1 | 14 +
.../libtracker-common-sections.txt | 4 -
po/POTFILES.in | 1 +
po/POTFILES.skip | 2 -
po/de.po | 347 +--
po/es.po | 155 +-
po/gl.po | 1644 ++++++-----
po/hu.po | 635 ++--
po/sv.po | 705 +++--
python/Makefile.am | 2 +-
python/deskbar-handler/tracker-handler.py | 10 +-
python/deskbar-handler/tracker-module.py | 16 +-
python/gtk-sparql/Completion.py | 285 ++
python/gtk-sparql/Makefile.am | 8 +
python/gtk-sparql/gtk-sparql.py | 213 ++
python/gtk-sparql/gtk-sparql.ui | 201 ++
python/gtk-sparql/store.py | 68 +
python/gtk-sparql/tracker_completion.py | 123 +
src/Makefile.am | 6 +-
src/libstemmer/Makefile.am | 5 +-
src/libstemmer/header.h | 4 +-
src/libtracker-common/.gitignore | 1 +
src/libtracker-common/COPYING.LIB | 510 ++++
src/libtracker-common/Makefile.am | 23 +-
src/libtracker-common/libtracker-common.vapi | 8 +-
src/libtracker-common/posix.vapi | 10 +-
src/libtracker-common/tracker-class.c | 8 +-
src/libtracker-common/tracker-class.h | 8 +-
src/libtracker-common/tracker-common.h | 8 +-
src/libtracker-common/tracker-config-file.c | 8 +-
src/libtracker-common/tracker-config-file.h | 8 +-
src/libtracker-common/tracker-dbus.c | 8 +-
src/libtracker-common/tracker-dbus.h | 8 +-
src/libtracker-common/tracker-file-utils.c | 8 +-
src/libtracker-common/tracker-file-utils.h | 8 +-
src/libtracker-common/tracker-ioprio.h | 8 +-
src/libtracker-common/tracker-keyfile-object.c | 8 +-
src/libtracker-common/tracker-keyfile-object.h | 8 +-
src/libtracker-common/tracker-language.c | 8 +-
src/libtracker-common/tracker-language.h | 8 +-
src/libtracker-common/tracker-log.c | 8 +-
src/libtracker-common/tracker-log.h | 8 +-
src/libtracker-common/tracker-marshal-main.c | 2 -
src/libtracker-common/tracker-module-config.c | 897 ++++++
src/libtracker-common/tracker-module-config.h | 61 +
src/libtracker-common/tracker-namespace.c | 8 +-
src/libtracker-common/tracker-namespace.h | 8 +-
src/libtracker-common/tracker-ontology.c | 8 +-
src/libtracker-common/tracker-ontology.h | 10 +-
src/libtracker-common/tracker-os-dependant-unix.c | 14 +-
src/libtracker-common/tracker-os-dependant-win.c | 8 +-
src/libtracker-common/tracker-os-dependant.h | 8 +-
src/libtracker-common/tracker-parser.c | 579 +----
src/libtracker-common/tracker-parser.h | 53 +-
src/libtracker-common/tracker-power-devicekit.c | 8 +-
src/libtracker-common/tracker-power-hal.c | 8 +-
src/libtracker-common/tracker-power.h | 8 +-
src/libtracker-common/tracker-property.c | 8 +-
src/libtracker-common/tracker-property.h | 8 +-
src/libtracker-common/tracker-sparql-builder.vala | 10 +-
src/libtracker-common/tracker-statement-list.c | 32 +-
src/libtracker-common/tracker-statement-list.h | 11 +-
src/libtracker-common/tracker-storage-hal.c | 8 +-
src/libtracker-common/tracker-storage.h | 8 +-
src/libtracker-common/tracker-turtle-writer.vala | 180 ++
src/libtracker-common/tracker-type-utils.c | 8 +-
src/libtracker-common/tracker-type-utils.h | 8 +-
src/libtracker-common/tracker-utils.c | 37 +-
src/libtracker-common/tracker-utils.h | 10 +-
src/libtracker-data/.gitignore | 2 +
src/libtracker-data/COPYING.LIB | 510 ++++
src/libtracker-data/Makefile.am | 14 +-
src/libtracker-data/libtracker-data.vapi | 10 +-
src/libtracker-data/tracker-data-backup.c | 253 ++-
src/libtracker-data/tracker-data-backup.h | 25 +-
src/libtracker-data/tracker-data-manager.c | 293 +-
src/libtracker-data/tracker-data-manager.h | 18 +-
src/libtracker-data/tracker-data-query.c | 397 +---
src/libtracker-data/tracker-data-query.h | 35 +-
src/libtracker-data/tracker-data-update.c | 651 +++--
src/libtracker-data/tracker-data-update.h | 15 +-
src/libtracker-data/tracker-sparql-query.vala | 2168 ++++++++++----
src/libtracker-data/tracker-sparql-scanner.vala | 951 ++++++
src/libtracker-data/tracker-turtle-reader.vala | 374 +++
src/libtracker-data/tracker-turtle.c | 664 ----
src/libtracker-data/tracker-turtle.h | 71 -
src/libtracker-db/COPYING.LIB | 510 ++++
src/libtracker-db/Makefile.am | 19 +-
src/libtracker-db/libtracker-db.vapi | 8 +-
src/libtracker-db/tracker-db-backup.c | 338 +++
src/libtracker-db/tracker-db-backup.h | 52 +
src/libtracker-db/tracker-db-dbus.c | 8 +-
src/libtracker-db/tracker-db-dbus.h | 8 +-
src/libtracker-db/tracker-db-interface-sqlite.c | 389 +++-
src/libtracker-db/tracker-db-interface-sqlite.h | 26 +-
src/libtracker-db/tracker-db-interface.c | 131 +-
src/libtracker-db/tracker-db-interface.h | 59 +-
src/libtracker-db/tracker-db-journal.c | 166 +
src/libtracker-db/tracker-db-journal.h | 47 +
src/libtracker-db/tracker-db-manager.c | 218 ++-
src/libtracker-db/tracker-db-manager.h | 24 +-
src/libtracker-miner/tracker-miner.h | 6 +-
src/libtracker/tracker.c | 32 +-
src/plugins/evolution/Makefile.am | 1 -
...-freedesktop-Tracker-evolution-plugin.eplug.xml | 2 +-
src/plugins/evolution/tracker-evolution-common.h | 6 +-
src/plugins/evolution/tracker-evolution-plugin.c | 6 +-
.../evolution/tracker-evolution-registrar.c | 12 +-
src/plugins/kmail/Makefile.am | 1 -
src/plugins/kmail/tracker-kmail-common.h | 6 +-
src/plugins/kmail/tracker-kmail-registrar.c | 12 +-
src/rasqal/.gitignore | 11 -
src/rasqal/Makefile.am | 97 -
src/rasqal/fix-bison | 65 -
src/rasqal/fix-flex | 84 -
src/rasqal/rasqal.h | 1383 ---------
src/rasqal/rasqal.vapi | 228 --
src/rasqal/rasqal_algebra.c | 1403 ---------
src/rasqal/rasqal_config.h | 2 -
src/rasqal/rasqal_datetime.c | 802 -----
src/rasqal/rasqal_decimal.c | 941 ------
src/rasqal/rasqal_engine.c | 1783 -----------
src/rasqal/rasqal_engine_algebra.c | 398 ---
src/rasqal/rasqal_engine_sort.c | 375 ---
src/rasqal/rasqal_expr.c | 2572 ----------------
src/rasqal/rasqal_feature.c | 224 --
src/rasqal/rasqal_general.c | 1128 -------
src/rasqal/rasqal_graph.c | 459 ---
src/rasqal/rasqal_graph_pattern.c | 864 ------
src/rasqal/rasqal_internal.h | 1202 --------
src/rasqal/rasqal_literal.c | 3198 --------------------
src/rasqal/rasqal_map.c | 319 --
src/rasqal/rasqal_query.c | 2398 ---------------
src/rasqal/rasqal_query_results.c | 1425 ---------
src/rasqal/rasqal_query_transform.c | 1320 --------
src/rasqal/rasqal_raptor.c | 816 -----
src/rasqal/rasqal_redland.c | 474 ---
src/rasqal/rasqal_result_formats.c | 676 -----
src/rasqal/rasqal_row.c | 509 ----
src/rasqal/rasqal_rowsource.c | 712 -----
src/rasqal/rasqal_rowsource_empty.c | 194 --
src/rasqal/rasqal_rowsource_filter.c | 241 --
src/rasqal/rasqal_rowsource_join.c | 677 -----
src/rasqal/rasqal_rowsource_project.c | 410 ---
src/rasqal/rasqal_rowsource_rowsequence.c | 464 ---
src/rasqal/rasqal_rowsource_sort.c | 260 --
src/rasqal/rasqal_rowsource_triples.c | 720 -----
src/rasqal/rasqal_rowsource_union.c | 579 ----
src/rasqal/rasqal_skiplist.c | 604 ----
src/rasqal/rasqal_sparql_xml.c | 1067 -------
src/rasqal/rasqal_triples_source.c | 236 --
src/rasqal/rasqal_variable.c | 688 -----
src/rasqal/rasqal_xsd_datatypes.c | 981 ------
src/rasqal/rdql_common.h | 63 -
src/rasqal/rdql_lexer.l | 1238 --------
src/rasqal/rdql_parser.y | 937 ------
src/rasqal/sparql_common.h | 63 -
src/rasqal/sparql_lexer.l | 1619 ----------
src/rasqal/sparql_parser.y | 3190 -------------------
src/rasqal/strcasecmp.c | 118 -
src/rasqal/win32_rasqal_config.h | 129 -
src/tracker-explorer/explorer.vala | 8 +-
src/tracker-extract/Makefile.am | 29 +-
.../tracker-albumart.c | 352 +--
.../tracker-albumart.h | 19 +-
src/tracker-extract/tracker-config.c | 6 +-
src/tracker-extract/tracker-dbus.c | 4 +-
src/tracker-extract/tracker-extract-gstreamer.c | 34 +-
src/tracker-extract/tracker-extract-jpeg.c | 6 +
src/tracker-extract/tracker-extract-mp3.c | 1499 +++++-----
src/tracker-extract/tracker-extract-tiff.c | 18 +-
src/tracker-extract/tracker-extract.c | 49 +-
src/tracker-extract/tracker-extract.h | 13 +-
src/tracker-extract/tracker-iptc.c | 10 +-
src/tracker-extract/tracker-iptc.h | 2 +-
src/tracker-extract/tracker-main.c | 6 +-
src/tracker-extract/tracker-marshal-main.c | 2 -
src/tracker-extract/tracker-marshal.list | 2 +-
src/tracker-fts/Makefile.am | 13 +-
src/tracker-fts/tracker-fts-config.c | 6 +-
src/tracker-fts/tracker-fts.c | 123 +-
src/tracker-fts/tracker-fts.h | 26 +-
src/tracker-miner-fs/Makefile.am | 31 +-
src/tracker-miner-fs/modules/evolution-imap.c | 1220 ++++++++
src/tracker-miner-fs/modules/evolution-pop.c | 565 ++++
src/tracker-miner-fs/tracker-config.c | 6 +-
src/tracker-miner-fs/tracker-crawler.c | 1237 ++++++++
src/tracker-miner-fs/tracker-dbus.c | 6 +-
src/tracker-miner-fs/tracker-indexer.c | 283 ++-
src/tracker-miner-fs/tracker-indexer.h | 8 +-
src/tracker-miner-fs/tracker-main.c | 111 +-
src/tracker-miner-fs/tracker-marshal-main.c | 2 -
src/tracker-miner-fs/tracker-marshal.list | 2 +-
src/tracker-miner-fs/tracker-miner-applications.c | 69 +-
src/tracker-miner-fs/tracker-miner.h | 74 +
.../tracker-module-metadata-utils.c | 42 +-
src/tracker-miner-fs/tracker-removable-device.c | 49 +-
src/tracker-miner-fs/tracker-removable-device.h | 2 +
.../tracker-thumbnailer.c | 5 +-
.../tracker-thumbnailer.h | 0
.../tracker-volume-cleanup.c | 4 +-
.../tracker-volume-cleanup.h | 0
src/tracker-store/Makefile.am | 30 +-
src/tracker-store/tracker-backup.c | 165 +-
src/tracker-store/tracker-backup.h | 12 +-
src/tracker-store/tracker-config.c | 6 +-
src/tracker-store/tracker-dbus.c | 6 +-
src/tracker-store/tracker-events.c | 91 +-
src/tracker-store/tracker-events.h | 1 +
src/tracker-store/tracker-main.c | 19 +-
src/tracker-store/tracker-marshal-main.c | 2 -
src/tracker-store/tracker-marshal.list | 1 +
src/tracker-store/tracker-removable-device.c | 338 ---
src/tracker-store/tracker-removable-device.h | 36 -
src/tracker-store/tracker-resource-class.c | 135 +-
src/tracker-store/tracker-resource-class.h | 7 +-
src/tracker-store/tracker-resources.c | 19 +-
src/tracker-store/tracker-resources.h | 6 +-
src/tracker-store/tracker-statistics.h | 6 +-
src/tracker-store/tracker-store.c | 177 +-
src/tracker-store/tracker-store.h | 5 +-
src/tracker-utils/tracker-import.c | 2 +-
src/tracker-utils/tracker-processes.c | 16 +-
src/tracker-utils/tracker-search.c | 4 +-
src/tracker-utils/tracker-sparql.c | 2 +-
tests/Makefile.am | 3 +-
tests/estress/abstract_engine.py | 4 +-
tests/estress/abstract_text_engine.py | 6 +-
tests/estress/client.py | 6 +-
tests/libtracker-common/Makefile.am | 30 +-
tests/libtracker-common/tracker-file-utils-test.c | 4 +-
tests/libtracker-common/tracker-parser-test.c | 193 --
tests/libtracker-common/tracker-thumbnailer-test.c | 183 --
tests/libtracker-common/tracker-type-utils-test.c | 14 +-
tests/libtracker-data/Makefile.am | 23 +-
tests/libtracker-data/algebra/Makefile.am | 34 +
tests/libtracker-data/algebra/data-2.ontology | 20 +
tests/libtracker-data/algebra/data-2.ttl | 13 +
tests/libtracker-data/algebra/filter-nested-2.rq | 4 +
.../libtracker-data/algebra/filter-placement-1.out | 1 +
.../libtracker-data/algebra/filter-placement-1.rq | 7 +
.../libtracker-data/algebra/filter-placement-2.out | 1 +
.../libtracker-data/algebra/filter-placement-2.rq | 7 +
.../libtracker-data/algebra/filter-placement-3.out | 1 +
.../libtracker-data/algebra/filter-placement-3.rq | 9 +
tests/libtracker-data/algebra/filter-scope-1.out | 12 +
tests/libtracker-data/algebra/filter-scope-1.rq | 9 +
.../libtracker-data/algebra/opt-filter-3.ontology | 20 +
tests/libtracker-data/algebra/opt-filter-3.rq | 10 +
tests/libtracker-data/algebra/opt-filter-3.ttl | 13 +
.../libtracker-data/algebra/two-nested-opt-alt.out | 2 +
.../libtracker-data/algebra/two-nested-opt-alt.rq | 10 +
.../algebra/two-nested-opt.ontology | 20 +
tests/libtracker-data/algebra/two-nested-opt.out | 1 +
tests/libtracker-data/algebra/two-nested-opt.rq | 11 +
tests/libtracker-data/algebra/two-nested-opt.ttl | 11 +
.../algebra/var-scope-join-1.ontology | 28 +
tests/libtracker-data/algebra/var-scope-join-1.rq | 8 +
tests/libtracker-data/algebra/var-scope-join-1.ttl | 20 +
.../libtracker-data/bnode-coreference/Makefile.am | 7 +
tests/libtracker-data/bound/Makefile.am | 7 +
tests/libtracker-data/error/Makefile.am | 10 +
tests/libtracker-data/error/query-error-1.out | 1 +
tests/libtracker-data/error/query-error-1.rq | 6 +
tests/libtracker-data/error/query-error-2.ontology | 16 +
tests/libtracker-data/error/query-error-2.out | 1 +
tests/libtracker-data/error/query-error-2.rq | 10 +
tests/libtracker-data/error/query-error-2.ttl | 8 +
tests/libtracker-data/expr-ops/Makefile.am | 19 +
tests/libtracker-data/nie/Makefile.am | 30 +
tests/libtracker-data/nmo/Makefile.am | 36 +
tests/libtracker-data/optional/Makefile.am | 8 +
.../optional/complex-data-1.ontology | 36 +
tests/libtracker-data/optional/complex-data-1.ttl | 21 +
tests/libtracker-data/optional/q-opt-complex-1.out | 2 +
tests/libtracker-data/optional/q-opt-complex-1.rq | 11 +
tests/libtracker-data/regex/Makefile.am | 9 +
tests/libtracker-data/regex/regex-data-01.ttl | 5 +-
tests/libtracker-data/sort/Makefile.am | 19 +
tests/libtracker-data/tracker-ontology-test.c | 248 +-
tests/libtracker-data/tracker-sparql-test.c | 314 ++-
tests/libtracker-data/turtle/Makefile.am | 11 +
.../turtle/turtle-data-001.ontology | 20 +
tests/libtracker-data/turtle/turtle-data-001.ttl | 10 +
.../turtle/turtle-data-002.ontology | 62 +
tests/libtracker-data/turtle/turtle-data-002.ttl | 20 +
tests/libtracker-data/turtle/turtle-query-001.out | 1 +
tests/libtracker-data/turtle/turtle-query-001.rq | 7 +
tests/libtracker-data/turtle/turtle-query-002.rq | 5 +
tests/tracker-miner-fs/Makefile.am | 24 +-
tests/tracker-store/Makefile.am | 35 +
.../tracker-events-test.c | 0
utils/services/Makefile.am | 12 +-
utils/services/data-validator.c | 121 +-
utils/services/ontology-validator.c | 130 +-
utils/services/ttl2html.c | 2 -
utils/services/ttl_html.c | 4 +-
utils/services/ttl_loader.c | 160 +-
utils/services/ttl_model.c | 2 +-
utils/services/ttl_model.h | 2 +-
utils/tracker-fts/Makefile.am | 1 +
utils/tracker-fts/tracker-fts-test.c | 12 +-
325 files changed, 17971 insertions(+), 47879 deletions(-)
---
diff --cc configure.ac
index aad9dbc,4cf92e5..c6516f4
--- a/configure.ac
+++ b/configure.ac
@@@ -1428,10 -1401,7 +1398,9 @@@ AC_CONFIG_FILES(
src/libtracker-db/Makefile
src/libtracker-gtk/Makefile
src/libtracker/Makefile
+ src/libtracker-miner/Makefile
+ src/libtracker-miner/test/Makefile
src/Makefile
- src/rasqal/Makefile
src/tracker-applet/Makefile
src/tracker-applet/tracker-applet.desktop.in
src/tracker-store/Makefile
diff --cc data/dbus/org.freedesktop.Tracker.Miner.Files.service.in
index f5e6180,0d70513..7563d49
--- a/data/dbus/org.freedesktop.Tracker.Miner.Files.service.in
+++ b/data/dbus/org.freedesktop.Tracker.Miner.Files.service.in
@@@ -1,3 -1,3 +1,3 @@@
[D-BUS Service]
- Name=org.freedesktop.Tracker.Miner.Files
-Name=org.freedesktop.Tracker1.Indexer
++Name=org.freedesktop.Tracker1.Miner.Files
Exec= libexecdir@/tracker-miner-fs
diff --cc data/dbus/tracker-miner.xml
index 0e6d83b,07e4d49..7b8459c
--- a/data/dbus/tracker-miner.xml
+++ b/data/dbus/tracker-miner.xml
@@@ -1,54 -1,12 +1,54 @@@
<?xml version="1.0" encoding="UTF-8"?>
<node name="/">
- <interface name="org.freedesktop.Tracker.Miner">
- <interface name="org.freedesktop.Tracker1.Miner.FS">
- <method name="Pause">
++ <interface name="org.freedesktop.Tracker1.Miner">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="tracker_miner_dbus"/>
+ <method name="GetName">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+ <arg type="s" name="name" direction="out" />
+ </method>
+ <method name="GetDescription">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+ <arg type="s" name="description" direction="out" />
+ </method>
+ <method name="GetStatus">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+ <arg type="s" name="status" direction="out" />
+ </method>
+ <method name="GetProgress">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+ <arg type="d" name="progress" direction="out" />
+ </method>
+ <method name="GetPauseDetails">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+ <arg type="as" name="pause_applications" direction="out" />
+ <arg type="as" name="pause_reasons" direction="out" />
</method>
- <method name="Continue">
+ <method name="Pause">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+ <arg type="s" name="application" direction="in" />
+ <arg type="s" name="reason" direction="in" />
+ <arg type="i" name="cookie" direction="out" />
+ </method>
+ <method name="Resume">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+ <arg type="i" name="cookie" direction="in" />
</method>
+
+ <!-- Signals -->
+ <signal name="Started" />
+ <signal name="Stopped">
+ <arg type="b" name="interrupted" />
+ </signal>
+ <signal name="Paused" />
+ <signal name="Resumed" />
+ <signal name="Progress">
+ <arg type="s" name="status" />
+ <arg type="d" name="progress" />
+ </signal>
+ <signal name="Error">
+ <arg type="i" name="code"/>
+ <arg type="s" name="reason"/>
+ </signal>
</interface>
</node>
diff --cc src/Makefile.am
index 1c96b86,977a8dc..d79ae67
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -8,8 -8,6 +8,7 @@@ SUBDIRS =
libtracker-db \
libtracker-data \
libtracker \
+ libtracker-miner \
- tracker-fts \
plugins \
tracker-store \
tracker-utils \
diff --cc src/libtracker-common/Makefile.am
index d694874,cbdf8a8..2b5f89c
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@@ -65,7 -67,7 +67,6 @@@ libtracker_common_la_SOURCES =
tracker-keyfile-object.c \
tracker-language.c \
tracker-log.c \
- tracker-marshal-main.c \
- tracker-module-config.c \
tracker-namespace.c \
tracker-ontology.c \
tracker-parser.c \
diff --cc src/libtracker-miner/tracker-miner.h
index 5d6dc9b,0000000..f2f059b
mode 100644,000000..100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@@ -1,97 -1,0 +1,97 @@@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009, Nokia (urho konttori nokia com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __LIBTRACKERMINER_MINER_H__
+#define __LIBTRACKERMINER_MINER_H__
+
+#include <glib-object.h>
+#include <libtracker/tracker.h>
+
+G_BEGIN_DECLS
+
+#define TRACKER_TYPE_MINER (tracker_miner_get_type())
+#define TRACKER_MINER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_MINER, TrackerMiner))
+#define TRACKER_MINER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_MINER, TrackerMinerClass))
+#define TRACKER_IS_MINER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_MINER))
+#define TRACKER_IS_MINER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_MINER))
+#define TRACKER_MINER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_MINER, TrackerMinerClass))
+
- #define TRACKER_MINER_DBUS_INTERFACE "org.freedesktop.Tracker.Miner"
- #define TRACKER_MINER_DBUS_NAME_PREFIX "org.freedesktop.Tracker.Miner."
- #define TRACKER_MINER_DBUS_PATH_PREFIX "/org/freedesktop/Tracker/Miner/"
++#define TRACKER_MINER_DBUS_INTERFACE "org.freedesktop.Tracker1.Miner"
++#define TRACKER_MINER_DBUS_NAME_PREFIX "org.freedesktop.Tracker1.Miner."
++#define TRACKER_MINER_DBUS_PATH_PREFIX "/org/freedesktop/Tracker1/Miner/"
+
+#define TRACKER_MINER_ERROR_DOMAIN "TrackerMiner"
+#define TRACKER_MINER_ERROR tracker_miner_error_quark()
+
+typedef struct TrackerMiner TrackerMiner;
+typedef struct TrackerMinerClass TrackerMinerClass;
+typedef struct TrackerMinerPrivate TrackerMinerPrivate;
+
+struct TrackerMiner {
+ GObject parent_instance;
+ TrackerMinerPrivate *private;
+};
+
+struct TrackerMinerClass {
+ GObjectClass parent_class;
+
+ /* signals */
+ void (* started) (TrackerMiner *miner);
+ void (* stopped) (TrackerMiner *miner);
+
+ void (* paused) (TrackerMiner *miner);
+ void (* resumed) (TrackerMiner *miner);
+
+ void (* terminated) (TrackerMiner *miner);
+
+ void (* progress) (TrackerMiner *miner,
+ const gchar *status,
+ gdouble progress);
+
+ void (* error) (TrackerMiner *miner,
+ GError *error);
+};
+
+GType tracker_miner_get_type (void) G_GNUC_CONST;
+GQuark tracker_miner_error_quark (void);
+
+void tracker_miner_start (TrackerMiner *miner);
+void tracker_miner_stop (TrackerMiner *miner);
+
+gboolean tracker_miner_is_started (TrackerMiner *miner);
+
+TrackerClient *tracker_miner_get_client (TrackerMiner *miner);
+gboolean tracker_miner_execute_sparql (TrackerMiner *miner,
+ const gchar *sparql,
+ GError **error);
+gboolean tracker_miner_commit (TrackerMiner *miner);
+
+gint tracker_miner_pause (TrackerMiner *miner,
+ const gchar *application,
+ const gchar *reason,
+ GError **error);
+gboolean tracker_miner_resume (TrackerMiner *miner,
+ gint cookie,
+ GError **error);
+
+
+G_END_DECLS
+
+#endif /* __LIBTRACKERMINER_MINER_H__ */
diff --cc src/tracker-miner-fs/Makefile.am
index 08452f0,2a294d3..1b8cf4e
--- a/src/tracker-miner-fs/Makefile.am
+++ b/src/tracker-miner-fs/Makefile.am
@@@ -13,10 -16,26 +13,8 @@@ INCLUDES =
$(GMODULE_CFLAGS) \
$(PANGO_CFLAGS) \
$(DBUS_CFLAGS) \
- $(GCOV_CFLAGS) \
- $(RAPTOR_CFLAGS)
+ $(GCOV_CFLAGS)
-libtracker_moduledir = $(libdir)/tracker-$(TRACKER_API_VERSION)
-libtracker_moduleincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-module/
-libtracker_module_LTLIBRARIES = libtracker-module.la
-
-libtracker_module_la_SOURCES = \
- tracker-dbus.c \
- tracker-module-file.c \
- tracker-module-iteratable.c \
- tracker-module-metadata-utils.c
-
-libtracker_moduleinclude_HEADERS = \
- tracker-module.h \
- tracker-module-file.h \
- tracker-module-iteratable.h \
- tracker-module-metadata-utils.h
-
-libtracker_module_la_LIBADD = $(GCOV_LIBS)
-
libexec_PROGRAMS = tracker-miner-fs
tracker_miner_fs_SOURCES = \
@@@ -35,10 -77,8 +33,9 @@@ tracker_miner_fs_LDADD =
$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libstemmer/libstemmer.la \
$(top_builddir)/src/libinotify/libinotify.la \
+ $(top_builddir)/src/libtracker-miner/libtracker-miner.la \
$(tracker_store_win_libs) \
$(DBUS_LIBS) \
- $(GDKPIXBUF_LIBS) \
$(GMODULE_LIBS) \
$(GTHREAD_LIBS) \
$(PANGO_LIBS) \
diff --cc src/tracker-miner-fs/tracker-config.c
index 463b776,c7e87fb..8ee30a0
--- a/src/tracker-miner-fs/tracker-config.c
+++ b/src/tracker-miner-fs/tracker-config.c
@@@ -82,27 -76,26 +82,27 @@@ typedef struct
typedef struct {
GType type;
- gchar *property;
- gchar *group;
- gchar *key;
+ const gchar *property;
+ const gchar *group;
+ const gchar *key;
} ObjectToKeyFile;
-static void config_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec);
-static void config_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec);
-static void config_finalize (GObject *object);
-static void config_constructed (GObject *object);
-static void config_load (TrackerConfig *config);
-static gboolean config_save (TrackerConfig *config);
-static void config_create_with_defaults (TrackerConfig *config,
- GKeyFile *key_file,
- gboolean overwrite);
+static void config_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void config_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void config_finalize (GObject *object);
+static void config_constructed (GObject *object);
+static void config_changed (TrackerConfigFile *file);
+static void config_load (TrackerConfig *config);
+static gboolean config_save (TrackerConfig *config);
+static void config_create_with_defaults (TrackerConfig *config,
+ GKeyFile *key_file,
+ gboolean overwrite);
enum {
PROP_0,
diff --cc src/tracker-miner-fs/tracker-indexer.c
index 9ba250b,da35d7f..7d265e4
--- a/src/tracker-miner-fs/tracker-indexer.c
+++ b/src/tracker-miner-fs/tracker-indexer.c
@@@ -59,8 -59,9 +59,8 @@@
#include <libtracker-common/tracker-storage.h>
#include <libtracker-common/tracker-parser.h>
#include <libtracker-common/tracker-ontology.h>
-#include <libtracker-common/tracker-module-config.h>
#include <libtracker-common/tracker-utils.h>
- #include <libtracker-common/tracker-thumbnailer.h>
+ #include <libtracker-common/tracker-type-utils.h>
#include <libtracker-db/tracker-db-dbus.h>
@@@ -74,9 -74,11 +73,12 @@@
#include "tracker-indexer.h"
#include "tracker-indexer-module.h"
#include "tracker-marshal.h"
+#include "tracker-removable-device.h"
+ #include "tracker-processor.h"
#include "tracker-status.h"
+ #include "tracker-thumbnailer.h"
#include "tracker-utils.h"
+ #include "tracker-removable-device.h"
#define TRACKER_INDEXER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_INDEXER, TrackerIndexerPrivate))
diff --cc src/tracker-miner-fs/tracker-main.c
index 8a2462f,135b82c..2969a1c
--- a/src/tracker-miner-fs/tracker-main.c
+++ b/src/tracker-miner-fs/tracker-main.c
@@@ -38,8 -38,8 +38,7 @@@
#include <libtracker-common/tracker-ioprio.h>
#include <libtracker-common/tracker-log.h>
#include <libtracker-common/tracker-ontology.h>
-#include <libtracker-common/tracker-module-config.h>
#include <libtracker-common/tracker-file-utils.h>
- #include <libtracker-common/tracker-thumbnailer.h>
#include <libtracker-common/tracker-storage.h>
#include <libtracker-db/tracker-db-manager.h>
diff --cc src/tracker-miner-fs/tracker-miner-applications.c
index 9cddf8b,895c6d2..94b9413
--- a/src/tracker-miner-fs/tracker-miner-applications.c
+++ b/src/tracker-miner-fs/tracker-miner-applications.c
@@@ -246,11 -180,19 +246,18 @@@ miner_applications_process_file_cb (gpo
g_key_file_get_string (key_file, GROUP_DESKTOP_ENTRY, "Name", NULL);
if (name && g_ascii_strcasecmp (type, "Directory") == 0) {
- gchar *canonical_uri = tracker_uri_printf_escaped (SOFTWARE_CATEGORY_URN_PREFIX "%s", name);
+ gchar *canonical_uri = tracker_uri_printf_escaped (SOFTWARE_CATEGORY_URN_PREFIX "%s", path);
gchar *icon = g_key_file_get_string (key_file, GROUP_DESKTOP_ENTRY, "Icon", NULL);
- sparql = tracker_sparql_builder_new_update ();
tracker_sparql_builder_insert_open (sparql);
+ uri = canonical_uri;
+
+ tracker_sparql_builder_subject_iri (sparql, uri);
+
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "nfo:SoftwareCategory");
+
if (icon) {
gchar *icon_uri = g_strdup_printf (THEME_ICON_URN_PREFIX "%s", icon);
diff --cc src/tracker-store/tracker-main.c
index d8c8f0c,d7750b6..7288c2a
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@@ -47,8 -47,8 +47,7 @@@
#include <libtracker-common/tracker-storage.h>
#include <libtracker-common/tracker-ioprio.h>
#include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-module-config.h>
#include <libtracker-common/tracker-ontology.h>
- #include <libtracker-common/tracker-thumbnailer.h>
#include <libtracker-db/tracker-db-manager.h>
#include <libtracker-db/tracker-db-dbus.h>
diff --cc tests/tracker-miner-fs/Makefile.am
index 40fe90d,8a4275f..abad7a0
--- a/tests/tracker-miner-fs/Makefile.am
+++ b/tests/tracker-miner-fs/Makefile.am
@@@ -22,22 -21,23 +21,20 @@@ INCLUDES =
$(GMODULE_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(PANGO_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(RAPTOR_CFLAGS)
-
+ $(DBUS_CFLAGS)
tracker_metadata_utils_SOURCES = \
- $(top_srcdir)/src/tracker-store/tracker-events.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-dbus.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-config.c \
- $(top_srcdir)/src/tracker-miner-fs/tracker-crawler.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-indexer.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-indexer-module.c \
- $(top_srcdir)/src/tracker-miner-fs/tracker-marshal-main.c \
+ $(top_srcdir)/src/tracker-miner-fs/tracker-marshal.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-module-metadata-utils.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-module-file.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-module-iteratable.c \
- $(top_srcdir)/src/tracker-miner-fs/tracker-monitor.c \
- $(top_srcdir)/src/tracker-miner-fs/tracker-processor.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-removable-device.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-status.c \
+ $(top_srcdir)/src/tracker-miner-fs/tracker-thumbnailer.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-utils.c \
tracker-metadata-utils-test.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
