[tracker] Use nie:title instead of nmm:albumTitle

[Marinus Schraal <mschraal src gnome org>]

commit f482618a07fbe564e887112dab7ad03034576b26
Author: Marinus Schraal <mschraal src gnome org>
Date:   Sat Nov 12 13:49:40 2016 +0100

    Use nie:title instead of nmm:albumTitle
    
    nmm:albumTitle is deprecated
    
    https://bugzilla.gnome.org/show_bug.cgi?id=773697

 src/libtracker-extract/tracker-resource-helpers.c |    2 +-
 src/libtracker-miner/tracker-media-art.c          |    2 +-
 src/ontologies/38-nmm.ontology                    |    2 +-
 tests/functional-tests/01-insertion.py            |    6 +++---
 tests/functional-tests/601-applications-sync.py   |    4 ++--
 utils/data-generators/cc/nmm.py                   |    3 +--
 6 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/src/libtracker-extract/tracker-resource-helpers.c 
b/src/libtracker-extract/tracker-resource-helpers.c
index cde1a8c..485cde5 100644
--- a/src/libtracker-extract/tracker-resource-helpers.c
+++ b/src/libtracker-extract/tracker-resource-helpers.c
@@ -276,7 +276,7 @@ tracker_extract_new_music_album_disc (const char      *album_title,
        album = tracker_resource_new (tmp_album_uri);
 
        tracker_resource_set_uri (album, "rdf:type", "nmm:MusicAlbum");
-       tracker_resource_set_string (album, "nmm:albumTitle", album_title);
+       tracker_resource_set_string (album, "nie:title", album_title);
 
        if (album_artist)
                tracker_resource_add_relation (album, "nmm:albumArtist", album_artist);
diff --git a/src/libtracker-miner/tracker-media-art.c b/src/libtracker-miner/tracker-media-art.c
index cbba55d..0a14c2e 100644
--- a/src/libtracker-miner/tracker-media-art.c
+++ b/src/libtracker-miner/tracker-media-art.c
@@ -195,7 +195,7 @@ on_timer_callback (gpointer data)
        tracker_sparql_connection_query_async (connection,
                                               "SELECT ?title nmm:artistName (?artist) WHERE { "
                                               "  ?mpiece nmm:musicAlbum ?album . "
-                                              "  ?album nmm:albumTitle ?title . "
+                                              "  ?album nie:title ?title . "
                                               "  OPTIONAL { ?album nmm:albumArtist ?artist } "
                                               "}",
                                               NULL,
diff --git a/src/ontologies/38-nmm.ontology b/src/ontologies/38-nmm.ontology
index 0137af2..0846aa7 100644
--- a/src/ontologies/38-nmm.ontology
+++ b/src/ontologies/38-nmm.ontology
@@ -188,7 +188,7 @@ nmm:artwork a rdf:Property ;
 
 nmm:albumTitle a rdf:Property ;
        rdfs:label "Title" ;
-       rdfs:comment "nmm:albumTitle is deprecated, use nie:title instead, extractors still need updating" ;
+       rdfs:comment "nmm:albumTitle is deprecated, use nie:title instead" ;
        rdfs:subPropertyOf nie:title ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:MusicAlbum ;
diff --git a/tests/functional-tests/01-insertion.py b/tests/functional-tests/01-insertion.py
index eec6aef..33fd17f 100755
--- a/tests/functional-tests/01-insertion.py
+++ b/tests/functional-tests/01-insertion.py
@@ -130,7 +130,7 @@ class TrackerStoreInsertionTests (CommonTrackerStoreTest):
                     nmm:artistName 'John Lennon' .
 
                 <urn:uuid:123123123> a nmm:MusicAlbum ;
-                    nmm:albumTitle 'Imagine' .
+                    nie:title 'Imagine' .
 
                 <file:///a/b/c/imagine.mp3> a nmm:MusicPiece, nfo:FileDataObject;
                     nfo:fileName 'imagine.mp3';
@@ -158,7 +158,7 @@ class TrackerStoreInsertionTests (CommonTrackerStoreTest):
                         nfo:fileName ?filename.
 
                     ?x nmm:artistName ?artist .
-                    ?y nmm:albumTitle ?album.
+                    ?y nie:title ?album.
                     }
                     """
                 result = self.tracker.query(QUERY)
@@ -687,7 +687,7 @@ class TrackerStoreDeleteTests (CommonTrackerStoreTest):
                 self.tracker.update ("""
                 INSERT {
                    <test://instance-delete-02> a nmm:MusicAlbum;
-                           nmm:albumTitle '06_Album_delete'.
+                           nie:title '06_Album_delete'.
                 }
                 """)
 
diff --git a/tests/functional-tests/601-applications-sync.py b/tests/functional-tests/601-applications-sync.py
index c3747c6..2b32a72 100755
--- a/tests/functional-tests/601-applications-sync.py
+++ b/tests/functional-tests/601-applications-sync.py
@@ -90,8 +90,8 @@ class TrackerSyncApplicationTests (CommonTrackerApplicationTest):
                      nie:isStoredAs          _:x
         }
 
-        INSERT { <urn:album:SinCos> a              nmm:MusicAlbum;
-                                    nmm:albumTitle 'SinCos'
+        INSERT { <urn:album:SinCos> a         nmm:MusicAlbum;
+                                    nie:title 'SinCos'
         }
 
         INSERT { <urn:artist:AbBaby> a              nmm:Artist;
diff --git a/utils/data-generators/cc/nmm.py b/utils/data-generators/cc/nmm.py
index 4f73b1d..d670821 100644
--- a/utils/data-generators/cc/nmm.py
+++ b/utils/data-generators/cc/nmm.py
@@ -124,8 +124,7 @@ def generateMusicAlbumDisc(index):
 ####################################################################################
 nmm_MusicAlbum = '''
 <%(album_uri)s> a nmm:MusicAlbum ;
-    nie:title        "%(album_name)s" ;
-    nmm:albumTitle   "%(album_name)s" .
+    nie:title        "%(album_name)s" .
 '''
 def generateAlbum(index):
   me = 'nmm#MusicAlbum'