Who is right on oil policy?

Russia announced today that they will be holding joint naval exercises with Venezuela. OPEC meeting in Vienna plans to hold or cut production to keep oil prices high. The two candidates differ on short term energy production. McCain says drill now while Obama prefers to wait and develop new energy resources. McCain wants to do the same but says drill now. The oil debate is not an environmental one, it is national security issue. Which candidate is correct on the issue?