Forgot to update one request to request.REQUEST variable lookup
[htsworkflow.git] / htsworkflow / frontend / experiments / experiments.py
index d11cda75a22d6652e4f35ec4363772eeea7db66d..0d3f81f7490dc05a39faf593db2f591afccba65f 100755 (executable)
@@ -2,6 +2,7 @@
 from django.http import HttpResponse
 from datetime import datetime
 from string import *
+import os
 import re
 from htsworkflow.frontend import settings
 from htsworkflow.frontend.experiments.models import FlowCell, DataRun
@@ -17,30 +18,28 @@ def updStatus(request):
     fcid = 'none'
     runfolder = 'unknown'
     ClIP = request.META['REMOTE_ADDR']
-    granted = False    
 
-    if request.has_key('user'):
-      user = request['user']
-
-    #Check access permission 
-    if (user == 'rami' and settings.ALLOWED_IPS.has_key(ClIP)):  granted = True
-    if not granted: return HttpResponse("access denied.")
+    if hasattr(request, 'user'):
+      user = request.user
 
+    #Check access permission
+    if not (user.is_superuser and settings.ALLOWED_IPS.has_key(ClIP)): 
+        return HttpResponse("%s access denied from %s." % (user, ClIP))
 
     # ~~~~~~Parameters for the job ~~~~
-    if request.has_key('fcid'):
-      fcid = request['fcid']
+    if request.REQUEST.has_key('fcid'):
+      fcid = request.REQUEST['fcid']
     else:
       return HttpResponse('missing fcid')
     
-    if request.has_key('runf'):
-      runfolder = request['runf']
+    if request.REQUEST.has_key('runf'):
+      runfolder = request.REQUEST['runf']
     else:
       return HttpResponse('missing runf')
 
     
-    if request.has_key('updst'):
-      UpdatedStatus = request['updst']
+    if request.REQUEST.has_key('updst'):
+      UpdatedStatus = request.REQUEST['updst']
     else:
       return HttpResponse('missing status')
     
@@ -55,8 +54,8 @@ def updStatus(request):
       #if there's a message update that too
       mytimestamp = datetime.now().__str__()
       mytimestamp = re.sub(pattern=":[^:]*$",repl="",string=mytimestamp)
-      if request.has_key('msg'):
-        rec.run_note += ", "+request['msg']+" ("+mytimestamp+")"
+      if request.REQUEST.has_key('msg'):
+        rec.run_note += ", "+request.REQUEST['msg']+" ("+mytimestamp+")"
       else :
         if UpdatedStatus == '1':
           rec.run_note = "Started ("+mytimestamp+")"
@@ -81,55 +80,41 @@ def generateConfile(request,fcid):
 
     #if not granted: return HttpResponse("access denied.")
 
-    cnfgfile = 'READ_LENGTH 25\n'
-    cnfgfile += 'ANALYSIS eland\n'
-    cnfgfile += 'GENOME_FILE all_chr.fa\n'
-    cnfgfile += 'ELAND_MULTIPLE_INSTANCES 8\n'
+    config = ['READ_LENGTH 25']
+    config += ['ANALYSIS eland']
+    config += ['GENOME_FILE all_chr.fa']
+    config += ['ELAND_MULTIPLE_INSTANCES 8']
     genome_dir = 'GENOME_DIR /Volumes/Genomes/'
     eland_genome = 'ELAND_GENOME /Volumes/Genomes/'
     
     try:                                                                                                                                              
