summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2012-06-26 12:46:38 +0200
committermguetlein <martin.guetlein@gmail.com>2012-06-26 12:46:38 +0200
commitb7103d9fe4b96e41dc5e6fbe1c73c80e05a9bab7 (patch)
tree06c837a7082d9afb9350a23c7260255b393a2da1
parent298a2c06cc248bfc216b7712d44f1beaf091da11 (diff)
fix unizp-directory-problem when zipped via migration script
-rw-r--r--application.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/application.rb b/application.rb
index 9e239b7..fc71963 100644
--- a/application.rb
+++ b/application.rb
@@ -127,7 +127,7 @@ helpers do
def unzip_dataset()
if !File.exist?("#{@@datadir}/#{@id}.json")
LOGGER.debug "unzipping #{@@datadir}/#{@id}.json.zip"
- output = IO.popen("/usr/bin/unzip -n #{@json_zip_file} -d #{@@datadir}")
+ output = IO.popen("/usr/bin/unzip -nj #{@json_zip_file} -d #{@@datadir}")
$stderr.puts output.readlines
output.close
raise "could not unzip file" unless File.exist?("#{@@datadir}/#{@id}.json")
@@ -140,7 +140,7 @@ helpers do
def unzip_json()
if !File.exist?("#{@@datadir}/#{@id}.json")
LOGGER.debug "unzipping #{@@datadir}/#{@id}.json.zip"
- output = IO.popen("/usr/bin/unzip -n #{@json_zip_file} -d #{@@datadir}")
+ output = IO.popen("/usr/bin/unzip -nj #{@json_zip_file} -d #{@@datadir}")
$stderr.puts output.readlines
output.close
raise "could not unzip file #{@json_zip_file} to #{@@datadir}/#{@id}.json" unless File.exist?("#{@@datadir}/#{@id}.json")
@@ -163,7 +163,7 @@ helpers do
def unzip_arff()
if !File.exist?("#{@@datadir}/#{@id}.arff")
LOGGER.debug "unzipping #{@@datadir}/#{@id}.arff.zip"
- output = IO.popen("/usr/bin/unzip -n #{@@datadir}/#{@id}.arff.zip -d #{@@datadir}")
+ output = IO.popen("/usr/bin/unzip -nj #{@@datadir}/#{@id}.arff.zip -d #{@@datadir}")
$stderr.puts output.readlines
output.close
raise "could not unzip file" unless File.exist?("#{@@datadir}/#{@id}.arff")
@@ -422,7 +422,6 @@ end
array << ["compounds", dataset.compounds]
array << ["features", dataset.features]
array << ["values", dataset.data_entries]
-
case @accept
when /html/ # redland sends text/rdf instead of application/rdf+xml