correct logic in importer

This commit is contained in:
Sam 2015-08-03 18:30:26 +10:00
parent a1f02d4baa
commit 02a38eebbb
1 changed files with 4 additions and 1 deletions

View File

@ -763,7 +763,7 @@ SQL
if l["href"] if l["href"]
l["href"] = uri.path l["href"] = uri.path
# we have an internal link, lets see if we can remap it? # we have an internal link, lets see if we can remap it?
permalink = Permalink.find_by_url(uri.path) permalink = Permalink.find_by_url(uri.path) rescue nil
if l["href"] && permalink && permalink.target_url if l["href"] && permalink && permalink.target_url
l["href"] = permalink.target_url l["href"] = permalink.target_url
end end
@ -774,12 +774,15 @@ SQL
if upload_name if upload_name
png = UPLOAD_DIR + "/" + upload_name + ".png" png = UPLOAD_DIR + "/" + upload_name + ".png"
jpg = UPLOAD_DIR + "/" + upload_name + ".jpg" jpg = UPLOAD_DIR + "/" + upload_name + ".jpg"
gif = UPLOAD_DIR + "/" + upload_name + ".gif"
# check to see if we have it # check to see if we have it
if File.exist?(png) if File.exist?(png)
image = png image = png
elsif File.exists?(jpg) elsif File.exists?(jpg)
image = jpg image = jpg
elsif File.exists?(gif)
image = gif
end end
end end