Tweak export functionality to export all the values for the specified location

Hi,
I posted this to the forum on 9/16/1008: http://forum.civicrm.org/index.php?topic=4840.new;topicseen#new. post includes lobo's reply with request to post here.

I have been doing some pretty rigorous testing of the new export functionality and it is AWESOME!!! Thank you lobo, Dave, Kurund et al... I know this will be very useful to us and I hope to many others as well.
I don't know if this suggestion is (easily) doable, but we are so close to having "everything" that I thought I'd pose it anyway and leave it to you to give me the scoop.

In instances where an individual has more than one e.g. "Home Phone" number or email, only the first phone or email value is being exported. Ideally (to me), the export ought to work as follows:

I'll use Phone numbers as an example but the same would hold true for emails:
1. If you specify "Individual", "Phone", "Primary" - all of the phone numbers, regardless of location (home, work etc..) ought to be exported along with a descriptive column header like e.g. "Primary-Main-Phone Phone". Additional phone numbers for a Primary location ought to be made part of the same record so that you wind up with one line per contact that contains all of the Primary phone information

2. If you specify "Individual", "Phone", "Main" - all of the phone numbers associated with the "Main" location ought to be exported along with a descriptive column header like e.g. "Main-Phone Phone". Additional phone numbers for that location ought to be made part of the same record so that you wind up with one line per contact that contains all of the phone information for the "Main" location

3. If you specify "Individual", "Phone", "Main", "Home" - all and only the phone numbers that are associated with the "Main Home" location ought to be exported along with a descriptive column header like e.g. "Main Home-Phone". Additional phone numbers for the "Main-Home" location ought to be made part of the same record so that you wind up with one line per contact that contains all of phone numbers that as associated with the "Main-Home" location

Most of this is already heppening. It's only the additinal values for a location that aren't getting exported and the column header for "Primary" fields is a little vague.

Thanks,
Cynthia