gthumb r2177 - in trunk: . libgthumb

[mjc svn gnome org]

Author: mjc
Date: Thu Jan 10 21:05:12 2008
New Revision: 2177
URL: http://svn.gnome.org/viewvc/gthumb?rev=2177&view=rev

Log:
2008-01-10  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/gth-exiv2-utils.cpp:
        Remove extraneous text from XMP and IPTC tag names.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/gth-exiv2-utils.cpp

Modified: trunk/libgthumb/gth-exiv2-utils.cpp
==============================================================================
--- trunk/libgthumb/gth-exiv2-utils.cpp	(original)
+++ trunk/libgthumb/gth-exiv2-utils.cpp	Thu Jan 10 21:05:12 2008
@@ -119,9 +119,8 @@
 				stringstream stream;
 				stream << *i;
 				string value = stream.str();
-				//metadata = add(metadata, i->tagName().c_str(), i->toString().c_str(), cat);
+
 				//disable "improve" untils it works :-)
-				//metadata = add (metadata, i->key().c_str(), improve(value).c_str(), cat);
 				metadata = add (metadata, i->key().c_str(), value.c_str(), cat);
 			}
 		}
@@ -134,14 +133,18 @@
 			GthMetadata *new_entry;
 			Exiv2::IptcData::iterator end = iptcData.end();
 			for (Exiv2::IptcData::iterator md = iptcData.begin(); md != end; ++md) {
+
 				//determine metadata category
 				GthMetadataCategory cat = GTH_METADATA_CATEGORY_IPTC;
+
 				//fill entry
-				stringstream stream;
-				stream << *md;
-				string value = stream.str();
-				//metadata = add(metadata, i->tagName().c_str(), i->toString().c_str(), cat);
-				metadata = add (metadata, md->key().c_str(), value.c_str(), cat);
+				stringstream value;
+				value << *md;
+
+                                stringstream name;
+                                name << md->tagName();
+
+				metadata = add (metadata, name.str().c_str(), value.str().c_str(), cat);
 			}
 		}
 
@@ -152,14 +155,18 @@
 			GthMetadata *new_entry;
 			Exiv2::XmpData::iterator end = xmpData.end();
 			for (Exiv2::XmpData::iterator md = xmpData.begin(); md != end; ++md) {
+
 				//determine metadata category
 				GthMetadataCategory cat = GTH_METADATA_CATEGORY_XMP_EMBEDDED;
+
 				//fill entry
-				stringstream stream;
-				stream << *md;
-				string value = stream.str();
-				//metadata = add(metadata, i->tagName().c_str(), i->toString().c_str(), cat);
-				metadata = add (metadata, md->key().c_str(), value.c_str(), cat);
+				stringstream value;
+				value << *md;
+
+				stringstream name;
+				name << md->groupName() << "." << md->tagName();
+
+				metadata = add (metadata, name.str().c_str(), value.str().c_str(), cat);
 			}
 		}