[Zope3-checkins] CVS: Zope3/src/zope/app/sqlscript - sqlscript.py:1.5

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/sqlscript
In directory cvs.zope.org:/tmp/cvs-serv2886/src/zope/app/sqlscript

Modified Files:
	sqlscript.py 
Log Message:


Removed the caching service. It was not providing much value anyways, so it was
easy.



Also, I updated the views in a way that SQL Script's chace support would work
again.



There is still much to do:



- zope.app.cache.caching does not have a formally defined API (interface)



- The CacheName field should be a vocabulary field.



- Views need to be updated to current form.


=== Zope3/src/zope/app/sqlscript/sqlscript.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/sqlscript/sqlscript.py:1.4	Tue Mar  2 13:06:11 2004
+++ Zope3/src/zope/app/sqlscript/sqlscript.py	Wed Mar 10 14:41:08 2004
@@ -14,7 +14,6 @@
 """
 $Id$
 """
-
 import re
 from types import StringTypes
 
@@ -27,7 +26,7 @@
 from zope.app import zapi
 from zope.app.rdb import queryForResults
 from zope.app.container.contained import Contained
-from zope.app.cache.caching import getCacheForObj, getLocationForCache
+from zope.app.cache.caching import getCacheForObject, getLocationForCache
 from zope.app.rdb.interfaces import IZopeDatabaseAdapter
 from zope.app.file.interfaces import IFileContent
 
@@ -90,7 +89,7 @@
 
     def _setConnectionName(self, name):
         self._connectionName = name
-        cache = getCacheForObj(self)
+        cache = getCacheForObject(self)
         location = getLocationForCache(self)
 
         if cache and location:
@@ -139,7 +138,7 @@
                 self.connectionName))
 
         query = apply(self.template, (), arg_values)
-        cache = getCacheForObj(self)
+        cache = getCacheForObject(self)
         location = getLocationForCache(self)
         if cache and location:
             _marker = object()