-      rec = FlowCell.objects.get(flowcell_id=fcid)
-      
-      cnfgfile += '1:'+genome_dir+rec.lane_1_library.library_species.use_genome_build+'\n'
-      cnfgfile += '1:'+eland_genome+rec.lane_1_library.library_species.use_genome_build+'\n'
-
-      cnfgfile += '2:'+genome_dir+rec.lane_2_library.library_species.use_genome_build+'\n'
-      cnfgfile += '2:'+eland_genome+rec.lane_2_library.library_species.use_genome_build+'\n'
-      cnfgfile += '3:'+genome_dir+rec.lane_3_library.library_species.use_genome_build+'\n'
-      cnfgfile += '3:'+eland_genome+rec.lane_3_library.library_species.use_genome_build+'\n'
-
-      cnfgfile += '4:'+genome_dir+rec.lane_4_library.library_species.use_genome_build+'\n'
-      cnfgfile += '4:'+eland_genome+rec.lane_4_library.library_species.use_genome_build+'\n'
+      fc = FlowCell.objects.get(flowcell_id=fcid)
+      for lane in fc.lane_set.all():
+          print dir(lane.library.library_species)
+          config += [ str(lane.lane_number) +":" + \
+                      genome_dir + lane.library.library_species.scientific_name ]
+          config += [ str(lane.lane_number) +":" + \
+                      eland_genome + lane.library.library_species.scientific_name ]
       
-      cnfgfile += '5:'+genome_dir+rec.lane_5_library.library_species.use_genome_build+'\n'
-      cnfgfile += '5:'+eland_genome+rec.lane_5_library.library_species.use_genome_build+'\n'
-
-      cnfgfile += '6:'+genome_dir+rec.lane_6_library.library_species.use_genome_build+'\n'
-      cnfgfile += '6:'+eland_genome+rec.lane_6_library.library_species.use_genome_build+'\n'
-
-      cnfgfile += '7:'+genome_dir+rec.lane_7_library.library_species.use_genome_build+'\n'
-      cnfgfile += '7:'+eland_genome+rec.lane_7_library.library_species.use_genome_build+'\n'
-
-      cnfgfile += '8:'+genome_dir+rec.lane_8_library.library_species.use_genome_build+'\n'
-      cnfgfile += '8:'+eland_genome+rec.lane_8_library.library_species.use_genome_build
-
     except ObjectDoesNotExist:
-      cnfgfile = 'Entry not found for fcid  = '+fcid
+      config = 'Entry not found for fcid  = '+fcid
 
-    return cnfgfile
+    return os.linesep.join(config)
 
-def getConfile(request):
+def getConfile(req):
     granted = False
-    ClIP = request.META['REMOTE_ADDR']
+    ClIP = req.META['REMOTE_ADDR']
     if (settings.ALLOWED_IPS.has_key(ClIP)):  granted = True
 
     if not granted: return HttpResponse("access denied. IP: "+ClIP)
 
     fcid = 'none'
-    cnfgfile = ''
+    cnfgfile = 'Nothing found'
     runfolder = 'unknown'
+    request = req.REQUEST
+    print request, dir(request)
+    print request['fcid'], request.has_key('fcid')
+    print request['runf']
     if request.has_key('fcid'):
       fcid = request['fcid']
       if request.has_key('runf'):
@@ -151,19 +136,20 @@ def getConfile(request):
         except ObjectDoesNotExist:
           cnfgfile = 'Entry not found for RunFolder = '+runfolder
 
-    return HttpResponse(cnfgfile)
+    return HttpResponse(cnfgfile, mimetype='text/plain')
 
-def getLaneLibs(request):
+def getLaneLibs(req):
     granted = False
-    ClIP = request.META['REMOTE_ADDR']
+    ClIP = req.META['REMOTE_ADDR']
     if (settings.ALLOWED_IPS.has_key(ClIP)):  granted = True
 
     if not granted: return HttpResponse("access denied.")
 
+    request = req.REQUEST
     fcid = 'none'
     outputfile = ''
     if request.has_key('fcid'):
-      fcid = request['fcid']                                                                                                      
+      fcid = request['fcid']
       try:                                
         rec = FlowCell.objects.get(flowcell_id=fcid)
         #Ex: 071211
@@ -191,4 +177,4 @@ def getLaneLibs(request):
         outputfile = 'Flowcell entry not found for: '+fcid
     else: outputfile = 'Missing input: flowcell id'
 
-    return HttpResponse(outputfile)
+    return HttpResponse(outputfile, mimetype='text/plain')