Bug 797509 - Fixed a logging problem, made the dates format in mapping a...

... little simpler.