summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/ontologies/38-nmm.ontology7
-rw-r--r--data/ontologies/Indices.list6
-rw-r--r--examples/libtracker-extract/tracker-extract-mockup.c3
-rw-r--r--src/tracker-extract/tracker-extract-flac.c3
-rw-r--r--src/tracker-extract/tracker-extract-gstreamer.c3
-rw-r--r--src/tracker-extract/tracker-extract-gupnp-dlna.c3
-rw-r--r--src/tracker-extract/tracker-extract-libxine.c3
-rw-r--r--src/tracker-extract/tracker-extract-mp3.c3
-rw-r--r--src/tracker-extract/tracker-extract-totem.c3
-rw-r--r--src/tracker-extract/tracker-extract-vorbis.c3
10 files changed, 35 insertions, 2 deletions
diff --git a/data/ontologies/38-nmm.ontology b/data/ontologies/38-nmm.ontology
index eb6356d6d..3c4b0f781 100644
--- a/data/ontologies/38-nmm.ontology
+++ b/data/ontologies/38-nmm.ontology
@@ -13,7 +13,7 @@
nmm: a tracker:Namespace, tracker:Ontology ;
tracker:prefix "nmm" ;
- nao:lastModified "2010-10-22T13:15:00Z" .
+ nao:lastModified "2010-11-03T15:01:00Z" .
nmm:MusicPiece a rdfs:Class ;
rdfs:label "Music" ;
@@ -28,6 +28,7 @@ nmm:SynchronizedText a rdfs:Class ;
nmm:MusicAlbum a rdfs:Class ;
rdfs:label "Music album" ;
tracker:notify true ;
+ tracker:domainIndex nie:title ;
rdfs:subClassOf nfo:MediaList .
nmm:Video a rdfs:Class ;
@@ -55,6 +56,7 @@ nmm:artistName a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain nmm:Artist ;
rdfs:range xsd:string ;
+ tracker:indexed true ;
tracker:fulltextIndexed true ;
tracker:fulltextNoLimit true ;
tracker:weight 6 .
@@ -166,11 +168,12 @@ nmm:albumTrackCount a rdf:Property ;
nmm:albumTitle a rdf:Property ;
rdfs:label "Title" ;
- rdfs:comment "The title of the album" ;
+ rdfs:comment "nmm:albumTitle is deprecated, use nie:title instead, extractors still need updating" ;
rdfs:subPropertyOf nie:title ;
nrl:maxCardinality 1 ;
rdfs:domain nmm:MusicAlbum ;
rdfs:range xsd:string ;
+ nao:deprecated true ;
tracker:fulltextIndexed true ;
tracker:fulltextNoLimit true ;
tracker:weight 6 .
diff --git a/data/ontologies/Indices.list b/data/ontologies/Indices.list
index d0c4d21c8..f50a19c17 100644
--- a/data/ontologies/Indices.list
+++ b/data/ontologies/Indices.list
@@ -69,6 +69,12 @@
- Used for retrieving songs by a performer.
- Used in cases where fts:match is done against the performer as well as the song.
+* nmm:artistName:
+ - Used to improve performance of ORDER BY for music team queries
+
+* nie:title domainIndex for nmm:MusicAlbum
+ - Used to improve performance of ORDER BY on nie:title
+
* nie:title domainIndex for nmm:MusicPiece
- Used to improve performance of ORDER BY on nie:title
diff --git a/examples/libtracker-extract/tracker-extract-mockup.c b/examples/libtracker-extract/tracker-extract-mockup.c
index 0d82f38be..e5ca6b69a 100644
--- a/examples/libtracker-extract/tracker-extract-mockup.c
+++ b/examples/libtracker-extract/tracker-extract-mockup.c
@@ -202,6 +202,9 @@ extract_mockup (const gchar *uri,
tracker_sparql_builder_subject_iri (preupdate, album_uri);
tracker_sparql_builder_predicate (preupdate, "a");
tracker_sparql_builder_object (preupdate, "nmm:MusicAlbum");
+ /* FIXME: nmm:albumTitle is now deprecated
+ * tracker_sparql_builder_predicate (preupdate, "nie:title");
+ */
tracker_sparql_builder_predicate (preupdate, "nmm:albumTitle");
tracker_sparql_builder_object_unvalidated (preupdate, album);
tracker_sparql_builder_insert_close (preupdate);
diff --git a/src/tracker-extract/tracker-extract-flac.c b/src/tracker-extract/tracker-extract-flac.c
index 96fdd8ddf..7938be909 100644
--- a/src/tracker-extract/tracker-extract-flac.c
+++ b/src/tracker-extract/tracker-extract-flac.c
@@ -238,6 +238,9 @@ extract_flac (const gchar *uri,
tracker_sparql_builder_subject_iri (preupdate, album_uri);
tracker_sparql_builder_predicate (preupdate, "a");
tracker_sparql_builder_object (preupdate, "nmm:MusicAlbum");
+ /* FIXME: nmm:albumTitle is now deprecated
+ * tracker_sparql_builder_predicate (preupdate, "nie:title");
+ */
tracker_sparql_builder_predicate (preupdate, "nmm:albumTitle");
tracker_sparql_builder_object_unvalidated (preupdate, fd.album);
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 889523111..02c9f29bb 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -608,6 +608,9 @@ extract_metadata (MetadataExtractor *extractor,
tracker_sparql_builder_subject_iri (preupdate, album_uri);
tracker_sparql_builder_predicate (preupdate, "a");
tracker_sparql_builder_object (preupdate, "nmm:MusicAlbum");
+ /* FIXME: nmm:albumTitle is now deprecated
+ * tracker_sparql_builder_predicate (preupdate, "nie:title");
+ */
tracker_sparql_builder_predicate (preupdate, "nmm:albumTitle");
tracker_sparql_builder_object_unvalidated (preupdate, s);
diff --git a/src/tracker-extract/tracker-extract-gupnp-dlna.c b/src/tracker-extract/tracker-extract-gupnp-dlna.c
index 7d12cd03b..93214d394 100644
--- a/src/tracker-extract/tracker-extract-gupnp-dlna.c
+++ b/src/tracker-extract/tracker-extract-gupnp-dlna.c
@@ -513,6 +513,9 @@ extract_metadata (MetadataExtractor *extractor,
tracker_sparql_builder_subject_iri (preupdate, album_uri);
tracker_sparql_builder_predicate (preupdate, "a");
tracker_sparql_builder_object (preupdate, "nmm:MusicAlbum");
+ /* FIXME: nmm:albumTitle is now deprecated
+ * tracker_sparql_builder_predicate (preupdate, "nie:title");
+ */
tracker_sparql_builder_predicate (preupdate, "nmm:albumTitle");
tracker_sparql_builder_object_unvalidated (preupdate, s);
diff --git a/src/tracker-extract/tracker-extract-libxine.c b/src/tracker-extract/tracker-extract-libxine.c
index 27ab64227..19e62e37b 100644
--- a/src/tracker-extract/tracker-extract-libxine.c
+++ b/src/tracker-extract/tracker-extract-libxine.c
@@ -121,6 +121,9 @@ tracker_extract_xine (const gchar *uri,
tracker_sparql_builder_subject_iri (preupdate, canonical_uri);
tracker_sparql_builder_predicate (preupdate, "a");
tracker_sparql_builder_object (preupdate, "nmm:MusicAlbum");
+ /* FIXME: nmm:albumTitle is now deprecated
+ * tracker_sparql_builder_predicate (preupdate, "nie:title");
+ */
tracker_sparql_builder_predicate (preupdate, "nmm:albumTitle");
tracker_sparql_builder_object_unvalidated (preupdate, album);
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index e48e79799..36348e67c 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -2180,6 +2180,9 @@ extract_mp3 (const gchar *uri,
tracker_sparql_builder_subject_iri (preupdate, md.album_uri);
tracker_sparql_builder_predicate (preupdate, "a");
tracker_sparql_builder_object (preupdate, "nmm:MusicAlbum");
+ /* FIXME: nmm:albumTitle is now deprecated
+ * tracker_sparql_builder_predicate (preupdate, "nie:title");
+ */
tracker_sparql_builder_predicate (preupdate, "nmm:albumTitle");
tracker_sparql_builder_object_unvalidated (preupdate, md.album);
diff --git a/src/tracker-extract/tracker-extract-totem.c b/src/tracker-extract/tracker-extract-totem.c
index 4e90b59e3..306eb53cf 100644
--- a/src/tracker-extract/tracker-extract-totem.c
+++ b/src/tracker-extract/tracker-extract-totem.c
@@ -141,6 +141,9 @@ extract_totem (const gchar *uri,
tracker_sparql_builder_subject_iri (preupdate, album_uri);
tracker_sparql_builder_predicate (preupdate, "a");
tracker_sparql_builder_object (preupdate, "nmm:MusicAlbum");
+ /* FIXME: nmm:albumTitle is now deprecated
+ * tracker_sparql_builder_predicate (preupdate, "nie:title");
+ */
tracker_sparql_builder_predicate (preupdate, "nmm:albumTitle");
tracker_sparql_builder_object_unvalidated (preupdate, album);
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index 69987954b..9a4022bf0 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -192,6 +192,9 @@ extract_vorbis (const char *uri,
tracker_sparql_builder_subject_iri (preupdate, uri);
tracker_sparql_builder_predicate (preupdate, "a");
tracker_sparql_builder_object (preupdate, "nmm:MusicAlbum");
+ /* FIXME: nmm:albumTitle is now deprecated
+ * tracker_sparql_builder_predicate (preupdate, "nie:title");
+ */
tracker_sparql_builder_predicate (preupdate, "nmm:albumTitle");
tracker_sparql_builder_object_unvalidated (preupdate, vd.album);
tracker_sparql_builder_insert_close (preupdate);