I use Aperture on the Mac for that. I tag them with the map and film nr. and image nr. on the film.
works for me