- if data is not None:
- # accept user defined choices
- self.fields['queue'].choices += ((data.get('queue'), data.get('queue')), )
- self.fields['arguments'].choices += ((v, v) for v in data.getlist('arguments'))
- self.fields['properties'].choices += ((v, v) for v in data.getlist('properties'))
- self.fields['native'].choices += ((v, v) for v in data.getlist('native'))
+ preprocess_type = data.get('preprocess_type')
+ if preprocess_type == self.Process.CMD:
+ data['preprocess'] = data['preprocess_cmd']
+ elif preprocess_type == self.Process.SCRIPT:
+ data['preprocess'] = data['preprocess_script']
+ else:
+ data['preprocess'] = ''
+
+ postprocess_type = data.get('postprocess_type')
+ if postprocess_type == self.Process.CMD:
+ data['postprocess'] = data['postprocess_cmd']
+ elif postprocess_type == self.Process.SCRIPT:
+ data['postprocess'] = data['postprocess_script']
+ else:
+ data['postprocess'] = ''
+
+ return data
+
+ def clean_application(self):
+ return self.cleaned_data['application'].split('/', 1) if self.cleaned_data['application'] else ''
+
+ def clean_nodes(self):
+ return map(int, self.cleaned_data['nodes'].split(':', 2)) if self.cleaned_data['nodes'] else ''
+
+ def clean_executable(self):
+ return self._gsiftp_suffix(self.cleaned_data['executable'])
+
+ def clean_master_file(self):
+ return self._gsiftp_suffix(self.cleaned_data['master_file'])
+
+ def clean_input(self):
+ return self._gsiftp_suffix(self.cleaned_data['input'])
+
+ def clean_stage_in(self):
+ return [self._gsiftp_suffix(item) for item in self.cleaned_data['stage_in']]
+
+ def clean_preprocess_script(self):
+ return self._gsiftp_suffix(self.cleaned_data['preprocess_script'])
+
+ def clean_postprocess_script(self):
+ return self._gsiftp_suffix(self.cleaned_data['postprocess_script'])
+
+ def clean_pdb_file(self):
+ return self._gsiftp_suffix(self.cleaned_data['pdb_file'])
+
+ @staticmethod
+ def _gsiftp_suffix(url):
+ if url:
+ return url if url.startswith('gsiftp://') else 'gsiftp://' + url
+
+ def _init_user_choices(self, name, data, initial):
+ initial = initial.get(name) if initial is not None else None
+ choices = data.getlist(name)[:] if data is not None else []
+
+ if initial:
+ choices += initial if isinstance(initial, list) else [initial]
+ self.fields[name].initial = initial
+
+ if choices:
+ self.fields[name].choices += ((v, v) for v in choices)