--- ZSQLExtend/ZSQLExtend.py	2004/02/05 10:29:56	1.9
+++ ZSQLExtend/ZSQLExtend.py	2004/02/05 20:31:42	1.10
@@ -20,11 +20,16 @@ class ZSQLExtendFolder(Persistent, Impli
 
     def actualPath(self,url=None):
 	"""path"""
+
+        if self.REQUEST['HTTP_X_FORWARDED_SERVER']=='':
+            host=self.REQUEST['HTTP_HOST']
+        else:
+            host=self.REQUEST['HTTP_X_FORWARDED_SERVER']
 	if not url:
-		return "http://"+self.REQUEST['HTTP_X_FORWARDED_SERVER']+self.REQUEST['PATH_TRANSLATED']
+		return "http://"+host+self.REQUEST['PATH_TRANSLATED']
     	else:
 		temp=self.REQUEST[url].split("/")
-		temp[2]=self.REQUEST['HTTP_X_FORWARDED_SERVER']
+		temp[2]=host
 		return string.join(temp,"/")
 
     def getRequest(self):
@@ -169,7 +174,7 @@ class ZSQLExtendFolder(Persistent, Impli
         self.search(var=queryString)
         return self.REQUEST.RESPONSE.redirect(format)
     
-    def ZSQLFind(self,qs="",select="*",storename=None):
+    def ZSQLFind(self,qs="",select="oid,*",storename=None):
         """Find"""
 
 
@@ -264,7 +269,7 @@ class ZSQLExtendFolder(Persistent, Impli
         rangeStart=0
         
         if not select:
-            select="*"
+            select="oid,*"
         #print "Q",nostore,qs
         #check for op in the case of inline search