dzialajacy upload pliku inputowego do katalogu z pdb

diff --git a/qcg/forms.py b/qcg/forms.py
index 18d5f8b..13d0a5e 100644 (file)
--- a/qcg/forms.py
+++ b/qcg/forms.py
@@ -129,7 +129,7 @@ class JobDescriptionForm(forms.Form):
     
     
     application = forms.ChoiceField(choices=APPLICATION_CHOICES, label=u"Aplikacja", required=False, initial='unres-gab')  # TODO choices
-    master_file = forms.CharField(label=u"Plik główny", max_length=500, required=False)
+    #master_file = forms.CharField(label=u"Plik główny", max_length=500, required=False)
     executable = forms.CharField(label=u"Plik wykonywalny", max_length=500, required=False)
     script = forms.CharField(label=u"Skrypt", widget=forms.Textarea(attrs={'rows': 2, 'cols': 40}), required=False)
     arguments = forms.MultipleChoiceField(label=u"Argumenty", required=False)

diff --git a/qcg/templates/qcg/job_submit_form.html b/qcg/templates/qcg/job_submit_form.html
index 7e3007d..d5b3c14 100644 (file)
--- a/qcg/templates/qcg/job_submit_form.html
+++ b/qcg/templates/qcg/job_submit_form.html
@@ -21,9 +21,7 @@
 
         {% bootstrap_field form.pdb_file layout="horizontal" %}
         {% bootstrap_field form.sequence layout="horizontal" %}
-        
 
-        {% bootstrap_field form.master_file layout="horizontal" %}
                 
         <!-- {% bootstrap_field form.application layout="horizontal" %}
         {% bootstrap_field form.executable layout="horizontal" form_group_class="form-group collapse" %}

diff --git a/qcg/views.py b/qcg/views.py
index 3f37df1..a459694 100644 (file)
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -31,6 +31,8 @@ from django.utils import encoding
 import string
 import random
 import os
+from qcg import constants
+from qcg.utils import chunks
 # for Debugging
 from pprint import pprint
 
@@ -257,22 +259,21 @@ def job_submit(request, template_id=None):
                                        for env in env_formset.cleaned_data if env and not env['DELETE']]
 
             # Generowanie pliku inputowego
-            #md_input=list()
             md_input=generate_md_inputfile(params)
-            filename='input.'+id_generator(6)+'.tmp'
-            f = open(filename, 'w')
-            # for Debugging
-            for idx in md_input:
-                print idx
-                f.write("%s\n" % idx)
-            f.close()
-            os.remove(filename)
-
+            url=os.path.splitext(params['pdb_file'])[0]+'_MD_genarated.inp'
+            params['master_file']=url
             # Upload
+            ftp = FTPOperation(request.session['proxy'])
+            ftp.put(url)
+            for chunk in chunks('\n'.join([str(i) for i in md_input] ), 4096):
+                ftp.stream.put(chunk)
+            ftp.stream.put(None)
+            ftp.wait()
+            
 
             params['persistent'] = True
             # Debugging parametrów
-            pprint(params)
+            #pprint(params)
 
             job_desc = to_job_desc(params, request.session['proxy'])
 
@@ -285,14 +286,13 @@ def job_submit(request, template_id=None):
 
                 return redirect(template)
 
-            # wyłączenie wysyłania zadania
-            '''
+            # wyłączenie wysyłania zadania - zakomentować poniżej
             job = job_desc.submit()
 
             messages.success(request,
                              format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
                                          u'Zlecono zadanie <em>{}</em>.', job.job_id))
-            '''
+            
             return redirect('jobs')
     else:
         form = JobDescriptionForm(initial=form_data)