tracker r2224 - in branches/indexer-split: . src/libtracker-common src/tracker-extract src/tracker-indexer

[mottela svn gnome org]

Author: mottela
Date: Thu Sep 11 20:52:44 2008
New Revision: 2224
URL: http://svn.gnome.org/viewvc/tracker?rev=2224&view=rev

Log:
Small fixes to the extractors

Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-common/tracker-type-utils.c
   branches/indexer-split/src/tracker-extract/tracker-extract-jpeg.c
   branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c

Modified: branches/indexer-split/src/libtracker-common/tracker-type-utils.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-type-utils.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-type-utils.c	Thu Sep 11 20:52:44 2008
@@ -41,7 +41,6 @@
 static gboolean
 is_int (const gchar *str)
 {
-	gboolean valid;
 	gint     i, len;
 
 	if (!str || str[0] == '\0') {

Modified: branches/indexer-split/src/tracker-extract/tracker-extract-jpeg.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-jpeg.c	(original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-jpeg.c	Thu Sep 11 20:52:44 2008
@@ -269,9 +269,9 @@
 				len = marker->data_length;
 
 				if (strncmp (XMP_NAMESPACE, str, XMP_NAMESPACE_LENGTH) == 0) {
-					read_xmp (str + XMP_NAMESPACE_LENGTH, 
-						  len - XMP_NAMESPACE_LENGTH,
-						  metadata);
+					tracker_read_xmp (str + XMP_NAMESPACE_LENGTH, 
+							  len - XMP_NAMESPACE_LENGTH,
+							  metadata);
 				}
 #endif /* HAVE_EXEMPI */
 				break;

Modified: branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c	(original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c	Thu Sep 11 20:52:44 2008
@@ -80,8 +80,8 @@
 	 {"Copyright", "File:Copyright", FALSE},
 	 {"License", "File:License", FALSE},
 	 {"Organization", "File:Organization", FALSE},
-	 {"Location", "File:Location", FALSE},
-	 {"Publisher", "File:Publisher", FALSE},
+	 {"Location", "DC:Location", FALSE},
+	 {"Publisher", "DC:Publishers", FALSE},
 	 {NULL, NULL, FALSE},
 };
 
@@ -526,13 +526,13 @@
 		{"TDRC", "Audio:ReleaseDate"},
 		{"TCON", "Audio:Genre"},
 		{"TIT1", "Audio:Genre"},
-		{"TENC", "File:Publisher"},
+		{"TENC", "DC:Publishers"},
 		{"TEXT", "Audio:Lyrics"},
 		{"TPE1", "Audio:Artist"},
 		{"TPE2", "Audio:Artist"},
 		{"TPE3", "Audio:Performer"},
 		{"TOPE", "Audio:Artist"},
-		{"TPUB", "File:Publisher"},
+		{"TPUB", "DC:Publishers"},
 		{"TOAL", "Audio:Album"},
 		{"TALB", "Audio:Album"},
 		{"TLAN", "File:Language"},
@@ -698,14 +698,14 @@
 		{"TDAT", "Audio:ReleaseDate"},
 		{"TCON", "Audio:Genre"},
 		{"TIT1", "Audio:Genre"},
-		{"TENC", "File:Publisher"},
+		{"TENC", "DC:Publishers"},
 		{"TEXT", "Audio:Lyrics"},
 		{"TPE1", "Audio:Artist"},
 		{"TPE2", "Audio:Artist"},
 		{"TPE3", "Audio:Performer"},
 		{"TIME", "Audio:ReleaseDate"},
 		{"TOPE", "Audio:Artist"},
-		{"TPUB", "File:Publisher"},
+		{"TPUB", "DC:Publishers"},
 		{"TOAL", "Audio:Album"},
 		{"TALB", "Audio:Album"},
 		{"TLAN", "File:Language"},
@@ -856,12 +856,12 @@
 		{"TT2", "Audio:Title"},
 		{"TT3", "Audio:Title"},
 		{"TXT", "Audio:Comment"},
-		{"TPB", "File:Publisher"},
-		{"WAF", "File:Location"},
-		{"WAR", "File:Location"},
-		{"WAS", "File:Location"},
+		{"TPB", "DC:Publishers"},
+		{"WAF", "DC:Location"},
+		{"WAR", "DC:Location"},
+		{"WAS", "DC:Location"},
 		{"WCP", "File:Copyright"},
-		{"WAF", "File:Location"},
+		{"WAF", "DC:Location"},
 		{"WCM", "File:License"},
 		{"TYE", "Audio:ReleaseDate"},
 		{"TLA", "File:Lanuguage"},
@@ -1102,6 +1102,7 @@
 
 TrackerExtractorData data[] = {
 	{ "audio/mpeg", tracker_extract_mp3 },
+	{ "audio/x-mp3", tracker_extract_mp3 },
 	{ NULL, NULL }
 };
 

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c	Thu Sep 11 20:52:44 2008
@@ -668,14 +668,15 @@
 
 		time_string = tracker_date_to_time_string (value);
 
-		tracker_db_interface_execute_procedure (iface, NULL,
-							"SetMetadataNumeric",
-							id_str,
-							tracker_field_get_id (field),
-							time_string,
-							NULL);
-		g_free (time_string);
-
+		if (time_string) {
+			tracker_db_interface_execute_procedure (iface, NULL,
+								"SetMetadataNumeric",
+								id_str,
+								tracker_field_get_id (field),
+								time_string,
+								NULL);
+			g_free (time_string);
+		}
 		break;
 
 	case TRACKER_FIELD_TYPE_FULLTEXT: