--- a/mmserv/metadatautility/Src/MetaDataUtilityBody.cpp Mon May 03 12:59:52 2010 +0300
+++ b/mmserv/metadatautility/Src/MetaDataUtilityBody.cpp Fri May 14 16:22:35 2010 +0300
@@ -108,7 +108,7 @@
iParser = FindParserFileL(aFileName);
if ( iParser )
{
- iParser->ParseL(aWantedFields, *iContainer);
+ iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
}
}
@@ -130,7 +130,7 @@
iParser = FindParserFileL(aFile);
if ( iParser )
{
- iParser->ParseL(aWantedFields, *iContainer);
+ iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
}
}
@@ -152,7 +152,7 @@
iParser = FindParserDesL(aDes);
if ( iParser )
{
- iParser->ParseL(aWantedFields, *iContainer);
+ iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
}
}
@@ -467,10 +467,7 @@
{
User::Leave(KErrAlreadyExists);
}
-
- // iParser = FindParserFileL(aFileName);
-
- if(KErrNone == IsSupportedMimeType(aMimeType))
+ if(KErrNone == IsSupportedMimeType(aMimeType))
{
iParser = FindParserFileL(aFileName, aMimeType);
}
@@ -481,7 +478,7 @@
if ( iParser )
{
- iParser->ParseL(aWantedFields, *iContainer);
+ iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
}
}
// -----------------------------------------------------------------------------
@@ -501,8 +498,6 @@
User::Leave(KErrAlreadyExists);
}
- //iParser = FindParserFileL(aFile);
-
if(KErrNone == IsSupportedMimeType(aMimeType))
{
iParser = FindParserFileL(aFile, aMimeType);
@@ -512,10 +507,9 @@
User::Leave(KErrNotSupported);
}
- //iParser = FindParserFileL(aFile);
if ( iParser )
{
- iParser->ParseL(aWantedFields, *iContainer);
+ iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
}
}
@@ -703,7 +697,7 @@
}
if ( iParser )
{
- iParser->ParseL(aWantedFields, *iContainer);
+ iParser->CommonParseL((CMetaDataSourceFile*)iSource, aWantedFields, *iContainer);
}
}