X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=django_simple%2Ftodo%2Fviews.py;h=f545f1e286f0bd164532a56e926277c2d25ee096;hb=53f1728daa2b4d8d67349c048822ccd04e819d48;hp=4ffb0e73f59f2705f09fa5897ed693d1c6c91fd9;hpb=00fcf7b84f8d27f314f1e5a6296e402ec6252bc1;p=django_unres.git diff --git a/django_simple/todo/views.py b/django_simple/todo/views.py index 4ffb0e7..f545f1e 100644 --- a/django_simple/todo/views.py +++ b/django_simple/todo/views.py @@ -58,11 +58,13 @@ def from_pdb(file): sequence.append(aa) ires.append(i) if newchain: - chain_start[chain[ichain]]=i + if len(chain)>0: + chain_start[chain[ichain]]=i newchain = False if line[0:3] == 'TER': sequence.append('XX') - chain_end[chain[ichain]]=i + if len(chain)>0: + chain_end[chain[ichain]]=i ichain=ichain+1 newchain = True if line[0:6] == 'SSBOND': @@ -98,7 +100,7 @@ def from_pdb(file): @login_required def index(request): user = request.user - tasks = Task.objects.filter(owner=user) + tasks = Task.objects.filter(owner=user).order_by('-created_date') variable = '' return render(request, "index.html", { 'tasks': tasks @@ -406,7 +408,7 @@ def delete(request, task_id): @login_required def refresh_done(request): user = request.user - tasks = Task.objects.filter(owner=user) + tasks = Task.objects.filter(owner=user).order_by('-created_date') for task in tasks: if os.path.isfile(task.jobdirname+'/finished') and not task.done: task.done=True @@ -451,6 +453,7 @@ def refresh_done(request): if task.md_pdbref and task.type=='remd': for i in range(1,6): + try: with open(task.jobdirname+'/file_wham_T'+str(int(task.remd_cluter_temp))+'K_000'+str(i)+'.pdb', 'r') as f: line=f.readline() if i==1: @@ -463,7 +466,8 @@ def refresh_done(request): task.remd_model4=' '.join(line.split()[-6:]) elif i==5: task.remd_model5=' '.join(line.split()[-6:]) - + except EnvironmentError: + print 'file_wham_T*pdb open error' for i in range(1,6): with open(task.jobdirname+'/tmscore'+str(i)+'.out', 'r') as f: text=''