Changeset 1084 for ZMS/trunk/_zcatalogmanager.py

Timestamp:

05.07.2010 21:26:11 (23 months ago)

Author:

zmsdev

Message:

Applied fix for auto-initialization of catalog-object.

File:

• ZMS/trunk/_zcatalogmanager.py (modified) (3 diffs)

ZMS/trunk/_zcatalogmanager.py

@@ -128 +128 @@
   cat_id = 'catalog_%s'%lang
   obs = filter( lambda x: x.id==cat_id, context.objectValues( [ 'ZCatalog']))
-  if len(obs) == 0:
-    catalog = getattr( self, cat_id, None)
-    if catalog is not None and catalog.meta_type == 'ZCatalog':
-      obs = [catalog]
-  if len(obs) == 0:
-    return self.recreateCatalog(lang)
-  return obs[0]
+  if obs:
+    return obs[0]
+  else:
+    return getattr( self, cat_id, None)
 
 
@@ -503 +500 @@
       
       #-- Get catalog
-      cat_id = 'catalog_%s'%lang
-      obs = filter( lambda x: x.id==cat_id, context.objectValues( [ 'ZCatalog']))
-      if len(obs) == 0:
-        catalog = getattr( self, cat_id, None)
-        if catalog is not None and catalog.meta_type == 'ZCatalog':
-          obs = [catalog]
-      if len( obs) == 0:
+      zcatalog = getCatalog( self, lang)
+      if zcatalog is None:
+        cat_id = 'catalog_%s'%lang
         cat_title = 'Default catalog'
         vocab_id = 'create_default_catalog_'
         zcatalog = ZCatalog.ZCatalog(cat_id, cat_title, vocab_id, context)
         context._setObject(zcatalog.id, zcatalog)
-        zcatalog = getCatalog(self,lang)
-      else:
-        zcatalog = obs[ 0]
+        zcatalog = getCatalog( self, lang)
       
       #-- Add lexicon
@@ -689 +680 @@
       lang = REQUEST['lang']
       zcatalog = getCatalog(self,lang)
+      if zcatalog is None:
+        return rtn
       items = []
       for zcindex in zcatalog.indexes():