import string
import xmlrpclib
+import simplejson
+try:
+ # Try to use jsonlib before using simpljson. This is a hack to get around
+ # the fact that the version of simplejson avaialble for f8 is slightly
+ # faster than xmlrpc but not as fast as jsonlib. There is no jsonlib
+ # pacakge available for f8, so this has to be installed manually and
+ # is not expected to always be available. Remove this once we move away
+ # from f8 based MyPLC's
+ import jsonlib
+ json = jsonlib
+except:
+ json = simplejson
# See "2.2 Characters" in the XML specification:
#
else:
raise PLCAPIError, "Unsupported database type " + self.config.PLC_DB_TYPE
- # Aspects modify the API injecting code before/after method
- # calls. As of now we only have aspects for OMF integration,
- # that's why we enable aspects only if PLC_OMF is set to true.
+ # Aspects modify the API by injecting code before, after or
+ # around method calls. -- http://github.com/baris/pyaspects/blob/master/README
+ #
+ # As of now we only have aspects for OMF integration, that's
+ # why we enable aspects only if PLC_OMF is set to true.
if self.config.PLC_OMF_ENABLED:
- from aspects import apply_aspects; apply_aspects()
+ from aspects import apply_omf_aspect
+ apply_omf_aspect()
def callable(self, method):
data = buildSOAP(kw = {'%sResponse' % method: {'Result': result}}, encoding = self.encoding)
return data
+
+ def handle_json(self, source, data):
+ """
+ Handle a JSON request
+ """
+ method, args = json.loads(data)
+ try:
+ result = self.call(source, method, *args)
+ except Exception, e:
+ result = str(e)
+
+ return json.dumps(result)
+
+