--- ZSQLExtend/ZSQLExtend.py	2004/07/12 17:01:55	1.21
+++ ZSQLExtend/ZSQLExtend.py	2004/07/19 17:31:02	1.26
@@ -327,10 +327,13 @@ class ZSQLExtendFolder(Persistent, Impli
            else:
                
                qs=self.REQUEST.SESSION['query']
+               for field in argv.keys():
+                   #print field
+                   qs+=",-%s=%s"%(field,argv[field])
                
         else:
             self.REQUEST['QUERY_STRING']=qs
-            
+
             qs=string.join(qs.split("&"),",")
             
         
@@ -403,7 +406,7 @@ class ZSQLExtendFolder(Persistent, Impli
         else:
             storename="foundCount"
         
-        return self.REQUEST.SESSION[storename]['rangeEnd']
+        return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count'])))
     
     def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None):
         """analysieren den QueryString"""
@@ -552,7 +555,7 @@ class ZSQLExtendFolder(Persistent, Impli
             self.REQUEST.SESSION[storename]['rangeSize']=limit
             self.REQUEST.SESSION[storename]['searchFields']=searchFields
             
-	#print "Q",query            
+        #print "Q",query            
         return self.ZSQLQuery(query)
 
     def ZSQLQuery(self,query):
@@ -603,12 +606,12 @@ class ZSQLExtendFolder(Persistent, Impli
                 limit="1"
             newRangeStart=int(self.REQUEST.SESSION[storename]['rangeStart'])+int(limit)
         except:
-            limit=0
+            limit=1
             newRangeStart=0
             
-        if newRangeStart>self.REQUEST.SESSION[storename]['count']:
-            newRangeStart=self.REQUEST.SESSION[storename]['count']-10
-
+        if newRangeStart>=self.REQUEST.SESSION[storename]['count']:
+            #newRangeStart=self.REQUEST.SESSION[storename]['count']-1
+            return ""
         
         #create new query string
         
@@ -629,12 +632,12 @@ class ZSQLExtendFolder(Persistent, Impli
         skipFound=0
         
         for query in queries:
-            print query
+            
             #print query.split("=")[0]
             if query[0]=="_" : query[0]="-"
 
             if query.split("=")[0].lower()=="-skip":
-                print "d", newRangeStart
+
                 skipFound=1
                 query="-skip=%i"%newRangeStart
             newquery.append(query)
@@ -656,8 +659,10 @@ class ZSQLExtendFolder(Persistent, Impli
                 limit="1"
             newRangeStart=int(self.REQUEST.SESSION[storename]['rangeStart'])-int(limit)
         except:
-            limit=0
+            limit=1
             newRangeStart=0
+        if newRangeStart <0:
+            return ""
 
         #print "limit",limit,newRangeStart,int(self.REQUEST.SESSION[storename]['rangeStart'])
         
@@ -887,7 +892,10 @@ class ZSQLBibliography(Folder,ZSQLExtend
 			bibdata['data']=referenceTypeF[1]
 			self.fields=bibdata[referenceType]
                         for field in fieldlist:
-                            retdata[field]=referenceTypeF[1].getValue(field)[0]
+		            if referenceTypeF[1].getValue(field)[0]==None:
+				retdata[field]=field
+			    else:
+                                retdata[field]=referenceTypeF[1].getValue(field)[0]
 
         return retdata,fieldlist
         
@@ -917,6 +925,16 @@ class ZSQLBibliography(Folder,ZSQLExtend
         else:
             return ""
     
+    def getMetaDataXML2(self):
+        """crate index meta"""
+
+        fn=os.path.splitext(self.REQUEST['fn'])[0]+"."
+        self.REQUEST['fn']=fn
+
+        pt=PageTemplateFile('Products/ZSQLExtend/zpt/record2.xml').__of__(self)
+        pt.content_type="text/xml"
+        return pt()
+
     def getMetaDataXML(self):
         """crate index meta"""
         pt=PageTemplateFile('Products/ZSQLExtend/zpt/record.xml').__of__(self)
@@ -927,13 +945,14 @@ class ZSQLBibliography(Folder,ZSQLExtend
         """index"""
         ret="""<?xml version="1.0" ?>
 	             <index>"""
-        for found in self.search(var="select oid from %s"%self.tableName):
+        for found in self.search(var="select oid from %s limit ALL"%self.tableName):
             link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid
             metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid
             
             ret+="""<resource resourceLink="%s" metaLink="%s"/>\n"""%(link,metalink)
             
         return ret+"\n</index>"
+
     
 manage_addZSQLBibliographyForm=DTMLFile('ZSQLBibliographyAdd', globals())