when computing hrns, try to use SFA code first, otherwise resort to a local version

[plcapi.git] / PLC / API.py

diff --git a/PLC/API.py b/PLC/API.py
index 308fa11..6cab28e 100644 (file)
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -7,23 +7,26 @@
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
 
+import os
 import sys
 import traceback
 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 
+# use this one
+json=simplejson
+#try:
+#    # Try to use jsonlib before using simpljson. This is a hack to get around
+#    # the fact that the version of simplejson available for f8 is slightly 
+#    # faster than xmlrpc but not as fast as jsonlib. There is no jsonlib 
+#    # package 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:
 #
@@ -153,6 +156,27 @@ class PLCAPI:
             apply_ratelimit_aspect()
 
 
+        # Enable Caching. Only for GetSlivers for the moment.
+        # TODO: we may consider to do this in an aspect like the ones above.
+        try:
+            if self.config.PLC_GETSLIVERS_CACHE:
+                getslivers_cache = True
+        except AttributeError:
+            getslivers_cache = False
+
+        if getslivers_cache:
+            os.environ['DJANGO_SETTINGS_MODULE']='plc_django_settings'
+            from cache_utils.decorators import cached
+            from PLC.Methods.GetSlivers import GetSlivers
+
+            @cached(7200)
+            def cacheable_call(cls, auth, node_id_or_hostname):
+                return cls.raw_call(auth, node_id_or_hostname)
+            
+            GetSlivers.call = cacheable_call
+            
+
+
     def callable(self, method):
         """
         Return a new instance of the specified method.