[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog - ZCatalog.py:1.130

[Andreas Jung]

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

Modified Files:
	ZCatalog.py 
Log Message:
Do not raise an exception if REQUEST is None. This happens frequently
when calling manage_reindexIndex() from script code but not TTW.


=== Zope/lib/python/Products/ZCatalog/ZCatalog.py 1.129 => 1.130 ===
--- Zope/lib/python/Products/ZCatalog/ZCatalog.py:1.129	Wed Dec 31 16:17:28 2003
+++ Zope/lib/python/Products/ZCatalog/ZCatalog.py	Fri Mar 19 08:25:34 2004
@@ -790,11 +790,12 @@
         style url. If no object is found, None is returned.
         No exceptions are raised.
         """
-        script=REQUEST.script
-        if path.find(script) != 0:
-            path='%s/%s' % (script, path)
-        try: return REQUEST.resolve_url(path)
-        except: pass
+        if REQUEST:
+            script=REQUEST.script
+            if path.find(script) != 0:
+                path='%s/%s' % (script, path)
+            try: return REQUEST.resolve_url(path)
+            except: pass
 
     def resolve_path(self, path):
         """