Changed things which used HTMLFile to use DTMLFile.

lib/python/Products/ZCatalog/CatalogAwareness.py

@@ -86,7 +86,7 @@
 """ZCatalog Findable class"""
 
 import urllib, string
-from Globals import HTMLFile
+from Globals import DTMLFile
 
 class CatalogAware:
     """ This is a Mix-In class to make objects automaticly catalog and
@@ -100,7 +100,7 @@ class CatalogAware:
     meta_type='CatalogAware'
     default_catalog='Catalog'
 
-    manage_editCatalogerForm=HTMLFile('dtml/editCatalogerForm', globals())
+    manage_editCatalogerForm=DTMLFile('dtml/editCatalogerForm', globals())
 
     def manage_editCataloger(self, default, REQUEST=None):
         """ """

lib/python/Products/ZCatalog/CatalogPathAwareness.py

@@ -86,7 +86,7 @@
 """ZCatalog Findable class"""
 
 import urllib, string
-from Globals import HTMLFile
+from Globals import DTMLFile
 from Acquisition import aq_base
 
 class CatalogAware:
@@ -101,7 +101,7 @@ class CatalogAware:
     meta_type='CatalogAware'
     default_catalog='Catalog'
 
-    manage_editCatalogerForm=HTMLFile('editCatalogerForm', globals())
+    manage_editCatalogerForm=DTMLFile('editCatalogerForm', globals())
 
     def manage_editCataloger(self, default, REQUEST=None):
         """ """

lib/python/Products/ZCatalog/Vocabulary.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """ZCatalog product"""
 
-from Globals import HTMLFile, MessageDialog
+from Globals import DTMLFile, MessageDialog
 import Globals, AccessControl.Role
 from Acquisition import Implicit
 from Persistence import Persistent
@@ -93,7 +93,7 @@ from SearchIndex import Lexicon, GlobbingLexicon
 
 from SearchIndex.Lexicon import stop_word_dict
 
-manage_addVocabularyForm=HTMLFile('dtml/addVocabulary',globals())
+manage_addVocabularyForm=DTMLFile('dtml/addVocabulary',globals())
 
 def manage_addVocabulary(self, id, title, globbing=None, REQUEST=None):
     """Add a Vocabulary object
@@ -144,8 +144,8 @@ class Vocabulary(Item, Persistent, Implicit,
 
     
 
-    manage_main = HTMLFile('dtml/manage_vocab', globals())
-    manage_query = HTMLFile('dtml/vocab_query', globals())
+    manage_main = DTMLFile('dtml/manage_vocab', globals())
+    manage_query = DTMLFile('dtml/vocab_query', globals())
 
     def __init__(self, id, title='', globbing=None):
         """ create the lexicon to manage... """

lib/python/Products/ZCatalog/ZCatalog.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """ZCatalog product"""
 
-from Globals import HTMLFile, MessageDialog
+from Globals import DTMLFile, MessageDialog
 import Globals
 from OFS.Folder import Folder
 from OFS.FindSupport import FindSupport
@@ -104,7 +104,7 @@ import IOBTree
 from AccessControl import getSecurityManager
 
 
-manage_addZCatalogForm=HTMLFile('dtml/addZCatalog',globals())
+manage_addZCatalogForm=DTMLFile('dtml/addZCatalog',globals())
 
 def manage_addZCatalog(self, id, title, vocab_id=None, REQUEST=None):
     """Add a ZCatalog object
@@ -206,12 +206,12 @@ class ZCatalog(Folder, Persistent, Implicit):
         )
 
 
-    manage_catalogAddRowForm = HTMLFile('dtml/catalogAddRowForm', globals())
-    manage_catalogView = HTMLFile('dtml/catalogView',globals())
-    manage_catalogFind = HTMLFile('dtml/catalogFind',globals())
-    manage_catalogSchema = HTMLFile('dtml/catalogSchema', globals())
-    manage_catalogIndexes = HTMLFile('dtml/catalogIndexes', globals())
-    manage_catalogStatus = HTMLFile('dtml/catalogStatus', globals())
+    manage_catalogAddRowForm = DTMLFile('dtml/catalogAddRowForm', globals())
+    manage_catalogView = DTMLFile('dtml/catalogView',globals())
+    manage_catalogFind = DTMLFile('dtml/catalogFind',globals())
+    manage_catalogSchema = DTMLFile('dtml/catalogSchema', globals())
+    manage_catalogIndexes = DTMLFile('dtml/catalogIndexes', globals())
+    manage_catalogStatus = DTMLFile('dtml/catalogStatus', globals())
 
 
     threshold=10000