tracker r2425 - in trunk: . data/services src/tracker-extract

[mottela svn gnome org]

Author: mottela
Date: Mon Oct 27 15:09:21 2008
New Revision: 2425
URL: http://svn.gnome.org/viewvc/tracker?rev=2425&view=rev

Log:
Added Image:Location, Image:Country and Image:City fields

Modified:
   trunk/ChangeLog
   trunk/data/services/image.metadata
   trunk/src/tracker-extract/tracker-xmp.c

Modified: trunk/data/services/image.metadata
==============================================================================
--- trunk/data/services/image.metadata	(original)
+++ trunk/data/services/image.metadata	Mon Oct 27 15:09:21 2008
@@ -128,3 +128,17 @@
 Description=Rating given to the image. 
 DataType=integer
 
+[Image:Location]
+DisplayName=Location
+Description=Location where the image was taken or the location shown in the image.
+DataType=string
+
+[Image:Country]
+DisplayName=Country
+Description=Country where the image was taken or the country shown in the image.
+DataType=string
+
+[Image:City]
+DisplayName=City
+Description=City where the image was taken or the city shown in the image.
+DataType=string

Modified: trunk/src/tracker-extract/tracker-xmp.c
==============================================================================
--- trunk/src/tracker-extract/tracker-xmp.c	(original)
+++ trunk/src/tracker-extract/tracker-xmp.c	Mon Oct 27 15:09:21 2008
@@ -246,6 +246,22 @@
 		        tracker_append_string_to_hash_table (metadata, "Image:Rating", value, append);
 		}
 	}
+	/* IPTC4XMP scheme */
+	else if (strcmp (schema,  NS_IPTC4XMP) == 0) {
+	        if (strcmp (name, "Location") == 0) {
+		        tracker_append_string_to_hash_table (metadata, "Image:Location", value, append);
+		}
+	}
+	/* Photoshop scheme */
+	else if (strcmp (schema,  NS_PHOTOSHOP) == 0) {
+	        if (strcmp (name, "City") == 0) {
+		        tracker_append_string_to_hash_table (metadata, "Image:City", value, append);
+		}
+		else if (strcmp (name, "Country") == 0) {
+			tracker_append_string_to_hash_table (metadata, "Image:Country", value, append);
+		}
+	}
+
 
 	g_free (name);
 }