[tracker/tracker-0.6] Added --disable-detailed-metadata to NOT index less important metadata

From: Martyn James Russell <mr src gnome org>
To: svn-commits-list gnome org
Subject: [tracker/tracker-0.6] Added --disable-detailed-metadata to NOT index less important metadata
Date: Wed, 20 May 2009 12:17:32 -0400 (EDT)
commit f4654a1dba26c57b85fb6a83a1e585cb180c5b9d
Author: Martyn Russell <martyn imendio com>
Date:   Wed May 20 16:40:37 2009 +0100

    Added --disable-detailed-metadata to NOT index less important metadata
    
    This simply doesn't index data like Image:Comments which is considered
    less useful than information like Image:Height, etc.
---
 configure.ac                                       |   14 ++++++++
 .../tracker-extract-gstreamer-helix.c              |   10 ++++++
 src/tracker-extract/tracker-extract-gstreamer.c    |   10 ++++++
 src/tracker-extract/tracker-extract-jpeg.c         |   12 ++++---
 src/tracker-extract/tracker-extract-libxine.c      |    7 ++--
 src/tracker-extract/tracker-extract-mockup.c       |    3 ++
 src/tracker-extract/tracker-extract-mp3.c          |   33 ++++++++++++++++++++
 src/tracker-extract/tracker-extract-mplayer.c      |    4 ++
 src/tracker-extract/tracker-extract-png.c          |    4 ++-
 src/tracker-extract/tracker-extract-tiff.c         |   16 ++++++---
 src/tracker-extract/tracker-extract-totem.c        |    4 ++
 src/tracker-extract/tracker-iptc.c                 |    4 ++-
 src/tracker-extract/tracker-xmp.c                  |    9 +++++-
 13 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5608155..afe2c15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,6 +334,19 @@ AC_SUBST(QDBM_LIBS)
 
 AM_CONDITIONAL(HAVE_EXTERNAL_QDBM, test "x$have_external_qdbm" = "xyes")
 
+####################################################################
+# Detailed metadata?
+####################################################################
+
+AC_ARG_ENABLE(detailed-metadata, 
+	      AS_HELP_STRING([--disable-detailed-metadata],
+			     [disable detailed metadata [[default=no]]]),,
+              [enable_detailed_metadata=yes])
+
+if test "x$enable_detailed_metadata" != "xno"; then
+  AC_DEFINE(ENABLE_DETAILED_METADATA, 1, [Define if we want detailed metadata in the database])
+fi
+
 ##################################################################
 # Check for HAL
 ##################################################################
@@ -1445,6 +1458,7 @@ Build Configuration:
 	Enable unit tests:			$have_unit_tests
 	Enable unac accent stripper:	  	$have_unac
 	Enable full text search:               	$enable_fts
+	Enable detailed metadata:              	$enable_detailed_metadata
 
 	Support for file monitoring:           	gio (w/ libinotify: $have_inotify)
 	Support for ioprio:			$have_ioprio
