summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-01-12 10:00:01 +0100
committermr <mr@mrautenberg.de>2011-01-12 10:00:01 +0100
commitbac7e07df630a6bafbb950734019d192640477b4 (patch)
tree5d113143d5c49a187fe5ebe5175e311d1e727713
parent44a0ae95288fdf5db78801e36b84299217be10f1 (diff)
parent46764eb6ffc4dfbc9efdbcd3babf73b7b74cc331 (diff)
clean up
-rw-r--r--fminer.rb5
-rw-r--r--lazar.rb2
m---------libfminer0
3 files changed, 3 insertions, 4 deletions
diff --git a/fminer.rb b/fminer.rb
index 8e3c2c2..9608a50 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -67,7 +67,7 @@ end
# @return [text/uri-list] Task URI
post '/fminer/bbrc/?' do
- subjectid = params[:subjectid] ? subjectid = params[:subjectid] : nil
+ subjectid = params[:subjectid] ? params[:subjectid] : nil
subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"]
# TODO: is this thread safe??
#@@bbrc = Bbrc::Bbrc.new
@@ -223,8 +223,7 @@ post '/fminer/bbrc/?' do
# - hops Maximum number of hops
# @return [text/uri-list] Task URI
post '/fminer/last/?' do
- subjectid = nil
- subjectid = params[:subjectid] if params[:subjectid]
+ subjectid = params[:subjectid] ? params[:subjectid] : nil
subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"]
#@@last = Last::Last.new
minfreq = 5 unless minfreq = params[:min_frequency]
diff --git a/lazar.rb b/lazar.rb
index b95a444..4b69400 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -29,7 +29,7 @@ end
# @ return [text/uri-list] Task URI
post '/lazar/?' do
- subjectid = params[:subjectid] ? subjectid = params[:subjectid] : nil
+ subjectid = params[:subjectid] ? params[:subjectid] : nil
subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"]
halt 404, "No dataset_uri parameter." unless params[:dataset_uri]
diff --git a/libfminer b/libfminer
-Subproject e0eee431ecb954328ff64e3cc48840c7003a276
+Subproject c72bb7d99bb7f583f009e44be426910fb44cd4f