[tracker] Quick fixes in gstreamer extractor to produce valid SparQL

[Ivan Frade <ifrade src gnome org>]

commit 95be611678160fe5259715f01381073c069efaa9
Author: Ivan Frade <ivan frade nokia com>
Date:   Thu Dec 10 18:27:49 2009 +0200

    Quick fixes in gstreamer extractor to produce valid SparQL
    
    nmm:setNumber, and nfo:genre where set in the wrong object
    nmm:performer (a property) was used as class
    
    Disabled the performer logic. We need to revamp this sparQL generation anyway.

 src/tracker-extract/tracker-extract-gstreamer.c |   24 ++++++++++++----------
 1 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 5c032d3..1080e4e 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -479,13 +479,13 @@ extract_metadata (MetadataExtractor      *extractor,
 				tracker_sparql_builder_subject_iri (metadata, canonical_uri);
 				tracker_sparql_builder_predicate (metadata, "a");
 				tracker_sparql_builder_object (metadata, "nmm:Artist");
-
+				/*
 				if (extractor->mime == EXTRACT_MIME_AUDIO) {
 					tracker_sparql_builder_object (metadata, "nmm:performer");
 				} else {
 					tracker_sparql_builder_object (metadata, "nmm:leadActor");
 				}
-
+				*/
 				tracker_sparql_builder_predicate (metadata, "nmm:artistName");
 				tracker_sparql_builder_object_unvalidated (metadata, s);
 
@@ -503,12 +503,13 @@ extract_metadata (MetadataExtractor      *extractor,
 				tracker_sparql_builder_predicate (metadata, "a");
 				tracker_sparql_builder_object (metadata, "nmm:Artist");
 
+				/*
 				if (extractor->mime == EXTRACT_MIME_AUDIO) {
 					tracker_sparql_builder_object (metadata, "nmm:composer");
 				} else {
 					tracker_sparql_builder_object (metadata, "nmm:director");
 				}
-
+				*/
 				tracker_sparql_builder_predicate (metadata, "nmm:artistName");
 				tracker_sparql_builder_object_unvalidated (metadata, s);
 
@@ -516,13 +517,6 @@ extract_metadata (MetadataExtractor      *extractor,
 				g_free (s);
 			}
 
-			s = NULL;
-			gst_tag_list_get_string (extractor->tagcache, GST_TAG_GENRE, &s);
-			if (s && strcmp (s, "Unknown") != 0) {
-				tracker_sparql_builder_predicate (metadata, "nfo:genre");
-				tracker_sparql_builder_object_unvalidated (metadata, s);
-			}
-			g_free (s);
 		}
 
 		if (extractor->mime == EXTRACT_MIME_AUDIO) {
@@ -539,6 +533,7 @@ extract_metadata (MetadataExtractor      *extractor,
 				tracker_sparql_builder_predicate (metadata, "nmm:albumTitle");
 				tracker_sparql_builder_object_unvalidated (metadata, s);
 				add_uint_gst_tag (metadata, urn, "nmm:albumTrackCount", extractor->tagcache, GST_TAG_TRACK_COUNT);
+				add_uint_gst_tag (metadata, urn, "nmm:setNumber", extractor->tagcache, GST_TAG_ALBUM_VOLUME_NUMBER);
 				*album = s;
 
 				g_free (urn);
@@ -557,6 +552,14 @@ extract_metadata (MetadataExtractor      *extractor,
 			tracker_sparql_builder_object (metadata, "nfo:Image");
 		}
 
+		s = NULL;
+		gst_tag_list_get_string (extractor->tagcache, GST_TAG_GENRE, &s);
+		if (s && strcmp (s, "Unknown") != 0) {
+			tracker_sparql_builder_predicate (metadata, "nfo:genre");
+			tracker_sparql_builder_object_unvalidated (metadata, s);
+		}
+		g_free (s);
+
 		add_string_gst_tag (metadata, uri, "nie:title", extractor->tagcache, GST_TAG_TITLE);
 		add_string_gst_tag (metadata, uri, "nie:copyright", extractor->tagcache, GST_TAG_COPYRIGHT);
 		add_string_gst_tag (metadata, uri, "nie:license", extractor->tagcache, GST_TAG_LICENSE);
@@ -576,7 +579,6 @@ extract_metadata (MetadataExtractor      *extractor,
 			}
 
 			add_uint_gst_tag   (metadata, uri, "nmm:trackNumber", extractor->tagcache, GST_TAG_TRACK_NUMBER);
-			add_uint_gst_tag   (metadata, uri, "nmm:setNumber", extractor->tagcache, GST_TAG_ALBUM_VOLUME_NUMBER);
 
 			add_double_gst_tag (metadata, uri, "nfo:gain", extractor->tagcache, GST_TAG_TRACK_GAIN);
 			add_double_gst_tag (metadata, uri, "nfo:peakGain", extractor->tagcache, GST_TAG_TRACK_PEAK);