After a computer problem which required re-installing the OS, I would like to restore my catalogue and images in Lightroom. I've installed LR and tried to point it in the direction of the catalog and images but it then seems to have forgotten all my edits. That, of course, won't do.

I'm running LR 2.4 and have my images on a network drive and my catalog locally. What do I now?