diff --git a/src/tracker-extract/tracker-extract-gstreamer-helix.c b/src/tracker-extract/tracker-extract-gstreamer-helix.c
index a73770f..435aef4 100644
--- a/src/tracker-extract/tracker-extract-gstreamer-helix.c
+++ b/src/tracker-extract/tracker-extract-gstreamer-helix.c
@@ -540,6 +540,7 @@ extract_metadata (MetadataExtractor *extractor,
 	g_return_if_fail (extractor);
 	g_return_if_fail (metadata);
 
+#ifdef ENABLE_DETAILED_METADATA
 	if (extractor->audio_channels >= 0) {
 		add_uint_info (metadata,
 			       g_strdup ("Audio:Channels"),
@@ -551,6 +552,7 @@ extract_metadata (MetadataExtractor *extractor,
 			       g_strdup ("Audio:Samplerate"),
 			       extractor->audio_samplerate);
 	}
+#endif /* ENABLE_DETAILED_METADATA */
 
 	if (extractor->video_height >= 0) {
 		add_uint_info (metadata,
@@ -579,13 +581,17 @@ extract_metadata (MetadataExtractor *extractor,
 		add_uint_gst_tag (metadata, "Audio:TrackNo", extractor->tagcache, GST_TAG_TRACK_NUMBER);
 		add_uint_gst_tag (metadata, "Audio:DiscNo", extractor->tagcache, GST_TAG_ALBUM_VOLUME_NUMBER);
 		add_string_gst_tag (metadata, "Audio:Performer", extractor->tagcache, GST_TAG_PERFORMER);
+#ifdef ENABLE_DETAILED_METADATA
 		add_double_gst_tag (metadata, "Audio:TrackGain", extractor->tagcache, GST_TAG_TRACK_GAIN);
 		add_double_gst_tag (metadata, "Audio:PeakTrackGain", extractor->tagcache, GST_TAG_TRACK_PEAK);
 		add_double_gst_tag (metadata, "Audio:AlbumGain", extractor->tagcache, GST_TAG_ALBUM_GAIN);
 		add_double_gst_tag (metadata, "Audio:AlbumPeakGain", extractor->tagcache, GST_TAG_ALBUM_PEAK);
+#endif /* ENABLE_DETAILED_METADATA */
 		add_year_of_gdate_gst_tag (metadata, "Audio:ReleaseDate", extractor->tagcache, GST_TAG_DATE);
 		add_string_gst_tag (metadata, "Audio:Genre", extractor->tagcache, GST_TAG_GENRE);
+#ifdef ENABLE_DETAILED_METADATA
 		add_string_gst_tag (metadata, "Audio:Codec", extractor->tagcache, GST_TAG_AUDIO_CODEC);
+#endif /* ENABLE_DETAILED_METADATA */
 
 		/* Video */
 		add_string_gst_tag (metadata, "Video:Codec", extractor->tagcache, GST_TAG_VIDEO_CODEC);
@@ -593,7 +599,9 @@ extract_metadata (MetadataExtractor *extractor,
 		/* General */
 		add_string_gst_tag (metadata, "File:Copyright", extractor->tagcache, GST_TAG_COPYRIGHT);
 		add_string_gst_tag (metadata, "File:License", extractor->tagcache, GST_TAG_LICENSE);
+#ifdef ENABLE_DETAILED_METADATA
 		add_string_gst_tag (metadata, "DC:Coverage", extractor->tagcache, GST_TAG_LOCATION);
+#endif /* ENABLE_DETAILED_METADATA */
 
 		duration = get_media_duration (extractor);
 
@@ -615,7 +623,9 @@ extract_metadata (MetadataExtractor *extractor,
 			/* No video? So we assume we are treating a song */
 			add_string_gst_tag (metadata, "Audio:Title", extractor->tagcache, GST_TAG_TITLE);
 			add_string_gst_tag (metadata, "Audio:Artist", extractor->tagcache, GST_TAG_ARTIST);
+#ifdef ENABLE_DETAILED_METADATA
 			add_string_gst_tag (metadata, "Audio:Comment", extractor->tagcache, GST_TAG_COMMENT);
+#endif /* ENABLE_DETAILED_METADATA */
 
 			if (duration >= 0) {
 				add_int64_info (metadata, g_strdup ("Audio:Duration"), duration);
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 4ea5570..0a46677 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -291,7 +291,9 @@ extract_metadata (MetadataExtractor *extractor,
 		/* General */
 		add_string_gst_tag (metadata, "File:Copyright", extractor->tagcache, GST_TAG_COPYRIGHT);
 		add_string_gst_tag (metadata, "File:License", extractor->tagcache, GST_TAG_LICENSE);
+#ifdef ENABLE_DETAILED_METADATA
 		add_string_gst_tag (metadata, "DC:Coverage", extractor->tagcache, GST_TAG_LOCATION);
+#endif /* ENABLE_DETAILED_METADATA */
 
 		/* Audio */
  		add_string_gst_tag (metadata, "Audio:Album", extractor->tagcache, GST_TAG_ALBUM);
@@ -299,13 +301,17 @@ extract_metadata (MetadataExtractor *extractor,
 		add_uint_gst_tag   (metadata, "Audio:TrackNo", extractor->tagcache, GST_TAG_TRACK_NUMBER);
 		add_uint_gst_tag   (metadata, "Audio:DiscNo", extractor->tagcache, GST_TAG_ALBUM_VOLUME_NUMBER);
 		add_string_gst_tag (metadata, "Audio:Performer", extractor->tagcache, GST_TAG_PERFORMER);
+#ifdef ENABLE_DETAILED_METADATA
 		add_double_gst_tag (metadata, "Audio:TrackGain", extractor->tagcache, GST_TAG_TRACK_GAIN);
 		add_double_gst_tag (metadata, "Audio:PeakTrackGain", extractor->tagcache, GST_TAG_TRACK_PEAK);
 		add_double_gst_tag (metadata, "Audio:AlbumGain", extractor->tagcache, GST_TAG_ALBUM_GAIN);
 		add_double_gst_tag (metadata, "Audio:AlbumPeakGain", extractor->tagcache, GST_TAG_ALBUM_PEAK);
+#endif /* ENABLE_DETAILED_METADATA */
 		add_y_date_gst_tag (metadata, "Audio:ReleaseDate", extractor->tagcache, GST_TAG_DATE);
 		add_string_gst_tag (metadata, "Audio:Genre", extractor->tagcache, GST_TAG_GENRE);
+#ifdef ENABLE_DETAILED_METADATA
 		add_string_gst_tag (metadata, "Audio:Codec", extractor->tagcache, GST_TAG_AUDIO_CODEC);
+#endif /* ENABLE_DETAILED_METADATA */
 
 		/* Video */
 		add_string_gst_tag (metadata, "Video:Codec", extractor->tagcache, GST_TAG_VIDEO_CODEC);
@@ -322,10 +328,13 @@ extract_metadata (MetadataExtractor *extractor,
 		} else if (extractor->mime == EXTRACT_MIME_AUDIO) {
 			add_string_gst_tag (metadata, "Audio:Title", extractor->tagcache, GST_TAG_TITLE);
 			add_string_gst_tag (metadata, "Audio:Artist", extractor->tagcache, GST_TAG_ARTIST);
+#ifdef ENABLE_DETAILED_METADATA
 			add_string_gst_tag (metadata, "Audio:Comment", extractor->tagcache, GST_TAG_COMMENT);
+#endif /* ENABLE_DETAILED_METADATA */
 		}
  	}
 
+#ifdef ENABLE_DETAILED_METADATA
 	if (extractor->audio_channels >= 0) {
 		add_uint_info (metadata,
 			       g_strdup ("Audio:Channels"),
@@ -337,6 +346,7 @@ extract_metadata (MetadataExtractor *extractor,
 			       g_strdup ("Audio:Samplerate"),
 			       extractor->audio_samplerate);
 	}
+#endif /* ENABLE_DETAILED_METADATA */
 
 	if (extractor->video_height >= 0) {
 		if (extractor->mime == EXTRACT_MIME_IMAGE) {
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index 6c23a28..914f7b0 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -111,19 +111,21 @@ static TagType tags[] = {
 	{ EXIF_TAG_ARTIST, "Image:Creator", FALSE, NULL },
 	{ EXIF_TAG_USER_COMMENT, "Image:Comments", FALSE, NULL },
 	{ EXIF_TAG_IMAGE_DESCRIPTION, "Image:Description", FALSE, NULL },
+	{ EXIF_TAG_ORIENTATION, "Image:Orientation", FALSE, fix_orientation },
+	{ EXIF_TAG_FLASH, "Image:Flash", FALSE, fix_flash },
+	{ EXIF_TAG_ISO_SPEED_RATINGS, "Image:ISOSpeed", FALSE, NULL },
+	{ EXIF_TAG_COPYRIGHT, "File:Copyright", FALSE, NULL },
+#ifdef ENABLE_DETAILED_METADATA
 	{ EXIF_TAG_SOFTWARE, "Image:Software", FALSE, NULL },
 	{ EXIF_TAG_MAKE, "Image:CameraMake", FALSE, NULL },
 	{ EXIF_TAG_MODEL, "Image:CameraModel", FALSE, NULL },
-	{ EXIF_TAG_ORIENTATION, "Image:Orientation", FALSE, fix_orientation },
 	{ EXIF_TAG_EXPOSURE_PROGRAM, "Image:ExposureProgram", FALSE, NULL },
 	{ EXIF_TAG_EXPOSURE_TIME, "Image:ExposureTime", FALSE, fix_exposure_time },
 	{ EXIF_TAG_FNUMBER, "Image:FNumber", FALSE, fix_fnumber },
-	{ EXIF_TAG_FLASH, "Image:Flash", FALSE, fix_flash },
 	{ EXIF_TAG_FOCAL_LENGTH, "Image:FocalLength", FALSE, fix_focal_length },
-	{ EXIF_TAG_ISO_SPEED_RATINGS, "Image:ISOSpeed", FALSE, NULL },
 	{ EXIF_TAG_METERING_MODE, "Image:MeteringMode", FALSE, NULL },
 	{ EXIF_TAG_WHITE_BALANCE, "Image:WhiteBalance", FALSE, NULL },
-	{ EXIF_TAG_COPYRIGHT, "File:Copyright", FALSE, NULL },
+#endif /* ENABLE_DETAILED_METADATA */
 	{ -1, NULL, FALSE, NULL }
 };
 
@@ -146,7 +148,7 @@ metadata_append (GHashTable *metadata, gchar *key, gchar *value, gboolean append
 		escaped = tracker_escape_metadata (value);
 
 		list = g_strsplit (orig, "|", -1);			
-		for (i=0; list[i]; i++) {
+		for (i = 0; list[i]; i++) {
 			if (strcmp (list[i], escaped) == 0) {
 				found = TRUE;
 				break;
diff --git a/src/tracker-extract/tracker-extract-libxine.c b/src/tracker-extract/tracker-extract-libxine.c
index 75683d3..4418411 100644
--- a/src/tracker-extract/tracker-extract-libxine.c
+++ b/src/tracker-extract/tracker-extract-libxine.c
@@ -152,9 +152,8 @@ tracker_extract_xine (gchar *uri, GHashTable *metadata)
 		}
 	}
 
-
 	/* Audio */
-
+#ifdef ENABLE_DETAILED_METADATA
 	if (has_audio) {
 		uint32_t   n;
 		const char *audio_codec;
@@ -180,10 +179,11 @@ tracker_extract_xine (gchar *uri, GHashTable *metadata)
                                              tracker_escape_metadata (audio_codec));
 		}
 	}
+#endif /* ENABLE_DETAILED_METADATA */
 
 
 	/* Tags */
-
+#ifdef ENABLE_DETAILED_METADATA
 	comment = xine_get_meta_info (stream, XINE_META_INFO_COMMENT);
 	if (comment) {
 		if (has_video) {
@@ -194,6 +194,7 @@ tracker_extract_xine (gchar *uri, GHashTable *metadata)
                                              tracker_escape_metadata (comment));
 		}
 	}
+#endif /* ENABLE_DETAILED_METADATA */
 
 	title = xine_get_meta_info (stream, XINE_META_INFO_TITLE);
 	if (title) {
diff --git a/src/tracker-extract/tracker-extract-mockup.c b/src/tracker-extract/tracker-extract-mockup.c
index d970647..7b406e6 100644
--- a/src/tracker-extract/tracker-extract-mockup.c
+++ b/src/tracker-extract/tracker-extract-mockup.c
@@ -52,8 +52,11 @@ static MockupTag tags[] = {
 	{ "Audio:Title", "Title" },
 	{ "Video:Title", "Title for Video" },
 	{ "Audio:Genre", "Genre" },
+	{ "Audio:Duration", "5" },
 	{ "Image:Location", "Here" },
+#ifdef ENABLE_DETAILED_METADATA
 	{ "Image:Software", "Softa" },
+#endif /* ENABLE_DETAILED_METADATA */
 	{ NULL, NULL }
 };
 
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 9c6265b..acba200 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -556,32 +556,38 @@ mp3_parse_header (const gchar *data,
 		    mpeg_ver = MPEG_ERR;
 		    break;
 	    case 0x1000:
+#ifdef ENABLE_DETAILED_METADATA
 		    g_hash_table_insert (metadata,
 					 g_strdup ("Audio:Codec"),
 					 g_strdup ("MPEG"));
 		    g_hash_table_insert (metadata,
 					 g_strdup ("Audio:CodecVersion"),
 					 g_strdup ("2"));
+#endif /* ENABLE_DETAILED_METADATA */
 		    mpeg_ver = MPEG_V2;
 		    spfp8 = 72;
 		    break;
 	    case 0x1800:
+#ifdef ENABLE_DETAILED_METADATA
 		    g_hash_table_insert (metadata,
 					 g_strdup ("Audio:Codec"),
 					 g_strdup ("MPEG"));
 		    g_hash_table_insert (metadata,
 					 g_strdup ("Audio:CodecVersion"),
 					 g_strdup ("1"));
+#endif /* ENABLE_DETAILED_METADATA */
 		    mpeg_ver = MPEG_V1;
 		    spfp8 = 144;
 		    break;
 	    case 0:
+#ifdef ENABLE_DETAILED_METADATA
 		    g_hash_table_insert (metadata,
 					 g_strdup ("Audio:Codec"),
 					 g_strdup ("MPEG"));
 		    g_hash_table_insert (metadata,
 					 g_strdup ("Audio:CodecVersion"),
 					 g_strdup ("2.5"));
+#endif /* ENABLE_DETAILED_METADATA */
 		    mpeg_ver = MPEG_V25;
 		    spfp8 = 72;
 		    break;
@@ -622,14 +628,18 @@ mp3_parse_header (const gchar *data,
 	
 	if ((header & ch_mask) == ch_mask) {
 		ch = 1;
+#ifdef ENABLE_DETAILED_METADATA
 		g_hash_table_insert (metadata,
 				     g_strdup ("Audio:Channels"),
 				     g_strdup ("1"));
+#endif /* ENABLE_DETAILED_METADATA */
 	} else {
 		ch = 2; /* stereo non stereo select */
+#ifdef ENABLE_DETAILED_METADATA
 		g_hash_table_insert (metadata,
 				     g_strdup ("Audio:Channels"),
 				     g_strdup ("2"));
+#endif /* ENABLE_DETAILED_METADATA */
 	}
 	
 	/* We assume mpeg version, layer and channels are constant in frames */
@@ -695,12 +705,15 @@ mp3_parse_header (const gchar *data,
 				     tracker_escape_metadata_printf ("%d", length));
 	}
 
+#ifdef ENABLE_DETAILED_METADATA
 	g_hash_table_insert (metadata,
 			     g_strdup ("Audio:Samplerate"),
 			     tracker_escape_metadata_printf ("%d", sample_rate));
+
 	g_hash_table_insert (metadata,
 			     g_strdup ("Audio:Bitrate"),
 			     tracker_escape_metadata_printf ("%d", avg_bps*1000));
+#endif /* ENABLE_DETAILED_METADATA */
 
 	return TRUE;
 }
@@ -748,18 +761,24 @@ get_id3v24_tags (const gchar *data,
 		{"TDRC", "Audio:ReleaseDate"},
 		{"TCON", "Audio:Genre"},
 		{"TIT1", "Audio:Genre"},
+#ifdef ENABLE_DETAILED_METADATA
 		{"TENC", "DC:Publishers"},
+#endif /* ENABLE_DETAILED_METADATA */
 		{"TEXT", "Audio:Lyrics"},
 		{"TPE1", "Audio:Artist"},
 		{"TPE2", "Audio:Artist"},
 		{"TPE3", "Audio:Performer"},
 		/*	{"TOPE", "Audio:Artist"}, We dont' want the original artist for now */
+#ifdef ENABLE_DETAILED_METADATA
 		{"TPUB", "DC:Publishers"},
+#endif /* ENABLE_DETAILED_METADATA */
 		{"TOAL", "Audio:Album"},
 		{"TALB", "Audio:Album"},
 		{"TLAN", "File:Language"},
 		{"TIT2", "Audio:Title"},
+#ifdef ENABLE_DETAILED_METADATA
 		{"TIT3", "Audio:Comment"},
+#endif /* ENABLE_DETAILED_METADATA */
 		{"TDRL", "Audio:ReleaseDate"},
 		{"TRCK", "Audio:TrackNo"},
 		{"PCNT", "Audio:PlayCount"},
@@ -950,11 +969,13 @@ get_id3v24_tags (const gchar *data,
 				break;
 			}
 
+#ifdef ENABLE_DETAILED_METADATA
 			if (!tracker_is_empty_string (word)) {
 				g_hash_table_insert (metadata,
 						     g_strdup ("Audio:Comment"),
 						     tracker_escape_metadata (word));
 			}
+#endif /* ENABLE_DETAILED_METADATA */
 
 			g_free (word);
 		}
@@ -1001,13 +1022,17 @@ get_id3v23_tags (const gchar *data,
 		{"TDAT", "Audio:ReleaseDate"},
 		{"TCON", "Audio:Genre"},
 		{"TIT1", "Audio:Genre"},
+#ifdef ENABLE_DETAILED_METADATA
 		{"TENC", "DC:Publishers"},
+#endif /* ENABLE_DETAILED_METADATA */
 		{"TEXT", "Audio:Lyrics"},
 		{"TPE1", "Audio:Artist"},
 		{"TPE2", "Audio:Artist"},
 		{"TPE3", "Audio:Performer"},
 		/*	{"TOPE", "Audio:Artist"}, We don't want the original artist for now */
+#ifdef ENABLE_DETAILED_METADATA
 		{"TPUB", "DC:Publishers"},
+#endif /* ENABLE_DETAILED_METADATA */
 		{"TOAL", "Audio:Album"},
 		{"TALB", "Audio:Album"},
 		{"TLAN", "File:Language"},
@@ -1184,11 +1209,13 @@ get_id3v23_tags (const gchar *data,
 				break;
 			}
 
+#ifdef ENABLE_DETAILED_METADATA
 			if (!tracker_is_empty_string (word)) {
 				g_hash_table_insert (metadata,
 						     g_strdup ("Audio:Comment"),
 						     tracker_escape_metadata (word));
 			}
+#endif /* ENABLE_DETAILED_METADATA */
 
 			g_free (word);
 		}
@@ -1234,8 +1261,10 @@ get_id3v20_tags (const gchar *data,
 		{"TT1", "Audio:Artist"},
 		{"TT2", "Audio:Title"},
 		{"TT3", "Audio:Title"},
+#ifdef ENABLE_DETAILED_METADATA
 		{"TXT", "Audio:Comment"},
 		{"TPB", "DC:Publishers"},
+#endif /* ENABLE_DETAILED_METADATA */
 		{"WAF", "DC:Location"},
 		{"WAR", "DC:Location"},
 		{"WAS", "DC:Location"},
@@ -1253,7 +1282,9 @@ get_id3v20_tags (const gchar *data,
 		{"TOA", "Audio:Artist"},
 		{"TOT", "Audio:Album"},
 		{"TOL", "Audio:Artist"},
+#ifdef ENABLE_DETAILED_METADATA
 		{"COM", "Audio:Comment"},
+#endif /* ENABLE_DETAILED_METADATA */
 		{"TLE", "Audio:Duration"},
 		{ NULL, 0},
 	};
@@ -1704,11 +1735,13 @@ extract_mp3 (const gchar *filename,
 				     tracker_escape_metadata (info.genre));
 	}
 
+#ifdef ENABLE_DETAILED_METADATA
 	if (!tracker_is_empty_string (info.comment)) {
 		g_hash_table_insert (metadata,
 				     g_strdup ("Audio:Comment"),
 				     tracker_escape_metadata (info.comment));
 	}
+#endif /* ENABLE_DETAILED_METADATA */
 
 	if (!tracker_is_empty_string (info.trackno)) {
 		g_hash_table_insert (metadata,
diff --git a/src/tracker-extract/tracker-extract-mplayer.c b/src/tracker-extract/tracker-extract-mplayer.c
index 7b657f8..65cfc02 100644
--- a/src/tracker-extract/tracker-extract-mplayer.c
+++ b/src/tracker-extract/tracker-extract-mplayer.c
@@ -50,10 +50,12 @@ static gchar *video_tags[][2] = {
 };
 
 static gchar *audio_tags[][2] = {
+#ifdef ENABLE_DETAILED_METADATA
 	{ "ID_AUDIO_BITRATE",	"Audio:Bitrate"		},
 	{ "ID_AUDIO_RATE",	"Audio:Samplerate"	},
 	{ "ID_AUDIO_CODEC",	"Audio:Codec"		},
 	{ "ID_AUDIO_NCH",	"Audio:Channels"	},
+#endif /* ENABLE_DETAILED_METADATA */
 	{ NULL,			NULL			}
 };
 
@@ -64,7 +66,9 @@ static gchar *audio_tags[][2] = {
  *    tag to Video, otherwise to Audio if it has audio.
  */
 static gchar *info_tags[][3] = {
+#ifdef ENABLE_DETAILED_METADATA
 	{ "Comment",		"Audio:Comment",	"Video:Comment"	},
+#endif /* ENABLE_DETAILED_METADATA */
 	{ "Title",		"Audio:Title",		"Video:Title"	},
 	{ "Genre",		"Audio:Genre",		NULL		},
 	{ "Track",		"Audio:TrackNo",	NULL		},
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 22533dd..a3f8f46 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -67,8 +67,10 @@ static TagProcessors tag_processors[] = {
 	{ "Copyright",	   "File:Copyright",    FALSE, NULL },
 	{ "Creation Time", "Image:Date",	FALSE, rfc1123_to_iso8601_date },
 	{ "Title",	   "Image:Title",	FALSE, NULL },
-	{ "Software",	   "Image:Software",    FALSE, NULL },
 	{ "Disclaimer",	   "File:License",      FALSE, NULL },
+#ifdef ENABLE_DETAILED_METADATA
+	{ "Software",	   "Image:Software",    FALSE, NULL },
+#endif /* ENABLE_DETAILED_METADATA */
 	{ NULL,		   NULL,		FALSE, NULL },
 };
 
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index e0e567a..012cb25 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -74,25 +74,29 @@ static TiffTag tags[] = {
 	{ TIFFTAG_IMAGEDESCRIPTION, "Image:Comments", TIFF_TAGTYPE_STRING, FALSE, NULL },
 	{ TIFFTAG_IMAGEWIDTH, "Image:Width", TIFF_TAGTYPE_UINT32, FALSE, NULL },
 	{ TIFFTAG_IMAGELENGTH, "Image:Height", TIFF_TAGTYPE_UINT32, FALSE, NULL },
+	{ TIFFTAG_ORIENTATION, "Image:Orientation", TIFF_TAGTYPE_UINT16, FALSE, NULL },
+#ifdef ENABLE_DETAILED_METADATA
 	{ TIFFTAG_MAKE, "Image:CameraMake", TIFF_TAGTYPE_STRING, FALSE, NULL },
 	{ TIFFTAG_MODEL, "Image:CameraModel", TIFF_TAGTYPE_STRING, FALSE, NULL },
-	{ TIFFTAG_ORIENTATION, "Image:Orientation", TIFF_TAGTYPE_UINT16, FALSE, NULL },
 	{ TIFFTAG_SOFTWARE, "Image:Software", TIFF_TAGTYPE_STRING, FALSE, NULL },
+#endif /* ENABLE_DETAILED_METADATA */
 	{ -1, NULL, TIFF_TAGTYPE_UNDEFINED, FALSE, NULL }
 };
 
 static TiffTag exiftags[] = {
-	{ EXIFTAG_EXPOSURETIME, "Image:ExposureTime", TIFF_TAGTYPE_DOUBLE, FALSE, NULL},
-	{ EXIFTAG_FNUMBER, "Image:FNumber", TIFF_TAGTYPE_DOUBLE, FALSE, NULL},
-	{ EXIFTAG_EXPOSUREPROGRAM, "Image:ExposureProgram", TIFF_TAGTYPE_UINT16, FALSE, NULL },
 	{ EXIFTAG_ISOSPEEDRATINGS, "Image:ISOSpeed", TIFF_TAGTYPE_C16_UINT16, FALSE, NULL},
 	{ EXIFTAG_DATETIMEORIGINAL, "Image:Date", TIFF_TAGTYPE_STRING, FALSE, date_to_iso8601 },
-	{ EXIFTAG_METERINGMODE, "Image:MeteringMode", TIFF_TAGTYPE_UINT16, FALSE, NULL},
 	{ EXIFTAG_FLASH, "Image:Flash", TIFF_TAGTYPE_UINT16, FALSE, NULL},
-	{ EXIFTAG_FOCALLENGTH, "Image:FocalLength", TIFF_TAGTYPE_DOUBLE, FALSE, NULL},
 	{ EXIFTAG_PIXELXDIMENSION, "Image:Width", TIFF_TAGTYPE_UINT32, FALSE, NULL},
 	{ EXIFTAG_PIXELYDIMENSION, "Image:Height", TIFF_TAGTYPE_UINT32, FALSE, NULL},
+#ifdef ENABLE_DETAILED_METADATA
+	{ EXIFTAG_EXPOSURETIME, "Image:ExposureTime", TIFF_TAGTYPE_DOUBLE, FALSE, NULL},
+	{ EXIFTAG_FNUMBER, "Image:FNumber", TIFF_TAGTYPE_DOUBLE, FALSE, NULL},
+	{ EXIFTAG_EXPOSUREPROGRAM, "Image:ExposureProgram", TIFF_TAGTYPE_UINT16, FALSE, NULL },
+ 	{ EXIFTAG_METERINGMODE, "Image:MeteringMode", TIFF_TAGTYPE_UINT16, FALSE, NULL},
+	{ EXIFTAG_FOCALLENGTH, "Image:FocalLength", TIFF_TAGTYPE_DOUBLE, FALSE, NULL},
 	{ EXIFTAG_WHITEBALANCE, "Image:WhiteBalance", TIFF_TAGTYPE_UINT16, FALSE, NULL},
+#endif /* ENABLE_DETAILED_METADATA */
 	{ -1, NULL, TIFF_TAGTYPE_UNDEFINED, FALSE, NULL }
 };
 
diff --git a/src/tracker-extract/tracker-extract-totem.c b/src/tracker-extract/tracker-extract-totem.c
index e3da6ca..8fc2b6e 100644
--- a/src/tracker-extract/tracker-extract-totem.c
+++ b/src/tracker-extract/tracker-extract-totem.c
@@ -19,6 +19,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include <glib.h>
@@ -36,10 +38,12 @@ static gchar *tags[][2] = {
 	{ "TOTEM_INFO_VIDEO_BITRATE",		"Video:Bitrate"		},
 	{ "TOTEM_INFO_TITLE",			"Video:Title"		},
 	{ "TOTEM_INFO_AUTHOR",			"Video:Author"		},
+#ifdef ENABLE_DETAILED_METADATA
 	{ "TOTEM_INFO_AUDIO_BITRATE",		"Audio:Bitrate"		},
 	{ "TOTEM_INFO_AUDIO_SAMPLE_RATE",	"Audio:Samplerate"	},
 	{ "TOTEM_INFO_AUDIO_CODEC",		"Audio:Codec"		},
 	{ "TOTEM_INFO_AUDIO_CHANNELS",		"Audio:Channels"	},
+#endif /* ENABLE_DETAILED_METADATA */
 	{ NULL,					NULL			}
 };
 
diff --git a/src/tracker-extract/tracker-iptc.c b/src/tracker-extract/tracker-iptc.c
index bf76d74..8f0edaf 100644
--- a/src/tracker-extract/tracker-iptc.c
+++ b/src/tracker-extract/tracker-iptc.c
@@ -48,13 +48,15 @@ static IptcTagType iptctags[] = {
 	/*	{ 2, IPTC_TAG_CONTENT_LOC_NAME, "Image:Location", NULL }, */
 	{ 2, IPTC_TAG_SUBLOCATION, "Image:Location", FALSE, NULL },
         { 2, IPTC_TAG_DATE_CREATED, "Image:Date", FALSE, NULL },
-        { 2, IPTC_TAG_ORIGINATING_PROGRAM, "Image:Software", FALSE, NULL },
         { 2, IPTC_TAG_BYLINE, "Image:Creator", FALSE, NULL },
         { 2, IPTC_TAG_CITY, "Image:City", FALSE, NULL },
         { 2, IPTC_TAG_COUNTRY_NAME, "Image:Country", FALSE, NULL },
         { 2, IPTC_TAG_CREDIT, "Image:Creator", FALSE, NULL },
         { 2, IPTC_TAG_COPYRIGHT_NOTICE, "File:Copyright", FALSE, NULL },
         { 2, IPTC_TAG_IMAGE_ORIENTATION, "Image:Orientation", FALSE, fix_iptc_orientation },
+#ifdef ENABLE_DETAILED_METADATA
+        { 2, IPTC_TAG_ORIGINATING_PROGRAM, "Image:Software", FALSE, NULL },
+#endif /* ENABLE_DETAILED_METADATA */
 	{ -1, -1, NULL, FALSE, NULL }
 };
 
diff --git a/src/tracker-extract/tracker-xmp.c b/src/tracker-extract/tracker-xmp.c
index 73b8696..da14a65 100644
--- a/src/tracker-extract/tracker-xmp.c
+++ b/src/tracker-extract/tracker-xmp.c
@@ -288,6 +288,7 @@ tracker_xmp_iter_simple (GHashTable  *metadata,
 			tracker_append_string_to_hash_table (metadata, "Image:Keywords", value, TRUE, FALSE);
 			tracker_append_string_to_hash_table (metadata, "Image:HasKeywords", "1", FALSE, FALSE);
 		}
+#ifdef ENABLE_DETAILED_METADATA
 		else if (strcmp (name, "publisher") == 0) {
 			tracker_append_string_to_hash_table (metadata, "DC:Publisher", value, append, FALSE);
 		}
@@ -315,7 +316,7 @@ tracker_xmp_iter_simple (GHashTable  *metadata,
 		else if (strcmp (name, "coverage") == 0) {
 			tracker_append_string_to_hash_table (metadata, "DC:Coverage", value, append, FALSE);
 		}
-
+#endif /* ENABLE_DETAILED_METADATA */
 	}
 	/* Creative Commons */
 	else if (strcmp (schema, NS_CC) == 0) {
@@ -334,6 +335,7 @@ tracker_xmp_iter_simple (GHashTable  *metadata,
 		else if (strcmp (name, "Artist") == 0) {
 			tracker_append_string_to_hash_table (metadata, "Image:Creator", value, append, FALSE);
 		}
+#ifdef ENABLE_DETAILED_METADATA
 		else if (strcmp (name, "Software") == 0) {
 			tracker_append_string_to_hash_table (metadata, "Image:Software", value, append, FALSE);
 		}
@@ -343,6 +345,7 @@ tracker_xmp_iter_simple (GHashTable  *metadata,
 		else if (strcmp (name, "Model") == 0) {
 			tracker_append_string_to_hash_table (metadata, "Image:CameraModel", value, append, FALSE);
 		}
+#endif /* ENABLE_DETAILED_METADATA */
 		else if (strcmp (name, "Orientation") == 0) {
 			tracker_append_string_to_hash_table (metadata, 
 							     "Image:Orientation", 
@@ -355,6 +358,7 @@ tracker_xmp_iter_simple (GHashTable  *metadata,
 							     fix_flash (value), 
 							     append, FALSE);
 		}
+#ifdef ENABLE_DETAILED_METADATA
 		else if (strcmp (name, "MeteringMode") == 0) {
 			tracker_append_string_to_hash_table (metadata, 
 							     "Image:MeteringMode", 
@@ -373,13 +377,16 @@ tracker_xmp_iter_simple (GHashTable  *metadata,
 		else if (strcmp (name, "FocalLength") == 0) {
 			tracker_append_string_to_hash_table (metadata, "Image:FocalLength", value, append, FALSE);
 		}
+#endif /* ENABLE_DETAILED_METADATA */
 		else if (strcmp (name, "ISOSpeedRatings") == 0) {
 			tracker_append_string_to_hash_table (metadata, "Image:ISOSpeed", value, append, FALSE);
 		}
+#ifdef ENABLE_DETAILED_METADATA
 		else if (strcmp (name, "WhiteBalance") == 0) {
 			tracker_append_string_to_hash_table (metadata, "Image:WhiteBalance",
 							     fix_white_balance (value), append, FALSE);
 		}
+#endif /* ENABLE_DETAILED_METADATA */
 		else if (strcmp (name, "Copyright") == 0) {
 			tracker_append_string_to_hash_table (metadata, "File:Copyright", value, append, FALSE);
 		}
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]