tracker r2420 - in trunk: . src/tracker-extract

[mottela svn gnome org]

Author: mottela
Date: Thu Oct 23 19:44:29 2008
New Revision: 2420
URL: http://svn.gnome.org/viewvc/tracker?rev=2420&view=rev

Log:
Added more XMP and EXIF fields to image metadata support

Modified:
   trunk/ChangeLog
   trunk/src/tracker-extract/tracker-extract-jpeg.c
   trunk/src/tracker-extract/tracker-xmp.c

Modified: trunk/src/tracker-extract/tracker-extract-jpeg.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-jpeg.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-jpeg.c	Thu Oct 23 19:44:29 2008
@@ -77,6 +77,7 @@
 	{ EXIF_TAG_DOCUMENT_NAME, "Image:Title", NULL },
 	/* { -1, "Image:Album", NULL }, */
 	{ EXIF_TAG_DATE_TIME, "Image:Date", date_to_iso8601 },
+	{ EXIF_TAG_DATE_TIME_ORIGINAL, "Image:Date", date_to_iso8601 },
 	/* { -1, "Image:Keywords", NULL }, */
 	{ EXIF_TAG_ARTIST, "Image:Creator", NULL },
 	{ EXIF_TAG_USER_COMMENT, "Image:Comments", NULL },

Modified: trunk/src/tracker-extract/tracker-xmp.c
==============================================================================
--- trunk/src/tracker-extract/tracker-xmp.c	(original)
+++ trunk/src/tracker-extract/tracker-xmp.c	Thu Oct 23 19:44:29 2008
@@ -199,9 +199,45 @@
 	}
 	/* Exif basic scheme */
 	else if (strcmp (schema, NS_EXIF) == 0) {
-		if (strcmp (name, "title") == 0) {
+		if (strcmp (name, "Title") == 0) {
 			tracker_append_string_to_hash_table (metadata, "Image:Title", value, append);
 		}
+		else if (strcmp (name, "DateTimeOriginal") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:Date", value, append);
+		}
+		else if (strcmp (name, "Artist") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:Creator", value, append);
+		}
+		else if (strcmp (name, "Software") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:Software", value, append);
+		}
+		else if (strcmp (name, "Make") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:CameraMake", value, append);
+		}
+		else if (strcmp (name, "Model") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:CameraModel", value, append);
+		}
+		else if (strcmp (name, "Orientation") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:Orientation", value, append);
+		}
+		else if (strcmp (name, "ExposureProgram") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:ExposureProgram", value, append);
+		}
+		else if (strcmp (name, "ExposureTime") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:ExposureTime", value, append);
+		}
+		else if (strcmp (name, "FNumber") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:FNumber", value, append);
+		}
+		else if (strcmp (name, "FocalLength") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:FocalLength", value, append);
+		}
+		else if (strcmp (name, "WhiteBalance") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:WhiteBalance", value, append);
+		}
+		else if (strcmp (name, "Copyright") == 0) {
+			tracker_append_string_to_hash_table (metadata, "File:Copyright", value, append);
+		}
 	}
 
 	g_free (name);