Fixed minor product XML export issue

mgesing · mgesing · commit feacae7fc98d · 2015-04-24T13:48:32.000+02:00
diff --git a/src/Libraries/SmartStore.Services/ExportImport/ExportManager.cs b/src/Libraries/SmartStore.Services/ExportImport/ExportManager.cs
@@ -150,17 +150,17 @@ protected virtual void WriteCategories(XmlWriter writer, int parentCategoryId)
             }
         }
 
-		protected virtual void WritePicture(XmlWriter writer, XmlExportContext context, Picture picture, int thumbSize)
+		protected virtual void WritePicture(XmlWriter writer, XmlExportContext context, Picture picture, int thumbSize, int defaultSize)
 		{
 			if (picture != null)
 			{
 				writer.WriteStartElement("Picture");
 				writer.Write("Id", picture.Id.ToString());
 				writer.Write("SeoFileName", picture.SeoFilename);
 				writer.Write("MimeType", picture.MimeType);
-				writer.Write("ThumbImageUrl", _pictureService.GetPictureUrl(picture, thumbSize, false, storeLocation: context.Store.Url));
-				writer.Write("ImageUrl", _pictureService.GetPictureUrl(picture, thumbSize, false, storeLocation: context.Store.Url));
-				writer.Write("FullSizeImageUrl", _pictureService.GetPictureUrl(picture, 0, false, storeLocation: context.Store.Url));
+				writer.Write("ThumbImageUrl", _pictureService.GetPictureUrl(picture, thumbSize, false, context.Store.Url));
+				writer.Write("ImageUrl", _pictureService.GetPictureUrl(picture, defaultSize, false, context.Store.Url));
+				writer.Write("FullSizeImageUrl", _pictureService.GetPictureUrl(picture, 0, false, context.Store.Url));
 				writer.WriteEndElement();
 			}
 		}
