[tracker/sam/cleanups: 71/72] Remove unused ontologies
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/sam/cleanups: 71/72] Remove unused ontologies
- Date: Fri, 1 May 2020 10:19:38 +0000 (UTC)
commit 04f3e4b9a9859c90a1b7f29fe68d942106b24336
Author: Sam Thursfield <sam afuera me uk>
Date: Sat Apr 18 01:06:47 2020 +0200
Remove unused ontologies
All of these are unused within tracker-miners, and as far as we know
they are also unused in GNOME.
Each ontology has a cost on database size and on time to create a
new database, so it's good to limit these as much as we can.
Alternatives:
- nid3: use nmm ontology
- ncal, scal: use evolution-data-server as GNOME Calendar does
- mlo: use slo ontology
.../libtracker-sparql-sections.txt | 3 -
docs/reference/ontology/ontology-docs.xml | 7 -
examples/rss-reader/initial-data.ttl | 4 -
src/libtracker-sparql/tracker-namespace-manager.c | 3 -
src/libtracker-sparql/tracker-ontologies.h | 11 +-
src/ontologies/Indices.list | 48 -
src/ontologies/meson.build | 14 -
src/ontologies/nepomuk/34-nmo.description | 27 -
src/ontologies/nepomuk/34-nmo.ontology | 545 ------------
src/ontologies/nepomuk/35-ncal.description | 25 -
src/ontologies/nepomuk/35-ncal.ontology | 974 ---------------------
src/ontologies/nepomuk/36-scal.description | 12 -
src/ontologies/nepomuk/36-scal.ontology | 482 ----------
src/ontologies/nepomuk/37-nid3.description | 12 -
src/ontologies/nepomuk/37-nid3.ontology | 89 --
src/ontologies/nepomuk/39-mto.description | 16 -
src/ontologies/nepomuk/39-mto.ontology | 161 ----
src/ontologies/nepomuk/40-mlo.description | 14 -
src/ontologies/nepomuk/40-mlo.ontology | 358 --------
src/ontologies/nepomuk/41-mfo.ontology | 9 +-
src/ontologies/nepomuk/89-mtp.description | 13 -
src/ontologies/nepomuk/89-mtp.ontology | 85 --
src/ontologies/nepomuk/92-slo.description | 4 +-
tests/functional-tests/distance.py | 18 +-
tests/libtracker-data/nie/data-1.ttl | 21 -
tests/libtracker-data/nie/filter-description-1.out | 21 -
tests/libtracker-data/nie/filter-identifier-1.out | 20 -
tests/libtracker-data/nie/filter-title-1.out | 20 -
tests/libtracker-data/nmo/data-1.ttl | 62 --
tests/libtracker-data/nmo/filter-boundary-1.out | 1 -
tests/libtracker-data/nmo/filter-boundary-1.rq | 3 -
tests/libtracker-data/nmo/filter-charset-1.out | 1 -
tests/libtracker-data/nmo/filter-charset-1.rq | 3 -
.../nmo/filter-contentdescription-1.out | 1 -
.../nmo/filter-contentdescription-1.rq | 3 -
tests/libtracker-data/nmo/filter-contentid-1.out | 1 -
tests/libtracker-data/nmo/filter-contentid-1.rq | 3 -
.../nmo/filter-contenttransferencoding-1.out | 1 -
.../nmo/filter-contenttransferencoding-1.rq | 3 -
tests/libtracker-data/nmo/filter-headername-1.out | 1 -
tests/libtracker-data/nmo/filter-headername-1.rq | 3 -
tests/libtracker-data/nmo/filter-headervalue-1.out | 1 -
tests/libtracker-data/nmo/filter-headervalue-1.rq | 3 -
tests/libtracker-data/nmo/filter-isanswered-1.out | 1 -
tests/libtracker-data/nmo/filter-isanswered-1.rq | 3 -
tests/libtracker-data/nmo/filter-isdeleted-1.out | 1 -
tests/libtracker-data/nmo/filter-isdeleted-1.rq | 3 -
tests/libtracker-data/nmo/filter-isdraft-1.out | 1 -
tests/libtracker-data/nmo/filter-isdraft-1.rq | 3 -
tests/libtracker-data/nmo/filter-isflagged-1.out | 1 -
tests/libtracker-data/nmo/filter-isflagged-1.rq | 3 -
tests/libtracker-data/nmo/filter-isread-1.out | 1 -
tests/libtracker-data/nmo/filter-isread-1.rq | 3 -
tests/libtracker-data/nmo/filter-isrecent-1.out | 1 -
tests/libtracker-data/nmo/filter-isrecent-1.rq | 3 -
tests/libtracker-data/nmo/filter-messageid-1.out | 1 -
tests/libtracker-data/nmo/filter-messageid-1.rq | 3 -
.../nmo/filter-messagesubject-1.out | 1 -
.../libtracker-data/nmo/filter-messagesubject-1.rq | 3 -
tests/libtracker-data/tracker-ontology-test.c | 26 -
tests/libtracker-sparql/tracker-fd-test.c | 30 +-
utils/data-generators/cc/ontology_prefixes.py | 1 -
62 files changed, 34 insertions(+), 3161 deletions(-)
---
diff --git a/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
b/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
index c12976073..38dfe9d51 100644
--- a/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
+++ b/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
@@ -52,14 +52,11 @@ tracker_resource_print_turtle
tracker_resource_print_jsonld
TRACKER_PREFIX_DC
TRACKER_PREFIX_MFO
-TRACKER_PREFIX_MLO
TRACKER_PREFIX_NAO
TRACKER_PREFIX_NCO
TRACKER_PREFIX_NFO
-TRACKER_PREFIX_NID3
TRACKER_PREFIX_NIE
TRACKER_PREFIX_NMM
-TRACKER_PREFIX_NMO
TRACKER_PREFIX_NRL
TRACKER_PREFIX_OSINFO
TRACKER_PREFIX_RDF
diff --git a/docs/reference/ontology/ontology-docs.xml b/docs/reference/ontology/ontology-docs.xml
index d79a7f943..723fcd17c 100644
--- a/docs/reference/ontology/ontology-docs.xml
+++ b/docs/reference/ontology/ontology-docs.xml
@@ -43,17 +43,10 @@
<xi:include href="xml/nao-ontology.xml"/>
<xi:include href="xml/nfo-ontology.xml" />
<xi:include href="xml/nco-ontology.xml" />
- <xi:include href="xml/nmo-ontology.xml" />
- <xi:include href="xml/ncal-ontology.xml" />
- <xi:include href="xml/scal-ontology.xml" />
<xi:include href="xml/nmm-ontology.xml" />
- <xi:include href="xml/mto-ontology.xml" />
- <xi:include href="xml/mlo-ontology.xml" />
<xi:include href="xml/mfo-ontology.xml" />
- <xi:include href="xml/mtp-ontology.xml" />
<xi:include href="xml/slo-ontology.xml" />
<xi:include href="xml/tracker-ontology.xml" />
<xi:include href="xml/osinfo-ontology.xml" />
- <xi:include href="xml/nid3-ontology.xml" />
</part>
</book>
diff --git a/examples/rss-reader/initial-data.ttl b/examples/rss-reader/initial-data.ttl
index 786e6d8ba..530affc1a 100644
--- a/examples/rss-reader/initial-data.ttl
+++ b/examples/rss-reader/initial-data.ttl
@@ -1,12 +1,8 @@
@prefix rdf: <http://www.w3.org/2000/01/rdf-schema#>.
@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#>.
-@prefix nid3: <http://tracker.api.gnome.org/ontology/v3/nid3#>.
@prefix nao: <http://tracker.api.gnome.org/ontology/v3/nao#>.
-@prefix nco: <http://tracker.api.gnome.org/ontology/v3/nco#>.
-@prefix nmo: <http://tracker.api.gnome.org/ontology/v3/nmo#>.
@prefix nfo: <http://tracker.api.gnome.org/ontology/v3/nfo#>.
@prefix nie: <http://tracker.api.gnome.org/ontology/v3/nie#>.
-@prefix ncal: <http://tracker.api.gnome.org/ontology/v3/ncal#>.
@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
@prefix mfo: <http://tracker.api.gnome.org/ontology/v3/mfo#>.
diff --git a/src/libtracker-sparql/tracker-namespace-manager.c
b/src/libtracker-sparql/tracker-namespace-manager.c
index ed088e4c8..788e9525f 100644
--- a/src/libtracker-sparql/tracker-namespace-manager.c
+++ b/src/libtracker-sparql/tracker-namespace-manager.c
@@ -141,16 +141,13 @@ tracker_namespace_manager_get_default ()
tracker_namespace_manager_add_prefix (manager, "dc", TRACKER_PREFIX_DC);
tracker_namespace_manager_add_prefix (manager, "nrl", TRACKER_PREFIX_NRL);
- tracker_namespace_manager_add_prefix (manager, "nmo", TRACKER_PREFIX_NMO);
tracker_namespace_manager_add_prefix (manager, "nie", TRACKER_PREFIX_NIE);
tracker_namespace_manager_add_prefix (manager, "nco", TRACKER_PREFIX_NCO);
tracker_namespace_manager_add_prefix (manager, "nao", TRACKER_PREFIX_NAO);
- tracker_namespace_manager_add_prefix (manager, "nid3", TRACKER_PREFIX_NID3);
tracker_namespace_manager_add_prefix (manager, "nfo", TRACKER_PREFIX_NFO);
tracker_namespace_manager_add_prefix (manager, "slo", TRACKER_PREFIX_SLO);
tracker_namespace_manager_add_prefix (manager, "nmm", TRACKER_PREFIX_NMM);
- tracker_namespace_manager_add_prefix (manager, "mlo", TRACKER_PREFIX_MLO);
tracker_namespace_manager_add_prefix (manager, "mfo", TRACKER_PREFIX_MFO);
tracker_namespace_manager_add_prefix (manager, "osinfo", TRACKER_PREFIX_OSINFO);
diff --git a/src/libtracker-sparql/tracker-ontologies.h b/src/libtracker-sparql/tracker-ontologies.h
index 6c6dbdc68..d7d7882f3 100644
--- a/src/libtracker-sparql/tracker-ontologies.h
+++ b/src/libtracker-sparql/tracker-ontologies.h
@@ -36,19 +36,16 @@ G_BEGIN_DECLS
/* Our Nepomuk selection */
#define TRACKER_PREFIX_NRL "http://tracker.api.gnome.org/ontology/v3/nrl#";
-#define TRACKER_PREFIX_NMO "http://tracker.api.gnome.org/ontology/v3/nmo#";
#define TRACKER_PREFIX_NIE "http://tracker.api.gnome.org/ontology/v3/nie#";
#define TRACKER_PREFIX_NCO "http://tracker.api.gnome.org/ontology/v3/nco#";
#define TRACKER_PREFIX_NAO "http://tracker.api.gnome.org/ontology/v3/nao#";
-#define TRACKER_PREFIX_NID3 "http://tracker.api.gnome.org/ontology/v3/nid3#";
#define TRACKER_PREFIX_NFO "http://tracker.api.gnome.org/ontology/v3/nfo#";
-#define TRACKER_PREFIX_OSINFO "http://tracker.api.gnome.org/ontology/v3/osinfo#";
-
-/* Temporary */
-#define TRACKER_PREFIX_SLO "http://tracker.api.gnome.org/ontology/v3/slo#";
#define TRACKER_PREFIX_NMM "http://tracker.api.gnome.org/ontology/v3/nmm#";
-#define TRACKER_PREFIX_MLO "http://tracker.api.gnome.org/ontology/v3/mlo#";
+
+/* Addtional ontologies used by tracker-miners */
#define TRACKER_PREFIX_MFO "http://tracker.api.gnome.org/ontology/v3/mfo#";
+#define TRACKER_PREFIX_SLO "http://tracker.api.gnome.org/ontology/v3/slo#";
+#define TRACKER_PREFIX_OSINFO "http://tracker.api.gnome.org/ontology/v3/osinfo#";
G_END_DECLS
diff --git a/src/ontologies/Indices.list b/src/ontologies/Indices.list
index cfcd7f412..0cf99e59c 100644
--- a/src/ontologies/Indices.list
+++ b/src/ontologies/Indices.list
@@ -35,45 +35,6 @@
* nie:contentCreated domainIndex for nfo:Visual
- Used to improve performance of ORDER BY on nie:contentCreated
-34-nmo:
-* nmo:from:
- - For use cases where fts:match needs to be done against the assosiated
- contacts in addition to the class itself
-
-* nmo:to:
- - For use cases where fts:match needs to be done against the assosiated
- contacts in addition to the class itself
-
-
-* nmo:sender:
- - ?
-
-* nmo:sentDate:
- - Used for sorting messages when displaying all messages (or rather the last N).
- - Domain index for nmo:Call used for linear call history.
-
-* nmo:receivedDate:
- - Secondary index for nmo:communicationChannel to display last N messages on
- a specific channel.
-
-* nmo:conversation:
- - Used for retrieving all messages of a specific conversation.
-
-* nmo:communicationChannel:
- - Used for displaying all conversations on a specific channel (for example,
- all conversations with a specific contact).
- - Secondary index on nmo:receivedDate
-
-* nmo:lastMessageDate:
- - Used for sorting the list of all channels by time of last message.
-
-* nmo:hasParticipant:
- - Used for retrieving the communication channel for a specific contact. Used
- when inserting new messages, for example.
-
-* maemo:localPhoneNumber:
- - For matching against the local part of the phone number
-
38-nmm:
* nmm:musicAlbum:
- Used for retrieving songs on an album.
@@ -91,12 +52,3 @@
* nie:title domainIndex for nmm:MusicPiece
- Used to improve performance of ORDER BY on nie:title
-
-40-mlo:
-* mlo:location:
- - Used for retrieving all content in some specific location
-
-* mlo:asPostalAddress:
-* mlo:asBoundingBox:
-* mlo:asGeoPoint:
- - For matching location into coordinates
diff --git a/src/ontologies/meson.build b/src/ontologies/meson.build
index 9a6c55507..8c93488b3 100644
--- a/src/ontologies/meson.build
+++ b/src/ontologies/meson.build
@@ -18,24 +18,10 @@ nepomuk = files(
'nepomuk/32-nco.ontology',
'nepomuk/33-nfo.description',
'nepomuk/33-nfo.ontology',
- 'nepomuk/34-nmo.description',
- 'nepomuk/34-nmo.ontology',
- 'nepomuk/35-ncal.description',
- 'nepomuk/35-ncal.ontology',
- 'nepomuk/36-scal.description',
- 'nepomuk/36-scal.ontology',
- 'nepomuk/37-nid3.description',
- 'nepomuk/37-nid3.ontology',
'nepomuk/38-nmm.description',
'nepomuk/38-nmm.ontology',
- 'nepomuk/39-mto.description',
- 'nepomuk/39-mto.ontology',
- 'nepomuk/40-mlo.description',
- 'nepomuk/40-mlo.ontology',
'nepomuk/41-mfo.description',
'nepomuk/41-mfo.ontology',
- 'nepomuk/89-mtp.description',
- 'nepomuk/89-mtp.ontology',
'nepomuk/90-tracker.description',
'nepomuk/90-tracker.ontology',
'nepomuk/92-slo.description',
diff --git a/src/ontologies/nepomuk/41-mfo.ontology b/src/ontologies/nepomuk/41-mfo.ontology
index 7ea5f9b62..9a12c273e 100644
--- a/src/ontologies/nepomuk/41-mfo.ontology
+++ b/src/ontologies/nepomuk/41-mfo.ontology
@@ -5,7 +5,6 @@
@prefix nie: <http://tracker.api.gnome.org/ontology/v3/nie#> .
@prefix nfo: <http://tracker.api.gnome.org/ontology/v3/nfo#> .
@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
-@prefix nmo: <http://tracker.api.gnome.org/ontology/v3/nmo#> .
@prefix mfo: <http://tracker.api.gnome.org/ontology/v3/mfo#> .
mfo: a tracker:Namespace, tracker:Ontology ;
@@ -20,14 +19,14 @@ mfo:FeedElement a rdfs:Class;
mfo:FeedChannel a rdfs:Class ;
tracker:notify true ;
rdfs:label "Feed channel" ;
- rdfs:comment "Represents feed channel transfer, typically a download of RSS or ATOM. It is also a
communication channel of Nepomuk Messaging Ontology so that feed sources could be treated as message sources"
;
- rdfs:subClassOf nmo:CommunicationChannel, mfo:FeedElement .
+ rdfs:comment "Represents feed channel transfer, typically a download of RSS or ATOM." ;
+ rdfs:subClassOf mfo:FeedElement .
mfo:FeedMessage a rdfs:Class ;
tracker:notify true ;
rdfs:label "Feed entry" ;
- rdfs:comment "Represents feed entry on top of Nepomuk Messaging Ontology's message. May have
enclosures attached and certain settings that allow deviation from feed channel's setup" ;
- rdfs:subClassOf nmo:Message, mfo:FeedElement .
+ rdfs:comment "Represents feed entry. May have enclosures attached and certain settings that allow
deviation from feed channel's setup" ;
+ rdfs:subClassOf mfo:FeedElement .
mfo:Enclosure a rdfs:Class ;
rdfs:label "Message enclosure" ;
diff --git a/src/ontologies/nepomuk/92-slo.description b/src/ontologies/nepomuk/92-slo.description
index b6c1e4484..4ce617342 100644
--- a/src/ontologies/nepomuk/92-slo.description
+++ b/src/ontologies/nepomuk/92-slo.description
@@ -1,8 +1,8 @@
@prefix dsc: <http://tracker.api.gnome.org/ontology/v3/dsc#> .
<virtual-ontology-uri:40-mlo.ontology> a dsc:Ontology ;
- dsc:title "Simplified Maemo Location Ontology (SLO) (experimental/for testing)" ;
- dsc:description "Simpler, faster, better ontology for locations and landmarks" ;
+ dsc:title "Simplified Maemo Location Ontology (SLO)" ;
+ dsc:description "Ontology for locations and landmarks" ;
dsc:author "Ivan Frade <ivan frade nokia com>" ;
dsc:editor "Ivan Frade <ivan frade nokia com>" ;
diff --git a/tests/functional-tests/distance.py b/tests/functional-tests/distance.py
index 746153b1c..9ad6ddd6b 100644
--- a/tests/functional-tests/distance.py
+++ b/tests/functional-tests/distance.py
@@ -39,9 +39,9 @@ class TestDistanceFunctions (fixtures.TrackerSparqlDirectTest):
for lat, log in POINT_COORDS:
insert = """
INSERT {
- <%s> a mlo:GeoPoint ;
- mlo:longitude %d ;
- mlo:latitude %d .
+ <%s> a slo:GeoLocation ;
+ slo:longitude %d ;
+ slo:latitude %d .
}
""" % ("point://test/point/" + str(self.counter), log, lat)
self.tracker.update(insert)
@@ -65,13 +65,13 @@ class TestDistanceFunctions (fixtures.TrackerSparqlDirectTest):
query_1_to_2 = """
SELECT xsd:integer(tracker:%s-distance(?lat1,?lat2,?lon1,?lon2))
WHERE {
- <point://test/point/%d> a mlo:GeoPoint ;
- mlo:latitude ?lat1 ;
- mlo:longitude ?lon1 .
+ <point://test/point/%d> a slo:GeoLocation ;
+ slo:latitude ?lat1 ;
+ slo:longitude ?lon1 .
- <point://test/point/%d> a mlo:GeoPoint ;
- mlo:latitude ?lat2 ;
- mlo:longitude ?lon2 .
+ <point://test/point/%d> a slo:GeoLocation ;
+ slo:latitude ?lat2 ;
+ slo:longitude ?lon2 .
}
""" % (sum_func, id1, id2)
result = self.tracker.query(query_1_to_2)
diff --git a/tests/libtracker-data/nie/data-1.ttl b/tests/libtracker-data/nie/data-1.ttl
index 995f0afe0..4834903ef 100644
--- a/tests/libtracker-data/nie/data-1.ttl
+++ b/tests/libtracker-data/nie/data-1.ttl
@@ -1,26 +1,5 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix xsl: <http://www.w3.org/1999/XSL/Transform#> .
-@prefix nid3: <http://tracker.api.gnome.org/ontology/v3/nid3#> .
-@prefix nfo: <http://tracker.api.gnome.org/ontology/v3/nfo#> .
-@prefix nmo: <http://tracker.api.gnome.org/ontology/v3/nmo#> .
@prefix nie: <http://tracker.api.gnome.org/ontology/v3/nie#> .
-@prefix exif: <http://www.kanzaki.com/ns/exif#> .
-@prefix nao: <http://tracker.api.gnome.org/ontology/v3/nao#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix protege: <http://protege.stanford.edu/system#> .
-@prefix dcterms: <http://purl.org/dc/terms/> .
-@prefix ncal: <http://tracker.api.gnome.org/ontology/v3/ncal#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
-@prefix pimo: <http://www.semanticdesktop.org/ontologies/2007/11/01/pimo#> .
-@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
-@prefix tmo: <http://www.semanticdesktop.org/ontologies/2008/05/20/tmo#> .
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-@prefix nco: <http://tracker.api.gnome.org/ontology/v3/nco#> .
-@prefix nexif: <http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#> .
_:a1 a nie:DataObject .
diff --git a/tests/libtracker-data/nie/filter-description-1.out
b/tests/libtracker-data/nie/filter-description-1.out
index a848b7490..0d8e5a3a1 100644
--- a/tests/libtracker-data/nie/filter-description-1.out
+++ b/tests/libtracker-data/nie/filter-description-1.out
@@ -1,37 +1,16 @@
"Airport, Bus stop, Harbour, Railway Station, Rest area"
-"Airport, Bus stop, Harbour, Railway Station, Rest area"
-"Amusement park, Cinema, Concert hall, Night club"
"Amusement park, Cinema, Concert hall, Night club"
"Bank, Factory, Office"
-"Bank, Factory, Office"
-"Bowling, Golf course, Ice hockey hall, Stadium"
"Bowling, Golf course, Ice hockey hall, Stadium"
"Camping site, Fishing place, Hunting, National park, Playground"
-"Camping site, Fishing place, Hunting, National park, Playground"
-"Church, Mosque"
"Church, Mosque"
"City, City center, Town"
-"City, City center, Town"
-"Fast food, Restaurant, Café, Bar"
"Fast food, Restaurant, Café, Bar"
-"Fields are sent as independent samples. The field is indicated (on a per sample basis"
-"Fields are sent as independent samples. The field is indicated (on a per sample basis)"
"Hotel, Camping site"
-"Hotel, Camping site"
-"Internet Access Point, Public Telephone, Wireless LAN Hot Spot"
"Internet Access Point, Public Telephone, Wireless LAN Hot Spot"
-"Line interleaved frames with the Lower field on the first line."
-"Line interleaved Frames with the Upper field on the first line."
"Market Place, Pharmacy, Shop, Shopping Center"
-"Market Place, Pharmacy, Shop, Shopping Center"
-"Monument, Mountain top, Museum"
"Monument, Mountain top, Museum"
"My home, My friends home, Fathers summer cottage, Childs school"
-"My home, My friends home, Fathers summer cottage, Childs school"
-"School, College"
"School, College"
"stringly data for nie:description"
-"The content may contain a mix of interlaced and progressive modes."
-"The content may contain a mix of interlaced modes"
-"Tourist information office, Government office, Library, Post office, Hospital, Police "
"Tourist information office, Government office, Library, Post office, Hospital, Police "
diff --git a/tests/libtracker-data/nie/filter-identifier-1.out
b/tests/libtracker-data/nie/filter-identifier-1.out
index 593fe1e8f..cf941f70a 100644
--- a/tests/libtracker-data/nie/filter-identifier-1.out
+++ b/tests/libtracker-data/nie/filter-identifier-1.out
@@ -1,21 +1 @@
-"0x1002"
-"0x1003"
-"0x1004"
-"0x1005"
-"0x1008"
-"12000"
-"15000"
-"18000"
-"21000"
-"24000"
-"27000"
-"3000"
-"30000"
-"33000"
-"36000"
-"39000"
-"42000"
-"45000"
-"6000"
-"9000"
"stringly data for nie:identifier"
diff --git a/tests/libtracker-data/nie/filter-title-1.out b/tests/libtracker-data/nie/filter-title-1.out
index a03602ae7..8384d96bc 100644
--- a/tests/libtracker-data/nie/filter-title-1.out
+++ b/tests/libtracker-data/nie/filter-title-1.out
@@ -1,36 +1,16 @@
"Accommodation"
-"Accommodation"
-"Business"
"Business"
"Communication"
-"Communication"
-"Draft"
-"Educational institute"
"Educational institute"
"Entertainment"
-"Entertainment"
-"Food & Beverage"
"Food & Beverage"
"Geographical area"
-"Geographical area"
-"Inbox"
-"MyFolder"
-"Outbox"
-"Outdoor activities"
"Outdoor activities"
"People"
-"People"
-"Public service"
"Public service"
"Religious places"
-"Religious places"
-"Sent"
-"Shopping"
"Shopping"
"Sightseeing"
-"Sightseeing"
-"Sports"
"Sports"
"stringly data for nie:title"
"Transport"
-"Transport"
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index edf021c36..79760abd0 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -67,24 +67,6 @@ const TestInfo nie_tests[] = {
{ NULL, NULL }
};
-const TestInfo nmo_tests[] = {
- { "nmo/filter-charset-1", "nmo/data-1" },
- { "nmo/filter-contentdescription-1", "nmo/data-1" },
- { "nmo/filter-contentid-1", "nmo/data-1" },
- { "nmo/filter-contenttransferencoding-1", "nmo/data-1" },
- { "nmo/filter-headername-1", "nmo/data-1" },
- { "nmo/filter-headervalue-1", "nmo/data-1" },
- { "nmo/filter-isanswered-1", "nmo/data-1" },
- { "nmo/filter-isdeleted-1", "nmo/data-1" },
- { "nmo/filter-isdraft-1", "nmo/data-1" },
- { "nmo/filter-isflagged-1", "nmo/data-1" },
- { "nmo/filter-isread-1", "nmo/data-1" },
- { "nmo/filter-isrecent-1", "nmo/data-1" },
- { "nmo/filter-messageid-1", "nmo/data-1" },
- { "nmo/filter-messagesubject-1", "nmo/data-1" },
- { NULL, NULL }
-};
-
static void
query_helper (TrackerDataManager *manager, const gchar *query_filename, const gchar *results_filename)
{
@@ -333,14 +315,6 @@ main (int argc, char **argv)
g_free (testpath);
}
- for (i = 0; nmo_tests[i].test_name; i++) {
- gchar *testpath;
-
- testpath = g_strconcat ("/libtracker-data/nmo/", nmo_tests[i].test_name, NULL);
- g_test_add (testpath, TestInfo, &nmo_tests[i], setup, test_query, teardown);
- g_free (testpath);
- }
-
/* run tests */
result = g_test_run ();
diff --git a/tests/libtracker-sparql/tracker-fd-test.c b/tests/libtracker-sparql/tracker-fd-test.c
index 3c260ccae..8a0b2e92e 100644
--- a/tests/libtracker-sparql/tracker-fd-test.c
+++ b/tests/libtracker-sparql/tracker-fd-test.c
@@ -296,7 +296,7 @@ test_tracker_sparql_update_fast_small (DataFixture *fixture,
gconstpointer user_data)
{
GError *error = NULL;
- const gchar *query = "INSERT { _:x a nmo:Message }";
+ const gchar *query = "INSERT { _:x a nfo:Image }";
tracker_sparql_connection_update (connection, query, 0, NULL, &error);
@@ -315,7 +315,7 @@ test_tracker_sparql_update_fast_large (DataFixture *fixture,
memset (lots, 'a', LONG_NAME_SIZE);
lots[LONG_NAME_SIZE-1] = '\0';
- query = g_strdup_printf ("INSERT { _:x a nmo:Message; nao:identifier \"%s\" }", lots);
+ query = g_strdup_printf ("INSERT { _:x a nfo:Image; nao:identifier \"%s\" }", lots);
tracker_sparql_connection_update (connection, query, 0, NULL, &error);
@@ -346,12 +346,12 @@ static void
test_tracker_sparql_update_array_async (DataFixture *fixture,
gconstpointer user_data)
{
- const gchar *queries[6] = { "INSERT { _:a a nmo:Message }",
- "INSERT { _:b a nmo:Message }",
- "INSERT { _:c a nmo:Message }",
- "INSERT { _:d syntax error a nmo:Message }",
- "INSERT { _:e a nmo:Message }",
- "INSERT { _:f a nmo:Message }" };
+ const gchar *queries[6] = { "INSERT { _:a a nfo:Image }",
+ "INSERT { _:b a nfo:Image }",
+ "INSERT { _:c a nfo:Image }",
+ "INSERT { _:d syntax error a nfo:Image }",
+ "INSERT { _:e a nfo:Image }",
+ "INSERT { _:f a nfo:Image }" };
GMainLoop *main_loop;
AsyncData *data;
@@ -395,7 +395,7 @@ test_tracker_sparql_update_blank_fast_small (DataFixture *fixture,
gconstpointer user_data)
{
GError *error = NULL;
- const gchar *query = "INSERT { _:x a nmo:Message }";
+ const gchar *query = "INSERT { _:x a nfo:Image }";
GVariant *results;
results = tracker_sparql_connection_update_blank (connection, query, 0, NULL, &error);
@@ -419,7 +419,7 @@ test_tracker_sparql_update_blank_fast_large (DataFixture *fixture,
memset (lots, 'a', LONG_NAME_SIZE);
lots[LONG_NAME_SIZE-1] = '\0';
- query = g_strdup_printf ("INSERT { _:x a nmo:Message; nao:identifier \"%s\" }", lots);
+ query = g_strdup_printf ("INSERT { _:x a nfo:Image; nao:identifier \"%s\" }", lots);
results = tracker_sparql_connection_update_blank (connection, query, 0, NULL, &error);
@@ -453,7 +453,7 @@ test_tracker_sparql_update_blank_fast_no_blanks (DataFixture *fixture,
gconstpointer user_data)
{
GError *error = NULL;
- const gchar *query = "INSERT { <urn:not_blank> a nmo:Message }";
+ const gchar *query = "INSERT { <urn:not_blank> a nfo:Image }";
GVariant *results;
results = tracker_sparql_connection_update_blank (connection, query, 0, NULL, &error);
@@ -469,7 +469,7 @@ test_tracker_batch_sparql_update_fast (DataFixture *fixture,
gconstpointer user_data)
{
/* GError *error = NULL; */
- /* const gchar *query = "INSERT { _:x a nmo:Message }"; */
+ /* const gchar *query = "INSERT { _:x a nfo:Image }"; */
/* FIXME: batch update is missing so far
* tracker_sparql_connection_batch_update (connection, query, NULL, &error); */
@@ -597,7 +597,7 @@ static void
test_tracker_sparql_update_async (DataFixture *fixture,
gconstpointer user_data)
{
- const gchar *query = "INSERT { _:x a nmo:Message }";
+ const gchar *query = "INSERT { _:x a nfo:Image }";
GMainLoop *main_loop;
AsyncData *data;
@@ -640,7 +640,7 @@ test_tracker_sparql_update_async_cancel (DataFixture *fixture,
gconstpointer user_data)
{
GCancellable *cancellable = g_cancellable_new ();
- const gchar *query = "INSERT { _:x a nmo:Message }";
+ const gchar *query = "INSERT { _:x a nfo:Image }";
GMainLoop *main_loop;
main_loop = g_main_loop_new (NULL, FALSE);
@@ -679,7 +679,7 @@ static void
test_tracker_sparql_update_blank_async (DataFixture *fixture,
gconstpointer user_data)
{
- const gchar *query = "INSERT { _:x a nmo:Message }";
+ const gchar *query = "INSERT { _:x a nfo:Image }";
GMainLoop *main_loop;
AsyncData *data;
diff --git a/utils/data-generators/cc/ontology_prefixes.py b/utils/data-generators/cc/ontology_prefixes.py
index 1e0294b33..d40a3ea15 100644
--- a/utils/data-generators/cc/ontology_prefixes.py
+++ b/utils/data-generators/cc/ontology_prefixes.py
@@ -4,7 +4,6 @@
ontology_prefixes = """
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#>.
-@prefix nid3: <http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#>.
@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#>.
@prefix nco: <http://www.semanticdesktop.org/ontologies/2007/03/22/nco#>.
@prefix nmo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#>.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
