checking in some more stuff for amos

zopefoundation · Aug 31, 1999 · d260833 · d260833
1 parent 9c8fb64
commit d260833
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/ZCatalog.py b/ZCatalog.py
@@ -229,8 +229,7 @@ def manage_catalogObject(self, REQUEST, urls=None):
 
     def manage_uncatalogObject(self, REQUEST, urls=None):
         """ removes Zope object 'urls' from catalog """
-##	import pdb
-##	pdb.set_trace()
+
         if urls:
             for url in urls:
                 try:
@@ -245,7 +244,9 @@ def manage_uncatalogObject(self, REQUEST, urls=None):
 
     def manage_catalogReindex(self, REQUEST):
         """ clear the catalog, then re-index everything """
-
+
+	import pdb
+        pdb.set_trace()
         paths = tuple(self._catalog.paths.values())
 	self.manage_catalogClear(REQUEST)
 
@@ -256,16 +257,6 @@ def manage_catalogReindex(self, REQUEST):
 	    except:
 		pass
 
-
-##        for path, i in items:
-##            try:
-##                obj = self.getobject(i, REQUEST)
-##            except:
-##                self.uncatalog_object(path)
-##            else:
-##                self.uncatalog_object(path)
-##                self.catalog_object(obj, path)
-
         message = "Catalog Reindexed"
         return self.manage_catalogView(self, REQUEST,
                                 manage_tabs_message=message)
@@ -278,7 +269,7 @@ def manage_catalogClear(self, REQUEST):
         return self.manage_main(self, REQUEST,
                                 manage_tabs_message=message)
 
-    def manage_catalogFoundItems(self, REQUEST, obj_metatypes=None,
+    def manage_catalogFoundItems(self, REQUEST, URL1, obj_metatypes=None,
                                  obj_ids=None, obj_searchterm=None,
                                  obj_expr=None, obj_mtime=None,
                                  obj_mspec=None, obj_roles=None,

diff --git a/catalogView.dtml b/catalogView.dtml
@@ -47,7 +47,7 @@ can also remove or update individual catalog records.
       </TD>
       <td valign="top"><dtml-var meta_type></td>
       <td valign="top" align="left">
-        <a href="<dtml-var "getpath(data_record_id_)">/manage_main"><dtml-var "getpath(data_record_id_)">
+        <a href="/<dtml-var "getpath(data_record_id_)">/manage_main"><dtml-var "getpath(data_record_id_)">
         <dtml-if title> (<dtml-var title>)</dtml-if></a>
       </td> 
     </tr>