[Erp5-report] r27925 - in /erp5/trunk/products/ERP5Type/Tool: CacheTool.py MemcachedTool.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Jul  3 17:35:25 2009
New Revision: 27925

URL: http://svn.erp5.org?rev=27925&view=rev
Log:
To follow Url propertysheet requirements , URL should starts with a protocol

Modified:
    erp5/trunk/products/ERP5Type/Tool/CacheTool.py
    erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py

Modified: erp5/trunk/products/ERP5Type/Tool/CacheTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/CacheTool.py?rev=27925&r1=27924&r2=27925&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/CacheTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/CacheTool.py [utf8] Fri Jul  3 17:35:25 2009
@@ -82,18 +82,16 @@
         elif cp_meta_type == 'ERP5 Distributed Ram Cache':
           ## even thougn we have such plugin in ZODB that doens't mean
           ## we have corresponding memcache module installed
-          memcached_plugin = cp.getSpecialiseValue()
-          if memcached_plugin is not None:
-            init_dict = {
-              'server': memcached_plugin.getUrlString(),
-              'server_max_key_length': memcached_plugin.getServerMaxKeyLength(),
-              'server_max_value_length': memcached_plugin.getServerMaxValueLength(),
-                          }
-            cache_obj = DistributedRamCache(init_dict)
-          else:
-            ## we don't have memcache python module installed 
-            ## thus we can't use DistributedRamCache plugin
-            cache_obj = None
+          cache_obj = None
+          if getattr(cp, 'getSpecialiseValue', None) is not None:
+            memcached_plugin = cp.getSpecialiseValue()
+            if memcached_plugin is not None:
+              init_dict = {
+                'server': memcached_plugin.getUrlString(),
+                'server_max_key_length': memcached_plugin.getServerMaxKeyLength(),
+                'server_max_value_length': memcached_plugin.getServerMaxValueLength(),
+                            }
+              cache_obj = DistributedRamCache(init_dict)
         if cache_obj is not None:
           ## set cache expire check interval
           cache_obj.cache_expire_check_interval = cp.getCacheExpireCheckInterval()

Modified: erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py?rev=27925&r1=27924&r2=27925&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py [utf8] Fri Jul  3 17:35:25 2009
@@ -263,7 +263,7 @@
     id = "portal_memcached"
     meta_type = "ERP5 Memcached Tool"
     portal_type = "Memcached Tool"
-    
+
     security = ClassSecurityInfo()
     manage_options = ({'label': 'Configure',
                        'action': 'memcached_tool_configure',
@@ -282,7 +282,8 @@
         memcached_plugin = self.restrictedTraverse(plugin_path, None)
         if memcached_plugin is None:
           raise ValueError, 'Memcached Plugin does not exists: %r' % (plugin_path,)
-        dictionary = MemcachedDict((memcached_plugin.getUrlString(),),
+        url_string = memcached_plugin.getUrlString('')[len('memcached://'):]
+        dictionary = MemcachedDict((url_string,),
                    server_max_key_length=memcached_plugin.getServerMaxKeyLength(),
                    server_max_value_length=memcached_plugin.getServerMaxValueLength())
         memcached_dict_pool.memcached_dict = dictionary