Commit 6232e58d authored by Marc Duez's avatar Marc Duez
Browse files

server: rename Vidjil into vidjil (V=>v)

-web2py need this to unlock module
parent 064256c9
......@@ -232,7 +232,7 @@ Database.prototype = {
$.ajax({
type: "POST",
timeout: 5000,
timeout: 15000,
crossDomain: true,
url: self.db_address + "default/result" + arg,
xhrFields: {withCredentials: true},
......
......@@ -102,13 +102,13 @@ def result():
& ( db.data_file.config_id == request.vars["config_id"] )
).select( orderby=db.sequence_file.sampling_date )
for row in query :
files += " applications/Vidjil/uploads/"+row.data_file.data_file
files += " applications/vidjil/uploads/"+row.data_file.data_file
if error == "" :
cmd = "python ../fuse.py -o "+output_file+" -t 100 "+files
p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
time.sleep(1)
p.wait()
f = open(output_file, "r")
output=f.readlines()
......
import toolbox
## return user list
def index():
import gluon.contrib.simplejson
......
......@@ -6,7 +6,7 @@ def run_vidjil(id_file, id_config):
## les chemins d'acces a vidjil / aux fichiers de sequences
vidjil_path = '/home/duez/git/vidjil'
germline_folder = vidjil_path + '/germline/'
upload_folder = vidjil_path + '/server/web2py/applications/Vidjil/uploads/'
upload_folder = vidjil_path + '/server/web2py/applications/vidjil/uploads/'
out_folder = vidjil_path + '/out/'
## filepath du fichier de séquence
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment