Fixed bug where catalog's not in the root folder did not recognize the

proper URL of objects using the 'Find' machinery. This caused all the objects to mysteriously disapear when you updated the catalog (because their paths were wrong)

Fixed bug where catalog's not in the root folder did not recognize the
proper URL of objects using the 'Find' machinery. This caused all the objects to mysteriously disapear when you updated the catalog (because their paths were wrong)
20adcffd · Michel Pelletier · 388a61f4 · 20adcffd · 20adcffd
Commit 20adcffd authored Aug 16, 1999 by Michel Pelletier
Showing with 47 additions and 55 deletions

lib/python/Products/ZCatalog/CatalogAwareness.py lib/python/Products/ZCatalog/CatalogAwareness.py +2 -1

lib/python/Products/ZCatalog/catalogView.dtml lib/python/Products/ZCatalog/catalogView.dtml +45 -54

No files found.
--- a/lib/python/Products/ZCatalog/CatalogAwareness.py
+++ b/lib/python/Products/ZCatalog/CatalogAwareness.py
@@ -139,7 +139,8 @@ class CatalogAware:
        return string.join(items, ', ')

    def onDeleteObject(self):
-        """Object delete handler."""
+        """Object delete handler. I think this is obsoleted by
+        manage_beforeDelete """
        self.unindex_object()

    def url(self, ftype=urllib.splittype, fhost=urllib.splithost):

--- a/lib/python/Products/ZCatalog/catalogView.dtml
+++ b/lib/python/Products/ZCatalog/catalogView.dtml
@@ -3,9 +3,9 @@
 <TITLE>View Catalog Records</TITLE>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
-<!--#var manage_tabs-->
+<dtml-var manage_tabs>

-<!--#if searchResults-->
+<dtml-if searchResults>

 <p> Updating the catalog will update all catalog records and remove
 invalid records. Clearing the catalog will remove all entries.  You
@@ -19,49 +19,39 @@ can also remove or update individual catalog records.

 <p>

-<!--#var id--> contains
- <em><!--#var searchResults fmt=collection-length thousands_commas--></em>
+<dtml-var id> contains
+ <em><dtml-var searchResults fmt=collection-length thousands_commas></em>
 record(s).<BR><BR>

-  <!--#in searchResults previous size=20 start=query_start -->
-          <a href="<!--#var URL-->?query_start=<!--#var
-                   previous-sequence-start-number-->">
-          [Previous <!--#var previous-sequence-size--> entries]
-          </a>
-  <!--#/in-->
-  <!--#in searchResults next size=20 start=query_start -->
-          <a href="<!--#var URL-->?query_start=<!--#var
-                   next-sequence-start-number-->">
-          [Next <!--#var next-sequence-size--> entries]
-          </a>
-  <!--#/in-->
-
-<form action="<!--#var URL1-->/">
+  <dtml-in searchResults previous size=20 start=query_start >
+    <a href="<dtml-var URL>?query_start=<dtml-var previous-sequence-start-number>">
+      [Previous <dtml-var previous-sequence-size> entries]
+    </a>
+  </dtml-in>
+  <dtml-in searchResults next size=20 start=query_start >
+    <a href="<dtml-var URL>?query_start=<dtml-var next-sequence-start-number>">
+      [Next <dtml-var next-sequence-size> entries]
+    </a>
+  </dtml-in>
+
+<form action="<dtml-var URL1>/">
 <input type="submit" value=" Remove " NAME="manage_uncatalogObject:method">
 <input type="submit" value=" Update " NAME="manage_catalogObject:method">
-<!--#comment-->
-<input type="submit" value=" VOODOO "
-NAME="manage_enterDebuger:method">
-<!--#/comment-->

 <input type="hidden" name="individual" value="1">
  <table>
-     <!--#in searchResults size=20 start=query_start -->
-
-     <tr valign=top>
-	    <td valign="middle" align="center">
-	    <INPUT TYPE="checkbox" NAME="urls:list" VALUE="<!--#var "getpath(data_record_id_)"-->"
-	    </TD>
-	    <td valign="top"><!--#var meta_type--></td>
-	    <td valign="top" align="left">
-
-
-<a href="<!--#var SCRIPT_NAME-->/<!--#var "getpath(data_record_id_)"-->/manage_main"><!--#var "getpath(data_record_id_)"-->
-
-<!--#if title--> (<!--#var title-->)<!--#/if--></a></td> 
-	 </tr>
-
-     <!--#/in-->
+    <dtml-in searchResults size=20 start=query_start >
+    <tr valign=top>
+      <td valign="middle" align="center">
+	<INPUT TYPE="checkbox" NAME="urls:list" VALUE="<dtml-var "getpath(data_record_id_)">"
+      </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_)">
+        <dtml-if title> (<dtml-var title>)</dtml-if></a>
+      </td> 
+    </tr>
+    </dtml-in>
  </table>

 <input type="submit" value=" Remove " NAME="manage_uncatalogObject:method">
@@ -69,25 +59,26 @@ NAME="manage_enterDebuger:method">

 </form>

-  <!--#in searchResults previous size=20 start=query_start -->
-          <a href="<!--#var URL-->?query_start=<!--#var
-                   previous-sequence-start-number-->">
-          [Previous <!--#var previous-sequence-size--> entries]
-          </a>
-  <!--#/in-->
-  <!--#in searchResults next size=20 start=query_start -->
-          <a href="<!--#var URL-->?query_start=<!--#var
-                   next-sequence-start-number-->">
-          [Next <!--#var next-sequence-size--> entries]
-          </a>
-  <!--#/in-->
-
-<!--#else-->
+  <dtml-in searchResults previous size=20 start=query_start >
+    <a href="<dtml-var URL>?query_start=<dtml-var previous-sequence-start-number>">
+      [Previous <dtml-var previous-sequence-size> entries]
+    </a>
+  </dtml-in>
+
+  <dtml-in searchResults next size=20 start=query_start >
+    <a href="<dtml-var URL>?query_start=<dtml-var next-sequence-start-number>">
+      [Next <dtml-var next-sequence-size> entries]
+    </a>
+  </dtml-in>
+
+<dtml-else>

 <P>There are no entries in the Catalog.</P>

-<!--#/if-->
+</dtml-if>
+
+</BODY>
+</HTML>

-</BODY></HTML>