From e2832b83859bb4ca60d74131383e9a7bed2341b8 Mon Sep 17 00:00:00 2001
From: anwinged <anwinged@c733b785-2984-70f4-63a9-da4130069974>
Date: Sun, 11 Mar 2012 10:00:06 +0000
Subject: [PATCH]

---
 opal.py       | 26 ++++++++++++++++++++------
 tasks/task.js | 18 +++---------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/opal.py b/opal.py
index 989d165..335d8ec 100644
--- a/opal.py
+++ b/opal.py
@@ -129,8 +129,11 @@ class Parameter:
     def __init__(self, paramdescr):
         pass
 
-def DoDataParametrization(data):
-    pass
+def DoDataParametrization(objectdata):
+    data = objectdata['data']
+    for label in data:
+        par = Parameter(data[label])
+        data[label] = par
 
 class ObjectDescription:
     def __init__(self, parentdescr, label, data):
@@ -172,6 +175,12 @@ class ObjectDefinition:
         self.descr = objectdescr
         self.params = {}
 
+    def GetParameter(self, label):
+        pass
+
+    def SetParameter(self, label, value):
+        pass
+
 class ModelDefinition(ObjectDefinition):
     def __init__(self, modeldescr):
         ObjectDefinition(self, modeldescr)
@@ -179,12 +188,13 @@ class ModelDefinition(ObjectDefinition):
 class MethodDefinition(ObjectDefinition):
     def __init__(self, methoddescr):
         ObjectDefinition(self, methoddescr)
+        self.taskjob = None
 
 #-------------------------------------------------------------------------------
 
-class Task:
-    def __init__(self, server):
-        pass
+class Taskjob:
+    def __init__(self, data):
+        self.data = data
 
     def Start(self):
         pass
@@ -201,6 +211,7 @@ class Task:
 #-------------------------------------------------------------------------------
 
 def main():
+    import pprint
     s = LocalServer()
     s.LoadTasksDescriptions()
     ds = s.GetTasksDescriptions()
@@ -209,7 +220,10 @@ def main():
         print m.GetTitle()
         print m.GetLabel()
         print m.GetAuthor()
-        print m.GetId()
+        print pprint.pformat(m.data, indent = 2)
+
+    mds = ms[0]
+    mdf = 0
 
 if __name__ == '__main__':
     main()
diff --git a/tasks/task.js b/tasks/task.js
index f44dd02..ddf604c 100644
--- a/tasks/task.js
+++ b/tasks/task.js
@@ -8,6 +8,7 @@
         
             "title": "Simple example model",
             "author": "Anton Vakhrushev",
+            "date": "2012-03-08",
 
             "data": {
             
@@ -26,6 +27,7 @@
             
                 "default": {
                     "title": "Default method",
+                    "author": "Anton Vakhrushev",
                     "data": {
                         "p": {
                             "type":     "int",
@@ -33,22 +35,8 @@
                         }
                     }
                 }
-            },
-            
-            "result": {
-                
-                "data": {
-                    "sum": "int"
-                },
-                
-                "table": {
-                    "head": [
-                        { "x" : "int" },
-                        { "u" : "double" }
-                    ]
-                }
-                
             }
+            
         }
     }
 }