[tracker/anonymous-file-nodes] Align together insert_open/close() in the MP3 and vorbis extractors.

[Carlos Garnacho <carlosg src gnome org>]

commit 8a391a69de953f91612942539b98890ce4b4e8ca
Author: Carlos Garnacho <carlos lanedo com>
Date:   Wed Feb 3 16:07:21 2010 +0100

    Align together insert_open/close() in the MP3 and vorbis extractors.
    
    This is more readable than having the closing function called inside
    the next if clause.

 src/tracker-extract/tracker-extract-mp3.c    |   11 +++++------
 src/tracker-extract/tracker-extract-vorbis.c |    8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 8e4d67a..72e8e7e 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -2000,10 +2000,9 @@ extract_mp3 (const gchar          *uri,
 		tracker_sparql_builder_predicate (preupdate, "nmm:albumTitle");
 		tracker_sparql_builder_object_unvalidated (preupdate, md.album);
 
-		if (md.track_count > 0) {
-
-			tracker_sparql_builder_insert_close (preupdate);
+		tracker_sparql_builder_insert_close (preupdate);
 
+		if (md.track_count > 0) {
 			tracker_sparql_builder_delete_open (preupdate, NULL);
 			tracker_sparql_builder_subject_iri (preupdate, md.album_uri);
 			tracker_sparql_builder_predicate (preupdate, "nmm:albumTrackCount");
@@ -2016,13 +2015,13 @@ extract_mp3 (const gchar          *uri,
 			tracker_sparql_builder_where_close (preupdate);
 
 			tracker_sparql_builder_insert_open (preupdate, NULL);
-			tracker_sparql_builder_subject_iri (preupdate, md.album_uri);
 
+			tracker_sparql_builder_subject_iri (preupdate, md.album_uri);
 			tracker_sparql_builder_predicate (preupdate, "nmm:albumTrackCount");
 			tracker_sparql_builder_object_int64 (preupdate, md.track_count);
-		}
 
-		tracker_sparql_builder_insert_close (preupdate);
+			tracker_sparql_builder_insert_close (preupdate);
+		}
 	}
 
 	tracker_sparql_builder_predicate (metadata, "a");
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index 1e70cff..717d34d 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -178,9 +178,6 @@ extract_vorbis (const char *uri,
 		tracker_sparql_builder_insert_close (preupdate);
 
 		if (vorbis_data.trackcount) {
-
-			tracker_sparql_builder_insert_close (preupdate);
-
 			tracker_sparql_builder_delete_open (preupdate, NULL);
 			tracker_sparql_builder_subject_iri (preupdate, album_uri);
 			tracker_sparql_builder_predicate (preupdate, "nmm:albumTrackCount");
@@ -193,10 +190,13 @@ extract_vorbis (const char *uri,
 			tracker_sparql_builder_where_close (preupdate);
 
 			tracker_sparql_builder_insert_open (preupdate, preupdate);
-			tracker_sparql_builder_subject_iri (preupdate, md.album_uri);
 
+			tracker_sparql_builder_subject_iri (preupdate, md.album_uri);
 			tracker_sparql_builder_predicate (metadata, "nmm:albumTrackCount");
 			tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.trackcount);
+
+			tracker_sparql_builder_insert_close (preupdate);
+
 			g_free (vorbis_data.trackcount);
 		}