Commit bfb8fc2a authored by Aurel's avatar Aurel Committed by Arnaud Fontaine

patches related to cataloging

parent 6448065c
...@@ -83,11 +83,16 @@ def SQLVar_render(self, md): ...@@ -83,11 +83,16 @@ def SQLVar_render(self, md):
% (t, self.__name__, v)) % (t, self.__name__, v))
# Patched by yo. datetime is added. # Patched by yo. datetime is added.
valid_type = 'int', 'float', 'string', 'nb', 'datetime' valid_type = 'int', 'float', 'string', 'nb', 'datetime'
valid_type += tuple(map('datetime(%s)'.__mod__, xrange(7))) valid_type += tuple(map('datetime(%s)'.__mod__, xrange(7)))
valid_type = valid_type.__contains__ try:
# BBB
from Shared.DC.ZRDB.sqlvar import valid_type
valid_type = valid_type.__contains__
sqlvar.valid_type = valid_type
except ImportError:
sqlvar.valid_types = valid_type
SQLVar.render = SQLVar_render SQLVar.render = SQLVar_render
SQLVar.__call__ = SQLVar_render SQLVar.__call__ = SQLVar_render
sqlvar.valid_type = valid_type
...@@ -1451,7 +1451,7 @@ class Catalog(Folder, ...@@ -1451,7 +1451,7 @@ class Catalog(Folder,
if meta_type in self.HAS_ARGUMENT_SRC_METATYPE_SET: if meta_type in self.HAS_ARGUMENT_SRC_METATYPE_SET:
return method.arguments_src.split() return method.arguments_src.split()
elif meta_type in self.HAS_FUNC_CODE_METATYPE_SET: elif meta_type in self.HAS_FUNC_CODE_METATYPE_SET:
return method.func_code.co_varnames[:method.func_code.co_argcount] return method.__code__.co_varnames[:method.__code__.co_argcount]
# Note: Raising here would completely prevent indexation from working. # Note: Raising here would completely prevent indexation from working.
# Instead, let the method actually fail when called, so _catalogObjectList # Instead, let the method actually fail when called, so _catalogObjectList
# can log the error and carry on. # can log the error and carry on.
......
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