[tracker] NMM: Fixed spellings of pre-defined instances

[Jürg Billeter <juergbi src gnome org>]

commit 3d7899b8e1d2abb01394dcf0dbd74419d4c0720f
Author: Debarshi Ray <debarshir src gnome org>
Date:   Mon Jan 25 03:12:30 2010 +0200

    NMM: Fixed spellings of pre-defined instances

 src/libtracker-extract/tracker-exif.c         |   18 +++++++++---------
 src/libtracker-extract/tracker-xmp.c          |   20 ++++++++++----------
 src/tracker-extract/tracker-extract-tiff.c    |   18 +++++++++---------
 src/tracker-writeback/tracker-writeback-xmp.c |   14 +++++++-------
 tests/tracker-writeback/01-writeback.py       |    4 ++--
 utils/services/file-class.cache.test          |   18 +++++++++---------
 6 files changed, 46 insertions(+), 46 deletions(-)
---
diff --git a/src/libtracker-extract/tracker-exif.c b/src/libtracker-extract/tracker-exif.c
index ee026e1..52466fb 100644
--- a/src/libtracker-extract/tracker-exif.c
+++ b/src/libtracker-extract/tracker-exif.c
@@ -255,19 +255,19 @@ get_metering_mode (ExifData *exif,
 		exif_entry_get_value (entry, buf, 1024);
 
 		if (strcasestr (buf, "center"))
-			return g_strdup ("nmm:meteringMode-center-weighted-average");
+			return g_strdup ("nmm:metering-mode-center-weighted-average");
 		else if (strcasestr (buf, "average"))
-			return g_strdup ("nmm:meteringMode-average");
+			return g_strdup ("nmm:metering-mode-average");
 		else if (strcasestr (buf, "spot"))
-			return g_strdup ("nmm:meteringMode-spot");
+			return g_strdup ("nmm:metering-mode-spot");
 		else if (strcasestr (buf, "multispot"))
-			return g_strdup ("nmm:meteringMode-multispot");
+			return g_strdup ("nmm:metering-mode-multispot");
 		else if (strcasestr (buf, "pattern"))
-			return g_strdup ("nmm:meteringMode-pattern");
+			return g_strdup ("nmm:metering-mode-pattern");
 		else if (strcasestr (buf, "partial"))
-			return g_strdup ("nmm:meteringMode-partial");
+			return g_strdup ("nmm:metering-mode-partial");
 		else
-			return g_strdup ("nmm:meteringMode-other");
+			return g_strdup ("nmm:metering-mode-other");
 	}
 
 	return NULL;
@@ -285,12 +285,12 @@ get_white_balance (ExifData *exif,
 		exif_entry_get_value (entry, buf, 1024);
 
 		if (strcasestr (buf, "auto"))
-			return g_strdup ("nmm:whiteBalance-auto");
+			return g_strdup ("nmm:white-balance-auto");
 
 		/* Found in the field: sunny, fluorescent, incandescent, cloudy.
 		 * These will this way also yield as manual. */
 
-		return g_strdup ("nmm:whiteBalance-manual");
+		return g_strdup ("nmm:white-balance-manual");
 	}
 
 	return NULL;
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index 302c73f..6d0d9ee 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -78,22 +78,22 @@ fix_metering_mode (const gchar *mode)
 	switch (value) {
 	default:
 	case 0:
-		return "nmm:meteringMode-other";
+		return "nmm:metering-mode-other";
 	case 1:
-		return "nmm:meteringMode-average";
+		return "nmm:metering-mode-average";
 	case 2:
-		return "nmm:meteringMode-center-weighted-average";
+		return "nmm:metering-mode-center-weighted-average";
 	case 3:
-		return "nmm:meteringMode-spot";
+		return "nmm:metering-mode-spot";
 	case 4:
-		return "nmm:meteringMode-multispot";
+		return "nmm:metering-mode-multispot";
 	case 5:
-		return "nmm:meteringMode-pattern";
+		return "nmm:metering-mode-pattern";
 	case 6:
-		return "nmm:meteringMode-partial";
+		return "nmm:metering-mode-partial";
 	}
 
-	return "nmm:meteringMode-other";
+	return "nmm:metering-mode-other";
 }
 
 static const gchar *
@@ -115,9 +115,9 @@ static const gchar *
 fix_white_balance (const gchar *wb)
 {
 	if (wb) {
-		return "nmm:whiteBalance-manual";
+		return "nmm:white-balance-manual";
 	} else {
-		return "nmm:whiteBalance-auto";
+		return "nmm:white-balance-auto";
 	}
 }
 
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index 31d5408..c00a9ff 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -155,19 +155,19 @@ get_metering_mode (TIFF *image)
 	if (TIFFGetField (image, EXIFTAG_METERINGMODE, &varui16)) {
 		switch (varui16) {
 		case 1:
-			return g_strdup ("nmm:meteringMode-average");
+			return g_strdup ("nmm:metering-mode-average");
 		case 2:
-			return g_strdup ("nmm:meteringMode-center-weighted-average");
+			return g_strdup ("nmm:metering-mode-center-weighted-average");
 		case 3:
-			return g_strdup ("nmm:meteringMode-spot");
+			return g_strdup ("nmm:metering-mode-spot");
 		case 4:
-			return g_strdup ("nmm:meteringMode-multispot");
+			return g_strdup ("nmm:metering-mode-multispot");
 		case 5:
-			return g_strdup ("nmm:meteringMode-pattern");
+			return g_strdup ("nmm:metering-mode-pattern");
 		case 6:
-			return g_strdup ("nmm:meteringMode-partial");
+			return g_strdup ("nmm:metering-mode-partial");
 		default:
-			return g_strdup ("nmm:meteringMode-other");
+			return g_strdup ("nmm:metering-mode-other");
 		}
 	}
 
