added the ability to use cjson for json encoding/decoding. gracefully falls back...

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1220 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/src/python/osrf/json.py b/src/python/osrf/json.py
index d0a4764..1508126 100644 (file)
--- a/src/python/osrf/json.py
+++ b/src/python/osrf/json.py
@@ -3,7 +3,15 @@ from osrf.net_obj import NetworkObject, parse_net_object
 from osrf.const import OSRF_JSON_PAYLOAD_KEY, OSRF_JSON_CLASS_KEY
 import osrf.log
 
+try:
+    # if available, use the faster cjson module for encoding/decoding JSON
+    import cjson
+    _use_cjson = True
+except ImportError:
+    _use_cjson = False
+
 class NetworkEncoder(simplejson.JSONEncoder):
+    ''' Encoder used by simplejson '''
     def default(self, obj):
 
         if isinstance(obj, NetworkObject):
@@ -24,22 +32,61 @@ class NetworkEncoder(simplejson.JSONEncoder):
         return obj
 
 
+def encode_object(obj):
+    ''' Generic opensrf object encoder, used by cjson '''
+
+    if isinstance(obj, dict):
+        newobj = {}
+        for k,v in obj.iteritems():
+            newobj[k] = encode_object(v)
+        return newobj
+
+    else:
+        if isinstance(obj, list):
+            return [encode_object(v) for v in obj]
+
+        else:
+            if isinstance(obj, NetworkObject):
+                reg = obj.get_registry()
+                data = obj.get_data()
+                if reg.protocol == 'array':
+                    objarray = []
+                    for key in reg.keys:
+                        objarray.append(data.get(key)) 
+                    data = objarray
+
+                return {
+                    OSRF_JSON_CLASS_KEY: reg.hint,
+                    OSRF_JSON_PAYLOAD_KEY: encode_object(data)
+                }
+
+    return obj
+        
+
+
 def to_json(obj):
     """Turns a python object into a wrapped JSON object"""
+    if _use_cjson:
+        return cjson.encode(encode_object(obj))
     return simplejson.dumps(obj, cls=NetworkEncoder)
 
 
 def to_object(json):
     """Turns a JSON string into python objects"""
-    obj = simplejson.loads(json)
-    return parse_net_object(obj)
+    if _use_cjson:
+        return parse_net_object(cjson.decode(json))
+    return parse_net_object(simplejson.loads(json))
 
 def parse_json_raw(json):
     """Parses JSON the old fashioned way."""
+    if _use_cjson:
+        return cjson.decode(json)
     return simplejson.loads(json)
 
 def to_json_raw(obj):
     """Stringifies an object as JSON with no additional logic."""
+    if _use_cjson:
+        return cjson.encode(json)
     return simplejson.dumps(obj)
 
 def __tabs(depth):
@@ -56,7 +103,6 @@ def debug_net_object(obj, depth=1):
 
     debug_str = ''
     if isinstance(obj, NetworkObject):
-        osrf.log.log_internal("Returning key/value pairs for NetworkObject")
         reg = obj.get_registry()
         keys = list(reg.keys) # clone it, so sorting won't break the original
         keys.sort()
@@ -68,13 +114,12 @@ def debug_net_object(obj, depth=1):
                 key += '.' # pad the names to make the values line up somewhat
             val = getattr(obj, k)()
 
-            subobj = val and not (isinstance(val, unicode) or \
+            subobj = val and not (isinstance(val, unicode) or isinstance(val, str) or \
                 isinstance(val, int) or isinstance(val, float) or isinstance(val, long))
 
             debug_str += __tabs(depth) + key + ' = '
 
             if subobj:
-                osrf.log.log_internal("Returning key/value pairs for subobject")
                 debug_str += '\n'
                 val = debug_net_object(val, depth+1)
 
@@ -98,7 +143,7 @@ def pprint(json):
 
     for c in json:
 
-        if eatws: # simpljson adds a pesky space after array and object items
+        if eatws and not _use_cjson: # simpljson adds a pesky space after array and object items
             if c == ' ': 
                 continue