[tracker: 119/119] Merge branch 'wip/carlosg/domain-ontologies'
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker: 119/119] Merge branch 'wip/carlosg/domain-ontologies'
- Date: Thu, 29 Jun 2017 18:52:44 +0000 (UTC)
commit 70808cb53ea9dbb8a5f4a92905b21de663d61f7e
Merge: 7bc8838 b109b0d
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Jun 29 20:50:00 2017 +0200
Merge branch 'wip/carlosg/domain-ontologies'
config.h.meson.in | 3 -
configure.ac | 60 +-
docs/manpages/tracker-daemon.1 | 16 -
docs/manpages/tracker-info.1 | 7 -
docs/manpages/tracker-search.1 | 7 -
docs/manpages/tracker-sparql.1 | 7 -
docs/manpages/tracker-store.1 | 7 -
docs/manpages/tracker-tag.1 | 7 -
docs/ontologies/.gitignore | 8 -
docs/ontologies/README.ontologiesdoc | 74 -
docs/ontologies/explanation.xml.template | 59 -
docs/ontologies/index.html | 57 -
.../libtracker-control-sections.txt | 1 -
.../libtracker-miner/libtracker-miner-sections.txt | 17 +-
docs/reference/libtracker-sparql/Makefile.am | 13 +-
.../examples/ontologies/defining-cardinality-1.rq | 5 +
.../examples/ontologies/defining-cardinality-2.txt | 4 +
.../examples/ontologies/defining-cardinality-3.rq | 8 +
.../examples/ontologies/defining-classes-1.txt | 3 +
.../examples/ontologies/defining-classes-2.txt | 11 +
.../examples/ontologies/defining-classes-3.rq | 2 +
.../examples/ontologies/defining-fts-indexes-1.txt | 5 +
.../examples/ontologies/defining-fts-indexes-2.rq | 2 +
.../examples/ontologies/defining-indexes-1.txt | 5 +
.../examples/ontologies/defining-namespaces-1.txt | 19 +-
.../examples/ontologies/defining-properties-1.txt | 11 +
.../examples/ontologies/defining-properties-2.txt | 7 +
.../examples/ontologies/defining-properties-3.txt | 8 +
.../examples/ontologies/defining-properties-4.rq | 5 +
.../examples/ontologies/defining-uniqueness-1.txt | 3 +
.../examples/ontologies/defining-uniqueness-2.rq | 7 +
.../examples/ontologies/predefined-elements-1.txt | 1 +
.../examples/ontologies/predefined-elements-2.rq | 2 +
.../libtracker-sparql/libtracker-sparql-docs.sgml | 10 +
docs/reference/libtracker-sparql/ontologies.sgml | 352 +++++
docs/reference/libtracker-sparql/overview.sgml | 10 -
docs/reference/ontology/Makefile.am | 22 +-
docs/reference/ontology/meson.build | 10 +-
.../ontology/mfo-introduction.xml} | 0
.../ontology/mlo-introduction.xml} | 0
.../ontology/nco-introduction.xml} | 0
.../ontology/nie-introduction.xml} | 0
.../ontology/nmm-introduction.xml} | 0
.../ontology/nmo-introduction.xml} | 0
docs/reference/ontology/ontology-docs.sgml | 6 +-
.../ontology/xsd-introduction.xml} | 0
docs/tools/Makefile.am | 13 +-
docs/tools/gen-doc.sh | 51 -
docs/tools/meson.build | 8 +-
docs/tools/qname.c | 254 ---
docs/tools/ttl2sgml.c | 132 ++-
docs/tools/ttl_loader.c | 132 +--
docs/tools/ttl_loader.h | 13 +-
docs/tools/ttl_model.c | 49 +
docs/tools/ttl_model.h | 4 +
docs/tools/ttl_sgml.c | 107 +-
docs/tools/ttl_sgml.h | 7 +-
docs/tools/ttlresource2sgml.c | 230 +--
docs/tools/{qname.h => ttlresource2sgml.h} | 25 +-
examples/introspection/python/miner.py | 4 -
examples/libtracker-miner/tracker-main.c | 11 +-
meson.build | 8 +-
po/POTFILES.in | 1 +
src/libtracker-bus/tracker-bus.vala | 25 +-
src/libtracker-common/Makefile.am | 2 +
src/libtracker-common/libtracker-common.vapi | 11 +-
src/libtracker-common/meson.build | 1 +
src/libtracker-common/tracker-common.h | 1 +
src/libtracker-common/tracker-dbus.c | 42 +
src/libtracker-common/tracker-dbus.h | 4 +
src/libtracker-common/tracker-domain-ontology.c | 477 ++++++
src/libtracker-common/tracker-domain-ontology.h | 69 +
src/libtracker-common/tracker-locale.c | 126 +--
src/libtracker-common/tracker-locale.h | 8 +-
src/libtracker-common/tracker-log.c | 11 -
src/libtracker-control/Makefile.am | 2 +
src/libtracker-control/tracker-control.vapi | 4 +-
src/libtracker-control/tracker-miner-manager.c | 188 +--
src/libtracker-control/tracker-miner-manager.h | 6 -
src/libtracker-data/Makefile.am | 14 +
src/libtracker-data/libtracker-data.vapi | 39 +-
src/libtracker-data/meson.build | 8 +
src/libtracker-data/tracker-class.c | 21 +-
src/libtracker-data/tracker-class.h | 4 +
src/libtracker-data/tracker-data-backup.c | 150 +-
src/libtracker-data/tracker-data-backup.h | 11 +-
.../tracker-data-enum-types.c.template | 44 +
.../tracker-data-enum-types.h.template | 26 +
src/libtracker-data/tracker-data-manager.c | 1567 +++++++++----------
src/libtracker-data/tracker-data-manager.h | 58 +-
src/libtracker-data/tracker-data-query.c | 21 +-
src/libtracker-data/tracker-data-query.h | 12 +-
src/libtracker-data/tracker-data-update.c | 1638 +++++++++++---------
src/libtracker-data/tracker-data-update.h | 106 +-
src/libtracker-data/tracker-db-backup.c | 13 +-
src/libtracker-data/tracker-db-backup.h | 1 +
src/libtracker-data/tracker-db-interface-sqlite.c | 150 +-
src/libtracker-data/tracker-db-interface-sqlite.h | 14 +-
src/libtracker-data/tracker-db-interface.h | 10 +-
src/libtracker-data/tracker-db-journal.c | 852 +++++------
src/libtracker-data/tracker-db-journal.h | 147 +-
src/libtracker-data/tracker-db-manager.c | 1378 ++++------------
src/libtracker-data/tracker-db-manager.h | 73 +-
src/libtracker-data/tracker-namespace.c | 16 +-
src/libtracker-data/tracker-namespace.h | 3 +
src/libtracker-data/tracker-ontologies.c | 472 ++++---
src/libtracker-data/tracker-ontologies.h | 109 +-
src/libtracker-data/tracker-ontology.c | 14 +
src/libtracker-data/tracker-ontology.h | 3 +
src/libtracker-data/tracker-property.c | 37 +-
src/libtracker-data/tracker-property.h | 3 +
src/libtracker-data/tracker-sparql-expression.vala | 6 +-
src/libtracker-data/tracker-sparql-pattern.vala | 43 +-
src/libtracker-data/tracker-sparql-query.vala | 36 +-
src/libtracker-data/tracker-turtle-reader.vala | 39 +-
src/libtracker-direct/Makefile.am | 1 +
src/libtracker-direct/tracker-direct.vala | 277 +++-
src/libtracker-extract/tracker-extract-info.c | 59 -
src/libtracker-extract/tracker-extract-info.h | 12 -
src/libtracker-fts/tracker-fts-tokenizer.c | 89 +-
src/libtracker-fts/tracker-fts-tokenizer.h | 6 +-
src/libtracker-fts/tracker-fts.c | 60 +-
src/libtracker-fts/tracker-fts.h | 8 +-
src/libtracker-miner/Makefile.am | 14 +-
src/libtracker-miner/TrackerMiner-1.0.metadata | 1 -
src/libtracker-miner/meson.build | 7 +-
src/libtracker-miner/tracker-file-notifier.c | 32 +-
src/libtracker-miner/tracker-file-notifier.h | 3 +-
src/libtracker-miner/tracker-media-art.c | 242 ---
src/libtracker-miner/tracker-media-art.h | 37 -
src/libtracker-miner/tracker-miner-fs.c | 1248 ++--------------
src/libtracker-miner/tracker-miner-fs.h | 71 +-
src/libtracker-miner/tracker-miner-object.c | 1050 +------------
src/libtracker-miner/tracker-miner-object.h | 22 +-
src/libtracker-miner/tracker-miner-online.c | 21 +-
src/libtracker-miner/tracker-miner-proxy.c | 854 ++++++++++
src/libtracker-miner/tracker-miner-proxy.h | 61 +
src/libtracker-miner/tracker-miner.h | 1 +
src/libtracker-miner/tracker-miner.vapi | 34 +-
src/libtracker-miner/tracker-miner.xml | 6 -
src/libtracker-sparql-backend/Makefile.am | 4 +-
src/libtracker-sparql-backend/meson.build | 7 +-
src/libtracker-sparql-backend/tracker-backend.vala | 156 +--
src/libtracker-sparql/tracker-connection.vala | 38 +-
src/libtracker-sparql/tracker-notifier.c | 14 +-
...sktop.Tracker1.Miner.Applications.service.in.in | 1 +
src/miners/apps/tracker-main.c | 69 +
src/miners/apps/tracker-miner-applications.c | 58 +-
src/miners/fs/Makefile.am | 8 +-
src/miners/fs/meson.build | 1 +
....freedesktop.Tracker1.Miner.Files.service.in.in | 1 +
src/miners/fs/tracker-main.c | 97 +-
src/miners/fs/tracker-miner-files-index.c | 37 +-
src/miners/fs/tracker-miner-files.c | 654 +++++++--
src/miners/fs/tracker-miner-files.h | 13 +
.../fs}/tracker-thumbnailer.c | 0
.../fs}/tracker-thumbnailer.h | 0
...rg.freedesktop.Tracker1.Miner.RSS.service.in.in | 1 +
src/miners/rss/tracker-main.c | 68 +
src/miners/rss/tracker-miner-rss.c | 11 +-
src/ontologies/11-rdf.ontology | 15 +
src/ontologies/31-nao.ontology | 24 -
src/ontologies/Makefile.am | 53 +-
src/ontologies/builtin-ontology.gresource.xml | 10 +
src/ontologies/{ => nepomuk}/30-nie.description | 0
src/ontologies/{ => nepomuk}/30-nie.ontology | 0
src/ontologies/nepomuk/31-nao-custom.ontology | 29 +
src/ontologies/{ => nepomuk}/32-nco.description | 0
src/ontologies/{ => nepomuk}/32-nco.ontology | 0
src/ontologies/{ => nepomuk}/33-nfo.description | 0
src/ontologies/{ => nepomuk}/33-nfo.ontology | 0
src/ontologies/{ => nepomuk}/34-nmo.description | 0
src/ontologies/{ => nepomuk}/34-nmo.ontology | 0
src/ontologies/{ => nepomuk}/35-ncal.description | 0
src/ontologies/{ => nepomuk}/35-ncal.ontology | 0
src/ontologies/{ => nepomuk}/36-scal.description | 0
src/ontologies/{ => nepomuk}/36-scal.ontology | 0
src/ontologies/{ => nepomuk}/37-nid3.description | 0
src/ontologies/{ => nepomuk}/37-nid3.ontology | 0
src/ontologies/{ => nepomuk}/38-nmm.description | 0
src/ontologies/{ => nepomuk}/38-nmm.ontology | 0
src/ontologies/{ => nepomuk}/39-mto.description | 0
src/ontologies/{ => nepomuk}/39-mto.ontology | 0
src/ontologies/{ => nepomuk}/40-mlo.description | 0
src/ontologies/{ => nepomuk}/40-mlo.ontology | 0
src/ontologies/{ => nepomuk}/41-mfo.description | 0
src/ontologies/{ => nepomuk}/41-mfo.ontology | 0
src/ontologies/{ => nepomuk}/89-mtp.description | 0
src/ontologies/{ => nepomuk}/89-mtp.ontology | 0
.../{ => nepomuk}/90-tracker.description | 0
src/ontologies/{ => nepomuk}/90-tracker.ontology | 15 -
src/ontologies/{ => nepomuk}/91-maemo.description | 0
src/ontologies/{ => nepomuk}/91-maemo.ontology | 0
src/ontologies/{ => nepomuk}/92-slo.description | 0
src/ontologies/{ => nepomuk}/92-slo.ontology | 0
.../{ => nepomuk}/93-libosinfo.description | 0
src/ontologies/{ => nepomuk}/93-libosinfo.ontology | 0
src/tracker-extract/Makefile.am | 2 +-
...reedesktop.Tracker1.Miner.Extract.service.in.in | 1 +
src/tracker-extract/tracker-extract-controller.c | 47 +-
src/tracker-extract/tracker-extract-controller.h | 3 +-
src/tracker-extract/tracker-extract-decorator.c | 1 -
src/tracker-extract/tracker-extract-gstreamer.c | 175 ---
src/tracker-extract/tracker-extract-libav.c | 28 -
src/tracker-extract/tracker-extract-mp3.c | 65 +-
src/tracker-extract/tracker-extract-vorbis.c | 34 -
src/tracker-extract/tracker-extract.c | 41 -
src/tracker-extract/tracker-extract.h | 5 -
src/tracker-extract/tracker-main.c | 92 +-
src/tracker-store/Makefile.am | 4 +
src/tracker-store/default.rule | 44 +
src/tracker-store/tracker-backup.vala | 11 +-
src/tracker-store/tracker-dbus.vala | 38 +-
src/tracker-store/tracker-events.c | 6 +-
src/tracker-store/tracker-events.h | 2 +-
src/tracker-store/tracker-events.vapi | 2 +-
src/tracker-store/tracker-main.vala | 76 +-
src/tracker-store/tracker-resources.vala | 50 +-
src/tracker-store/tracker-statistics.vala | 8 +-
src/tracker-store/tracker-status.vala | 2 +-
src/tracker-store/tracker-steroids.vala | 13 +-
src/tracker-store/tracker-store.vala | 69 +-
src/tracker-store/tracker-writeback.c | 7 +-
src/tracker-store/tracker-writeback.h | 3 +-
src/tracker-store/tracker-writeback.vapi | 2 +-
src/tracker/Makefile.am | 1 +
src/tracker/tracker-reset.c | 49 +-
src/tracker/tracker-sql.c | 34 +-
tests/functional-tests/ipc/test-bus-query.vala | 2 +-
tests/functional-tests/ipc/test-bus-update.vala | 2 +-
tests/libtracker-common/tracker-file-utils-test.c | 6 +-
tests/libtracker-common/tracker-utils-test.c | 5 +-
tests/libtracker-data/Makefile.am | 3 -
tests/libtracker-data/aggregates/Makefile.am | 2 +-
.../aggregates/{data-1.ontology => test.ontology} | 0
tests/libtracker-data/algebra/Makefile.am | 7 +-
tests/libtracker-data/algebra/data-1.ontology | 16 -
tests/libtracker-data/algebra/data-2.ontology | 20 -
.../{opt-filter-3.ontology => test-1.ontology} | 1 -
.../{var-scope-join-1.ontology => test-2.ontology} | 6 -
.../algebra/two-nested-opt.ontology | 20 -
tests/libtracker-data/anon/Makefile.am | 2 +-
.../anon/{data.ontology => test.ontology} | 0
tests/libtracker-data/basic/Makefile.am | 2 +-
.../basic/{data-1.ontology => test.ontology} | 0
tests/libtracker-data/datetime/Makefile.am | 4 +-
tests/libtracker-data/datetime/data-2.ontology | 15 -
tests/libtracker-data/datetime/data-3.ontology | 15 -
.../datetime/{data-1.ontology => test.ontology} | 0
tests/libtracker-data/error/Makefile.am | 4 +-
.../{query-error-2.ontology => test.ontology} | 0
tests/libtracker-data/functions/Makefile.am | 6 +-
tests/libtracker-data/functions/data-1.ontology | 39 -
tests/libtracker-data/functions/data-2.ontology | 20 -
tests/libtracker-data/functions/data-3.ontology | 25 -
tests/libtracker-data/functions/test-1.ontology | 62 +
.../functions/{data-4.ontology => test-2.ontology} | 7 -
tests/libtracker-data/graph/Makefile.am | 5 +-
tests/libtracker-data/graph/data-1.ontology | 16 -
tests/libtracker-data/graph/data-2.ontology | 16 -
tests/libtracker-data/graph/data-4.ontology | 23 -
.../graph/{data-3.ontology => test.ontology} | 13 +-
.../libtracker-data/mixed-cardinality/Makefile.am | 3 +-
...-mixed-cardinality-1.ontology => test.ontology} | 0
.../update-mixed-cardinality-1.ontology | 25 -
tests/libtracker-data/ontologies/31-nao.ontology | 23 -
.../libtracker-data/ontologies/90-tracker.ontology | 31 -
tests/libtracker-data/optional/Makefile.am | 4 +-
.../{complex-data-1.ontology => test-1.ontology} | 0
...le-optional-triple.ontology => test-2.ontology} | 0
tests/libtracker-data/regex/Makefile.am | 2 +-
tests/libtracker-data/regex/regex-data-01.ontology | 16 -
.../test.ontology} | 0
tests/libtracker-data/sort/Makefile.am | 5 +-
tests/libtracker-data/sort/data-sort-1.ontology | 20 -
tests/libtracker-data/sort/data-sort-3.ontology | 20 -
tests/libtracker-data/sort/data-sort-4.ontology | 24 -
.../sort/{data-sort-5.ontology => test.ontology} | 17 +-
tests/libtracker-data/subqueries/Makefile.am | 2 +-
.../subqueries/{data-1.ontology => test.ontology} | 0
tests/libtracker-data/tracker-backup-test.c | 127 +-
tests/libtracker-data/tracker-db-journal.c | 219 ++--
.../libtracker-data/tracker-ontology-change-test.c | 65 +-
tests/libtracker-data/tracker-ontology-test.c | 154 +--
tests/libtracker-data/tracker-sparql-blank-test.c | 60 +-
tests/libtracker-data/tracker-sparql-test.c | 73 +-
tests/libtracker-data/turtle/Makefile.am | 3 +-
.../{turtle-data-002.ontology => test.ontology} | 14 +-
.../turtle/turtle-data-001.ontology | 20 -
tests/libtracker-data/turtle/turtle-data-002.ttl | 2 +-
tests/libtracker-data/update/Makefile.am | 14 +-
.../libtracker-data/update/delete-data-2.ontology | 36 -
.../update/delete-insert-where-1.ontology | 36 -
.../update/delete-insert-where-2.ontology | 36 -
.../update/delete-insert-where-3.ontology | 36 -
.../update/delete-insert-where-4.ontology | 36 -
.../update/delete-insert-where-5.ontology | 36 -
.../update/delete-insert-where-6.ontology | 36 -
.../libtracker-data/update/delete-where-1.ontology | 36 -
.../libtracker-data/update/delete-where-2.ontology | 36 -
.../libtracker-data/update/insert-data-1.ontology | 36 -
.../libtracker-data/update/insert-data-2.ontology | 36 -
.../update/invalid-insert-where-1.ontology | 35 -
.../{delete-data-1.ontology => test.ontology} | 0
tests/libtracker-extract/tracker-encoding-test.c | 4 +-
tests/libtracker-fts/tracker-fts-test.c | 47 +-
tests/libtracker-miner/Makefile.am | 1 +
tests/libtracker-miner/miners-mock.c | 2 -
.../libtracker-miner/tracker-file-notifier-test.c | 13 +-
tests/libtracker-sparql/Makefile.am | 2 +
tests/libtracker-sparql/tracker-gb-737023.c | 3 +
tests/libtracker-sparql/tracker-sparql-test.c | 6 +-
tests/tracker-steroids/Makefile.am | 2 +
tests/tracker-steroids/tracker-test.c | 2 +
utils/ontology/data-validator.c | 10 +-
utils/ontology/ontology-validator.c | 6 +-
316 files changed, 8387 insertions(+), 9989 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
