Changed to support new Python product registry mechanism

lib/python/Products/ExternalMethod/ExternalMethod.py

@@ -88,7 +88,7 @@
 This product provides support for external methods, which allow
 domain-specific customization of web environments.
 """
-__version__='$Revision: 1.26 $'[11:-2]
+__version__='$Revision: 1.27 $'[11:-2]
 from Acquisition import Explicit
 from Globals import Persistent, HTMLFile, MessageDialog, HTML
 import OFS.SimpleItem
@@ -145,7 +145,6 @@ class ExternalMethod(OFS.SimpleItem.Item, Persistent, Explicit,
     """
 
     meta_type='External Method'
-    icon='misc_/ExternalMethod/function_icon'
     func_defaults=()
     func_code=None
     

lib/python/Products/ExternalMethod/__init__.py

@@ -83,31 +83,19 @@
 # 
 ##############################################################################
 __doc__='''External Method Product Initialization
-$Id: __init__.py,v 1.10 1999/03/10 00:15:21 klm Exp $'''
-__version__='$Revision: 1.10 $'[11:-2]
+$Id: __init__.py,v 1.11 1999/03/30 19:26:19 jim Exp $'''
+__version__='$Revision: 1.11 $'[11:-2]
 
 import ExternalMethod
-from ImageFile import ImageFile
 
-classes=('ExternalMethod.ExternalMethod',)
+# This is the new way to initialize products.  It is hoped
+# that this more direct mechanism will be more understandable.
+def initialize(context):
 
-meta_types=     {'name':'External Method',
-                 'action':'manage_addExternalMethodForm'
-                 },
+    context.registerClass(
+        ExternalMethod.ExternalMethod,
+        constructors=(ExternalMethod.manage_addExternalMethodForm,
+                       ExternalMethod.manage_addExternalMethod),
+        icon='extmethod.gif',
+        )
 
-methods={
-    'manage_addExternalMethodForm':
-    ExternalMethod.manage_addExternalMethodForm,
-    'manage_addExternalMethod':
-    ExternalMethod.manage_addExternalMethod,
-    }
-
-misc_={'function_icon':
-       ImageFile('www/function.gif', globals())}
-
-
-__ac_permissions__=(
-    ('Add External Methods',
-     ('manage_addExternalMethodForm', 'manage_addExternalMethod')),
-    ('Change External Methods', ()),
-    )

lib/python/Products/ZSQLMethods/SQL.py

@@ -85,8 +85,8 @@
 __doc__='''SQL Methods
 
 
-$Id: SQL.py,v 1.10 1999/03/10 00:15:31 klm Exp $'''
-__version__='$Revision: 1.10 $'[11:-2]
+$Id: SQL.py,v 1.11 1999/03/30 19:33:47 jim Exp $'''
+__version__='$Revision: 1.11 $'[11:-2]
 
 import Shared.DC.ZRDB.DA
 from Globals import HTMLFile
@@ -186,7 +186,6 @@ class SQL(Shared.DC.ZRDB.DA.DA):
 
     """
     meta_type='Z SQL Method'
-    icon='misc_/ZSQLMethods/icon'
                 
     manage_main=HTMLFile('edit', globals())
 

lib/python/Products/ZSQLMethods/__init__.py

@@ -85,15 +85,44 @@
 __doc__='''SQL Method Product
 
 
-$Id: __init__.py,v 1.13 1999/03/10 00:15:31 klm Exp $'''
-__version__='$Revision: 1.13 $'[11:-2]
-from ImageFile import ImageFile
+$Id: __init__.py,v 1.14 1999/03/30 19:33:47 jim Exp $'''
+__version__='$Revision: 1.14 $'[11:-2]
 import Shared.DC.ZRDB.Search, Shared.DC.ZRDB.Aqueduct, SQL
 import Shared.DC.ZRDB.RDB
 import Shared.DC.ZRDB.sqlvar, Shared.DC.ZRDB.sqlgroup, Shared.DC.ZRDB.sqltest
 
 
-classes=('SQL.SQL',)
+# This is the new way to initialize products.  It is hoped
+# that this more direct mechanism will be more understandable.
+def initialize(context):
+
+    context.registerClass(
+        SQL.SQL,
+        permission='Add Database Methods',
+        constructors=(SQL.manage_addZSQLMethodForm, SQL.manage_addZSQLMethod),
+        icon='sqlmethod.gif',
+        )
+
+    context.registerClass(
+        meta_type='Z Search Interface',
+        permission='Add Documents, Images, and Files',
+        constructors=(Shared.DC.ZRDB.Search.addForm,
+                      Shared.DC.ZRDB.Search.manage_addZSearch),
+        )
+
+methods={
+    # We still need this one, at least for now, for both editing and
+    # adding.  Ugh.
+    'SQLConnectionIDs': SQL.SQLConnectionIDs,
+
+    # Oh please!
+    'ZQueryIds':             Shared.DC.ZRDB.Search.ZQueryIds,
+    }
+
+__ac_permissions__=(
+    # Ugh.  We should get rid of this, but we'll have to revisit connections
+    ('Open/Close Database Connections',   ()),
+    )
 
 __module_aliases__=(
     ('Products.AqueductSQLMethods','Products.ZSQLMethods'),
@@ -107,36 +136,3 @@ __module_aliases__=(
     ('AqueductDA.sqltest',     Shared.DC.ZRDB.sqltest),
     ('AqueductDA.sqlgroup',     Shared.DC.ZRDB.sqlgroup),
     )
-
-meta_types=(
-    {'name':SQL.SQL.meta_type,
-     'action':'manage_addZSQLMethodForm',
-     },
-    {'name':'Z Search Interface',
-     'action':'manage_addZSearchForm'
-     },
-    )
-
-methods={
-    'manage_addZSQLMethod': SQL.manage_addZSQLMethod,
-    'manage_addZSQLMethodForm': SQL.manage_addZSQLMethodForm,
-    'SQLConnectionIDs': SQL.SQLConnectionIDs,
-
-    
-    'manage_addZSearchForm': Shared.DC.ZRDB.Search.addForm,
-    'manage_addZSearch':     Shared.DC.ZRDB.Search.add,
-    'ZQueryIds':             Shared.DC.ZRDB.Search.ZQueryIds,
-    }
-
-misc_={
-    'icon': ImageFile('Shared/DC/ZRDB/www/DBAdapter_icon.gif'),
-    }
-
-__ac_permissions__=(
-    ('Add Database Methods',
-     ('manage_addZSQLMethodForm', 'manage_addZSQLMethod')),
-    ('Open/Close Database Connections',   ()),
-    ('Change Database Methods',           ()),
-    ('Change Database Connections',           ()),
-    ('Use Database Methods', ()),
-    )

lib/python/Shared/DC/ZRDB/Search.py

@@ -84,15 +84,15 @@
 ##############################################################################
 __doc__='''Search Interface Wizard
 
-$Id: Search.py,v 1.9 1999/03/10 00:15:44 klm Exp $'''
-__version__='$Revision: 1.9 $'[11:-2]
+$Id: Search.py,v 1.10 1999/03/30 19:31:09 jim Exp $'''
+__version__='$Revision: 1.10 $'[11:-2]
 
 from Globals import HTMLFile
 from Aqueduct import custom_default_report, nicify, Args
 from string import join
 
 addForm=HTMLFile('searchAdd', globals())
-def add(self, report_id, report_title, report_style,
+def manage_addZSearch(self, report_id, report_title, report_style,
         input_id, input_title, queries=[],
         REQUEST=None):
     'add a report'