From 7ac8878019bbf58d07593cd7c1114f65f8c5e94a 2015-12-03 04:58:27
From: Miguel Valdez <miguel.urco@jro.igp.gob.pe>
Date: 2015-12-03 04:58:27
Subject: [PATCH] serializer module added to Signal Chain

---

diff --git a/schainpy/model/io/jroIO_usrp_api.py b/schainpy/model/io/jroIO_usrp_api.py
index 6af5d85..45732b4 100644
--- a/schainpy/model/io/jroIO_usrp_api.py
+++ b/schainpy/model/io/jroIO_usrp_api.py
@@ -16,7 +16,7 @@ SERIALIZER = cPickle
 
 # from schainpy.serializer import DynamicSerializer
 from schainpy.model.io.jroIO_usrp import USRPReader
-from schainpy.serializer.DataTranslate import obj2Serial
+from schainpy.model.serializer.data import obj2Serial
 
 class USRPReaderAPI(USRPReader, threading.Thread):
     
diff --git a/schainpy/serializer/__init__.py b/schainpy/model/serializer/__init__.py
similarity index 100%
rename from schainpy/serializer/__init__.py
rename to schainpy/model/serializer/__init__.py
diff --git a/schainpy/serializer/DataTranslate.py b/schainpy/model/serializer/data.py
similarity index 91%
rename from schainpy/serializer/DataTranslate.py
rename to schainpy/model/serializer/data.py
index ec9530b..5fce8c3 100644
--- a/schainpy/serializer/DataTranslate.py
+++ b/schainpy/model/serializer/data.py
@@ -3,7 +3,7 @@ Created on Jul 15, 2014
 
 @author: Miguel Urco
 '''
-from JROSerializer import DynamicSerializer
+from serializer import DynamicSerializer
 
 PICKLE_SERIALIZER = DynamicSerializer('cPickle')
 MSGPACK_SERIALIZER = DynamicSerializer('msgpack')
@@ -75,14 +75,13 @@ def dict2Obj(myDict):
     
     return myObj
 
-def obj2Serial(myObj, serializer='msgpack', **kwargs):
+def dict2Serial(myDict, serializer='msgpack'):
     
     if serializer == 'cPickle':
         SERIALIZER = PICKLE_SERIALIZER
     else:
         SERIALIZER = MSGPACK_SERIALIZER
-        
-    myDict = obj2Dict(myObj, **kwargs)
+    
     mySerial = SERIALIZER.dumps(myDict)
     
     return mySerial
@@ -93,8 +92,22 @@ def serial2Dict(mySerial, serializer='msgpack'):
         SERIALIZER = PICKLE_SERIALIZER
     else:
         SERIALIZER = MSGPACK_SERIALIZER
+    
+    myDict = SERIALIZER.loads(mySerial)
+    
+    return myDict
+
+def obj2Serial(myObj, serializer='msgpack', **kwargs):
+    
+    if serializer == 'cPickle':
+        SERIALIZER = PICKLE_SERIALIZER
+    else:
+        SERIALIZER = MSGPACK_SERIALIZER
         
-    return SERIALIZER.loads(mySerial)
+    myDict = obj2Dict(myObj, **kwargs)
+    mySerial = dict2Serial(myDict, serializer)
+    
+    return mySerial
 
 def serial2Obj(mySerial, metadataDict = {}, serializer='msgpack'):
     
@@ -103,7 +116,7 @@ def serial2Obj(mySerial, metadataDict = {}, serializer='msgpack'):
     else:
         SERIALIZER = MSGPACK_SERIALIZER
         
-    myDataDict = SERIALIZER.loads(mySerial)
+    myDataDict = serial2Dict(mySerial, serializer)
     
     if not metadataDict:
         myObj = dict2Obj(myDataDict)
@@ -112,4 +125,4 @@ def serial2Obj(mySerial, metadataDict = {}, serializer='msgpack'):
     metadataDict.update(myDataDict)
     myObj = dict2Obj(metadataDict)
     
-    return myObj
\ No newline at end of file
+    return myObj
diff --git a/schainpy/serializer/JROSerializer.py b/schainpy/model/serializer/serializer.py
similarity index 100%
rename from schainpy/serializer/JROSerializer.py
rename to schainpy/model/serializer/serializer.py
diff --git a/schainpy/serializer/test/DynamicObject.py b/schainpy/model/serializer/test/DynamicObject.py
similarity index 100%
rename from schainpy/serializer/test/DynamicObject.py
rename to schainpy/model/serializer/test/DynamicObject.py
diff --git a/schainpy/serializer/test/DynamicSerializer.py b/schainpy/model/serializer/test/DynamicSerializer.py
similarity index 100%
rename from schainpy/serializer/test/DynamicSerializer.py
rename to schainpy/model/serializer/test/DynamicSerializer.py
diff --git a/schainpy/serializer/test/DynamicYAML.py b/schainpy/model/serializer/test/DynamicYAML.py
similarity index 100%
rename from schainpy/serializer/test/DynamicYAML.py
rename to schainpy/model/serializer/test/DynamicYAML.py
diff --git a/schainpy/serializer/test/Lookup.py b/schainpy/model/serializer/test/Lookup.py
similarity index 100%
rename from schainpy/serializer/test/Lookup.py
rename to schainpy/model/serializer/test/Lookup.py
diff --git a/schainpy/serializer/test/OrderedYAML.py b/schainpy/model/serializer/test/OrderedYAML.py
similarity index 100%
rename from schainpy/serializer/test/OrderedYAML.py
rename to schainpy/model/serializer/test/OrderedYAML.py
diff --git a/schainpy/serializer/test/PrecisionTime.py b/schainpy/model/serializer/test/PrecisionTime.py
similarity index 100%
rename from schainpy/serializer/test/PrecisionTime.py
rename to schainpy/model/serializer/test/PrecisionTime.py
diff --git a/schainpy/serializer/test/Serializer.py b/schainpy/model/serializer/test/Serializer.py
similarity index 100%
rename from schainpy/serializer/test/Serializer.py
rename to schainpy/model/serializer/test/Serializer.py
diff --git a/schainpy/serializer/test/__init__.py b/schainpy/model/serializer/test/__init__.py
similarity index 100%
rename from schainpy/serializer/test/__init__.py
rename to schainpy/model/serializer/test/__init__.py
diff --git a/schainpy/serializer/test/serialtest.py b/schainpy/model/serializer/test/serialtest.py
similarity index 100%
rename from schainpy/serializer/test/serialtest.py
rename to schainpy/model/serializer/test/serialtest.py
diff --git a/schainpy/serializer/test/test _serializer_speed.py b/schainpy/model/serializer/test/test _serializer_speed.py
similarity index 100%
rename from schainpy/serializer/test/test _serializer_speed.py
rename to schainpy/model/serializer/test/test _serializer_speed.py