--- a/mmserv/metadatautility/Src/MetaDataUtilityBody.cpp	Fri Jun 11 19:59:23 2010 -0500
+++ b/mmserv/metadatautility/Src/MetaDataUtilityBody.cpp	Fri Jun 25 17:36:03 2010 -0500
@@ -18,8 +18,6 @@
 
 
 
-
-
 // INCLUDE FILES
 #include	<MetaDataFieldContainer.h>
 #include	<Oma2Agent.h>
@@ -111,6 +109,17 @@
 	if ( iParser )
 		{
 		iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
+        if( iParser->ID32Offset() )
+            {						
+            CMetaDataParser* id32parser = 
+                    CMetaDataParserFactory::CreateID3ParserL(*iSource, iParser->ID32Offset() );
+            if( id32parser )
+                {
+                CleanupStack::PushL( id32parser );
+                id32parser->ParseL(aWantedFields, *iContainer);
+                CleanupStack::PopAndDestroy( id32parser );
+                }
+            }
 		}
 	}
 
@@ -133,6 +142,17 @@
 	if ( iParser )
 		{
 		iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
+        if( iParser->ID32Offset() )
+            {
+            CMetaDataParser* id32parser = 
+                    CMetaDataParserFactory::CreateID3ParserL(*iSource, iParser->ID32Offset() );
+            if( id32parser )
+                {
+                CleanupStack::PushL( id32parser );
+                id32parser->ParseL(aWantedFields, *iContainer);
+                CleanupStack::PopAndDestroy( id32parser );
+                }   
+            }
 		}
 	}
 
@@ -155,6 +175,17 @@
 	if ( iParser )
 		{
 		iParser->CommonParseDesL(aWantedFields, *iContainer);
+        if( iParser->ID32Offset() )
+            {
+            CMetaDataParser* id32parser = 
+                    CMetaDataParserFactory::CreateID3ParserL(*iSource, iParser->ID32Offset() );
+            if( id32parser )
+                {
+                CleanupStack::PushL( id32parser );
+                id32parser->ParseL(aWantedFields, *iContainer);
+                CleanupStack::PopAndDestroy( id32parser );
+                }        
+            }
 		}
 	}
 
@@ -481,6 +512,17 @@
 	if ( iParser )
 	{
 		iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
+		if( iParser->ID32Offset() )
+		    {
+		    CMetaDataParser* id32parser = 
+		            CMetaDataParserFactory::CreateID3ParserL(*iSource, iParser->ID32Offset() );
+            if( id32parser )
+                {
+                CleanupStack::PushL( id32parser );
+                id32parser->ParseL(aWantedFields, *iContainer);
+                CleanupStack::PopAndDestroy( id32parser );
+                }    
+		    }
 	}	
 	}
 // -----------------------------------------------------------------------------
@@ -512,6 +554,17 @@
 	if ( iParser )
 	{
 		iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
+        if( iParser->ID32Offset() )
+            {
+            CMetaDataParser* id32parser = 
+                    CMetaDataParserFactory::CreateID3ParserL(*iSource, iParser->ID32Offset() );
+            if( id32parser )
+                {
+                CleanupStack::PushL( id32parser );
+                id32parser->ParseL(aWantedFields, *iContainer);
+                CleanupStack::PopAndDestroy( id32parser );
+                }
+            }
 	}
 	}
 
@@ -700,6 +753,17 @@
 	if ( iParser )
 		{
 		iParser->CommonParseDesL(aWantedFields, *iContainer);
+        if( iParser->ID32Offset() )
+            {
+            CMetaDataParser* id32parser = 
+                    CMetaDataParserFactory::CreateID3ParserL(*iSource, iParser->ID32Offset() );
+            if( id32parser )
+                {
+                CleanupStack::PushL( id32parser );
+                id32parser->ParseL(aWantedFields, *iContainer);
+                CleanupStack::PopAndDestroy( id32parser );
+                } 
+            }
 		}
 	}