Commit d555aa80 authored by Ayush Tiwari's avatar Ayush Tiwari Committed by Vincent Pelletier

ZSQLCatalog: Simplify methods for SQLCatalog class

parent 24c0e7d2
...@@ -1670,18 +1670,10 @@ class Catalog(Folder, ...@@ -1670,18 +1670,10 @@ class Catalog(Folder,
continue continue
#LOG('catalogObjectList', 0, 'method_name = %s' % (method_name,)) #LOG('catalogObjectList', 0, 'method_name = %s' % (method_name,))
method = getattr(self, method_name) method = self._getCatalogMethod(method_name)
if method.meta_type in ("Z SQL Method", "LDIF Method"):
# Build the dictionnary of values
arguments = method.arguments_src.split()
elif method.meta_type == "Script (Python)":
arguments = \
method.func_code.co_varnames[:method.func_code.co_argcount]
else:
arguments = []
kw = {x: LazyIndexationParameterList(catalogged_object_list, kw = {x: LazyIndexationParameterList(catalogged_object_list,
x, argument_cache) x, argument_cache)
for x in arguments} for x in self._getCatalogMethodArgumentList(method)}
# Alter/Create row # Alter/Create row
try: try:
...@@ -1705,6 +1697,17 @@ class Catalog(Folder, ...@@ -1705,6 +1697,17 @@ class Catalog(Folder,
if psyco is not None: if psyco is not None:
psyco.bind(_catalogObjectList) psyco.bind(_catalogObjectList)
def _getCatalogMethodArgumentList(self, method):
if method.meta_type in ("Z SQL Method", "LDIF Method"):
# Build the dictionnary of values
return method.arguments_src.split()
elif method.meta_type == "Script (Python)":
return method.func_code.co_varnames[:method.func_code.co_argcount]
return ()
def _getCatalogMethod(self, method_name):
return getattr(self, method_name)
security.declarePrivate('beforeUncatalogObject') security.declarePrivate('beforeUncatalogObject')
def beforeUncatalogObject(self, path=None,uid=None): def beforeUncatalogObject(self, path=None,uid=None):
""" """
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment