problems with json ssbond

diff --git a/django_simple/todo/jobfiles.py b/django_simple/todo/jobfiles.py
index c3484fa..856c22e 100644 (file)
--- a/django_simple/todo/jobfiles.py
+++ b/django_simple/todo/jobfiles.py
@@ -15,6 +15,7 @@ logger = logging.getLogger(__name__)
 
 def write_ssbond(ssbond):
      list=[]
+     ssbond=json.loads(ssbond)
      for e in ssbond:
            list.append(e[0])
            list.append(e[1])

diff --git a/django_simple/todo/models.py b/django_simple/todo/models.py
index 5177996..d206b37 100644 (file)
--- a/django_simple/todo/models.py
+++ b/django_simple/todo/models.py
@@ -24,10 +24,10 @@ class Task(models.Model):
     name = models.TextField(max_length=100)
     
     ssbond = models.TextField(max_length=2000,default='')
-    def setssbond(self,x):
-       self.ssbond = json.dumps(x)
-    def getssbond(self):
-       return json.loads(self.ssbond)
+#    def setssbond(self,x):
+#       self.ssbond = json.dumps(x)
+#    def getssbond(self):
+#       return json.loads(self.ssbond)
 
     unres_ff = models.CharField(max_length=20,choices=FF_CHOICE,default='E0LL2Y')
 # minimization

diff --git a/django_simple/todo/views.py b/django_simple/todo/views.py
index f4dc960..4ffb0e7 100644 (file)
--- a/django_simple/todo/views.py
+++ b/django_simple/todo/views.py
@@ -6,6 +6,7 @@ from .models import Task
 import datetime
 import os
 import subprocess
+import json
 
 res_codes = [
                 # 20 canonical amino acids
@@ -91,7 +92,7 @@ def from_pdb(file):
       i=i-(chain_end[c]-chain_start[c])-3
     ssbond=[ [e[0]-unres_shift[c[0]]+1,e[1]-unres_shift[c[1]]+1] for e,c in zip(ssbond,ssbond_ch)]     
 
-    return seq,ssbond
+    return seq,json.dumps(ssbond)
 
 
 @login_required