@@ -183,9 +183,9 @@ get_white_balance (TIFF *image)
 
 	if (TIFFGetField (image, EXIFTAG_WHITEBALANCE, &varui16)) {
 		if (varui16 == 0) {
-			return g_strdup ("nmm:whiteBalance-auto");
+			return g_strdup ("nmm:white-balance-auto");
 		}
-		return g_strdup ("nmm:whiteBalance-manual");
+		return g_strdup ("nmm:white-balance-manual");
 	}
 
 	return NULL;
diff --git a/src/tracker-writeback/tracker-writeback-xmp.c b/src/tracker-writeback/tracker-writeback-xmp.c
index a023503..642e189 100644
--- a/src/tracker-writeback/tracker-writeback-xmp.c
+++ b/src/tracker-writeback/tracker-writeback-xmp.c
@@ -278,17 +278,17 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile *wbf,
 			   6 = Partial
 			   255 = other  */
 
-			if        (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "meteringMode-center-weighted-average") == 0) {
+			if        (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "metering-mode-center-weighted-average") == 0) {
 				xmp_set_property (xmp, NS_EXIF, "MeteringMode", "0", 0);
-			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "meteringMode-average") == 0) {
+			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "metering-mode-average") == 0) {
 				xmp_set_property (xmp, NS_EXIF, "MeteringMode", "1", 0);
-			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "meteringMode-spot") == 0) {
+			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "metering-mode-spot") == 0) {
 				xmp_set_property (xmp, NS_EXIF, "MeteringMode", "3", 0);
-			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "meteringMode-multispot") == 0) {
+			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "metering-mode-multispot") == 0) {
 				xmp_set_property (xmp, NS_EXIF, "MeteringMode", "4", 0);
-			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "meteringMode-pattern") == 0) {
+			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "metering-mode-pattern") == 0) {
 				xmp_set_property (xmp, NS_EXIF, "MeteringMode", "5", 0);
-			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "meteringMode-partial") == 0) {
+			} else if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "metering-mode-partial") == 0) {
 				xmp_set_property (xmp, NS_EXIF, "MeteringMode", "6", 0);
 			} else {
 				xmp_set_property (xmp, NS_EXIF, "MeteringMode", "255", 0);
@@ -299,7 +299,7 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile *wbf,
 
 			xmp_delete_property (xmp, NS_EXIF, "WhiteBalance");
 
-			if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "whiteBalance-auto") == 0) {
+			if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "white-balance-auto") == 0) {
 				/* 0 = Auto white balance
 				 * 1 = Manual white balance */
 				xmp_set_property (xmp, NS_EXIF, "WhiteBalance", "0", 0);
diff --git a/tests/tracker-writeback/01-writeback.py b/tests/tracker-writeback/01-writeback.py
index a4dcb04..efd303c 100755
--- a/tests/tracker-writeback/01-writeback.py
+++ b/tests/tracker-writeback/01-writeback.py
@@ -63,8 +63,8 @@ class TestInsertion (unittest.TestCase):
                       nie:keyword 'test_keyword_3' ;
                       nie:contentCreated '2001-10-26T21:32:52' ;
                       nfo:orientation nfo:orientation-top-mirror ;
-                      nmm:meteringMode nmm:meteringMode-average ;
-                      nmm:whiteBalance nmm:whiteBalance-auto ;
+                      nmm:meteringMode nmm:metering-mode-average ;
+                      nmm:whiteBalance nmm:white-balance-auto ;
                       nmm:flash nmm:flash-on ;
                       nmm:focalLength '1' ;
                       nmm:exposureTime '1' ;
diff --git a/utils/services/file-class.cache.test b/utils/services/file-class.cache.test
index eb50197..46a044e 100644
--- a/utils/services/file-class.cache.test
+++ b/utils/services/file-class.cache.test
@@ -323,17 +323,17 @@ nmm nmm:fnumber
 nmm nmm:focalLength
 nmm nmm:isoSpeed
 nmm nmm:MeteringMode
-nmm nmm:meteringMode-average
-nmm nmm:meteringMode-center-weighted-average
-nmm nmm:meteringMode-spot
-nmm nmm:meteringMode-multispot
-nmm nmm:meteringMode-pattern
-nmm nmm:meteringMode-partial
-nmm nmm:meteringMode-other
+nmm nmm:metering-mode-average
+nmm nmm:metering-mode-center-weighted-average
+nmm nmm:metering-mode-spot
+nmm nmm:metering-mode-multispot
+nmm nmm:metering-mode-pattern
+nmm nmm:metering-mode-partial
+nmm nmm:metering-mode-other
 nmm nmm:meteringMode
 nmm nmm:WhiteBalance
-nmm nmm:whiteBalance-auto
-nmm nmm:whiteBalance-manual
+nmm nmm:white-balance-auto
+nmm nmm:white-balance-manual
 nmm nmm:whiteBalance
 nmm nmm:isCropped
 nmm nmm:isColorCorrected