@@ -528,7 +528,7 @@ public virtual void WriteProductToXml(XmlWriter writer, Product product, XmlExpo
 				writer.WriteStartElement("Pictures");
 				foreach (int pictureId in combination.GetAssignedPictureIds())
 				{
-					WritePicture(writer, context, _pictureService.GetPictureById(pictureId), _mediaSettings.ProductThumbPictureSize);
+					WritePicture(writer, context, _pictureService.GetPictureById(pictureId), _mediaSettings.ProductThumbPictureSize, _mediaSettings.ProductDetailsPictureSize);
 				}
 				writer.WriteEndElement();	// Pictures
 
@@ -543,7 +543,7 @@ public virtual void WriteProductToXml(XmlWriter writer, Product product, XmlExpo
 				writer.Write("Id", productPicture.Id.ToString());
 				writer.Write("DisplayOrder", productPicture.DisplayOrder.ToString());
 
-				WritePicture(writer, context, productPicture.Picture, _mediaSettings.ProductThumbPictureSize);
+				WritePicture(writer, context, productPicture.Picture, _mediaSettings.ProductThumbPictureSize, _mediaSettings.ProductDetailsPictureSize);
 
 				writer.WriteEndElement();
 			}
@@ -588,7 +588,7 @@ public virtual void WriteProductToXml(XmlWriter writer, Product product, XmlExpo
 					writer.Write("Alias", category.Alias);
 					writer.Write("DefaultViewMode", category.DefaultViewMode);
 
-					WritePicture(writer, context, category.Picture, _mediaSettings.CategoryThumbPictureSize);
+					WritePicture(writer, context, category.Picture, _mediaSettings.CategoryThumbPictureSize, _mediaSettings.CategoryThumbPictureSize);
 
 					WriteLocalized(writer, context, lang =>
 					{
@@ -631,7 +631,7 @@ public virtual void WriteProductToXml(XmlWriter writer, Product product, XmlExpo
 					writer.Write("MetaDescription", manu.MetaDescription);
 					writer.Write("MetaTitle", manu.MetaTitle);
 
-					WritePicture(writer, context, manu.Picture, _mediaSettings.ManufacturerThumbPictureSize);
+					WritePicture(writer, context, manu.Picture, _mediaSettings.ManufacturerThumbPictureSize, _mediaSettings.ManufacturerThumbPictureSize);
 
 					WriteLocalized(writer, context, lang =>
 					{

Original file line number	Diff line number	Diff line change
`@@ -150,17 +150,17 @@ protected virtual void WriteCategories(XmlWriter writer, int parentCategoryId)`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- protected virtual void WritePicture(XmlWriter writer, XmlExportContext context, Picture picture, int thumbSize)`
	`153`	`+ protected virtual void WritePicture(XmlWriter writer, XmlExportContext context, Picture picture, int thumbSize, int defaultSize)`
`154`	`154`	`{`
`155`	`155`	`if (picture != null)`
`156`	`156`	`{`
`157`	`157`	`writer.WriteStartElement("Picture");`
`158`	`158`	`writer.Write("Id", picture.Id.ToString());`
`159`	`159`	`writer.Write("SeoFileName", picture.SeoFilename);`
`160`	`160`	`writer.Write("MimeType", picture.MimeType);`
`161`		`- writer.Write("ThumbImageUrl", _pictureService.GetPictureUrl(picture, thumbSize, false, storeLocation: context.Store.Url));`
`162`		`- writer.Write("ImageUrl", _pictureService.GetPictureUrl(picture, thumbSize, false, storeLocation: context.Store.Url));`
`163`		`- writer.Write("FullSizeImageUrl", _pictureService.GetPictureUrl(picture, 0, false, storeLocation: context.Store.Url));`
	`161`	`+ writer.Write("ThumbImageUrl", _pictureService.GetPictureUrl(picture, thumbSize, false, context.Store.Url));`
	`162`	`+ writer.Write("ImageUrl", _pictureService.GetPictureUrl(picture, defaultSize, false, context.Store.Url));`
	`163`	`+ writer.Write("FullSizeImageUrl", _pictureService.GetPictureUrl(picture, 0, false, context.Store.Url));`
`164`	`164`	`writer.WriteEndElement();`
`165`	`165`	`}`
`166`	`166`	`}`
`@@ -528,7 +528,7 @@ public virtual void WriteProductToXml(XmlWriter writer, Product product, XmlExpo`
`528`	`528`	`writer.WriteStartElement("Pictures");`
`529`	`529`	`foreach (int pictureId in combination.GetAssignedPictureIds())`
`530`	`530`	`{`
`531`		`- WritePicture(writer, context, _pictureService.GetPictureById(pictureId), _mediaSettings.ProductThumbPictureSize);`
	`531`	`+ WritePicture(writer, context, _pictureService.GetPictureById(pictureId), _mediaSettings.ProductThumbPictureSize, _mediaSettings.ProductDetailsPictureSize);`
`532`	`532`	`}`
`533`	`533`	`writer.WriteEndElement(); // Pictures`
`534`	`534`
`@@ -543,7 +543,7 @@ public virtual void WriteProductToXml(XmlWriter writer, Product product, XmlExpo`
`543`	`543`	`writer.Write("Id", productPicture.Id.ToString());`
`544`	`544`	`writer.Write("DisplayOrder", productPicture.DisplayOrder.ToString());`
`545`	`545`
`546`		`- WritePicture(writer, context, productPicture.Picture, _mediaSettings.ProductThumbPictureSize);`
	`546`	`+ WritePicture(writer, context, productPicture.Picture, _mediaSettings.ProductThumbPictureSize, _mediaSettings.ProductDetailsPictureSize);`
`547`	`547`
`548`	`548`	`writer.WriteEndElement();`
`549`	`549`	`}`
`@@ -588,7 +588,7 @@ public virtual void WriteProductToXml(XmlWriter writer, Product product, XmlExpo`
`588`	`588`	`writer.Write("Alias", category.Alias);`
`589`	`589`	`writer.Write("DefaultViewMode", category.DefaultViewMode);`
`590`	`590`
`591`		`- WritePicture(writer, context, category.Picture, _mediaSettings.CategoryThumbPictureSize);`
	`591`	`+ WritePicture(writer, context, category.Picture, _mediaSettings.CategoryThumbPictureSize, _mediaSettings.CategoryThumbPictureSize);`
`592`	`592`
`593`	`593`	`WriteLocalized(writer, context, lang =>`
`594`	`594`	`{`
`@@ -631,7 +631,7 @@ public virtual void WriteProductToXml(XmlWriter writer, Product product, XmlExpo`
`631`	`631`	`writer.Write("MetaDescription", manu.MetaDescription);`
`632`	`632`	`writer.Write("MetaTitle", manu.MetaTitle);`
`633`	`633`
`634`		`- WritePicture(writer, context, manu.Picture, _mediaSettings.ManufacturerThumbPictureSize);`
	`634`	`+ WritePicture(writer, context, manu.Picture, _mediaSettings.ManufacturerThumbPictureSize, _mediaSettings.ManufacturerThumbPictureSize);`
`635`	`635`
`636`	`636`	`WriteLocalized(writer, context, lang =>`
`637`	`637`	`{`