What goddess and enchantress held Odysseus captive?

Calypso loved Odysseus and he spent 7 years with her. He was captivated if not actually held captive. Circe also help him for a year or so.