[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog - CatalogBrains.py:1.7.4.1 IZCatalog.py:1.3.4.4

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog
In directory cvs.zope.org:/tmp/cvs-serv20268/lib/python/Products/ZCatalog

Modified Files:
      Tag: chrism-install-branch
	CatalogBrains.py IZCatalog.py 
Log Message:
Merging HEAD into chrism-install-branch.


=== Zope/lib/python/Products/ZCatalog/CatalogBrains.py 1.7 => 1.7.4.1 ===
--- Zope/lib/python/Products/ZCatalog/CatalogBrains.py:1.7	Wed Aug 14 18:25:15 2002
+++ Zope/lib/python/Products/ZCatalog/CatalogBrains.py	Tue Oct  8 14:41:11 2002
@@ -29,10 +29,10 @@
         """Get the physical path for this record"""
         return self.aq_parent.getpath(self.data_record_id_)
 
-    def getURL(self):
+    def getURL(self, relative=0):
         """Try to generate a URL for this record"""
         try:
-            return self.REQUEST.physicalPathToURL(self.getPath())
+            return self.REQUEST.physicalPathToURL(self.getPath(), relative)
         except:
             return self.getPath()
 


=== Zope/lib/python/Products/ZCatalog/IZCatalog.py 1.3.4.3 => 1.3.4.4 ===