--- ZSQLExtend/ZSQLExtend.py	2004/04/28 15:30:42	1.16
+++ ZSQLExtend/ZSQLExtend.py	2004/06/11 14:23:28	1.18
@@ -33,6 +33,13 @@ class ZSQLExtendFolder(Persistent, Impli
             return pt()
 
         
+    def getWeight(self):
+        """getLabe"""
+        try:
+            return self.weight
+        except:
+            return ""
+
     def getLabel(self):
         """getLabe"""
         try:
@@ -57,9 +64,10 @@ class ZSQLExtendFolder(Persistent, Impli
         return pt()
 
 
-    def changeZSQLExtend(self,label,description,REQUEST=None):
+    def changeZSQLExtend(self,label,description,weight=0,REQUEST=None):
         """change it"""
-        
+
+        self.weight=weight
         self.label=label
         self.description=description
         
@@ -69,7 +77,7 @@ class ZSQLExtendFolder(Persistent, Impli
     def formatAscii(self,str,url=None):
         """ersetze ascii umbrueche durch <br>"""
         #url=None
-        if url:
+        if url and str:
             
             retStr=""
             words=str.split("\n")
@@ -141,6 +149,43 @@ class ZSQLExtendFolder(Persistent, Impli
     <option value="eq">equals</option>          		<!-- equals / ist, =Wort -->
 </select>"""%fieldname
         return ret
+
+    def ZSQLSelectionFromCRList(self,fieldname,listField,boxType="checkbox",checked=None):
+        """generate select oprions form a cr seperated list"""
+        fields=listField.split("\n")
+        ret=""
+        for field in fields:
+            if checked and (field in checked.split("\n")):
+                ret+="""<input name="%s" type="%s" value="%s" checked>%s"""%(fieldname,boxType,field,field)
+            else:
+                ret+="""<input name="%s" type="%s" value="%s">%s"""%(fieldname,boxType,field,field)
+        return ret
+
+
+    def ZSQLOptionsFromCRList(self,fieldname,listField):
+        """generate select oprions form a cr seperated list"""
+        fields=listField.split("\n")
+        ret="""<select name="%s">
+            """%fieldname
+        for field in fields:
+            ret+="""<option value="%s">%s</option>"""%(field,field)
+        ret+="""</select>"""
+        return ret
+
+    def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,start=None):
+        """generate select oprions form a cr seperated list"""
+        
+        ret="""<select name="%s">
+            """%fieldname
+        if start:
+            ret+="""<option value="%s">%s</option>"""%(start,start)
+        for result in results:
+            field=getattr(result,fieldName)
+            ret+="""<option value="%s">%s</option>"""%(field,field)
+        ret+="""</select>"""
+        return ret
+
+            
     
     def ZSQLInlineSearch(self,storename=None,**argv):
         """inlinesearch"""
@@ -256,7 +301,7 @@ class ZSQLExtendFolder(Persistent, Impli
         self.search(var=queryString)
         return self.REQUEST.RESPONSE.redirect(format)
     
-    def ZSQLFind(self,qs="",select="oid,*",storename=None):
+    def ZSQLFind(self,qs="",select="oid,*",storename=None,**argv):
         """Find"""
 
 
@@ -266,6 +311,9 @@ class ZSQLExtendFolder(Persistent, Impli
                
                
                qs=string.join(qs.split("&"),",")
+               for field in argv.keys():
+                   qs+=",-%s=%s"%(field,argv[field])
+               #print qs
            else:
                
                qs=self.REQUEST.SESSION['query']
@@ -319,7 +367,7 @@ class ZSQLExtendFolder(Persistent, Impli
         else:
             storename="foundCount"
         
-        return self.REQUEST.SESSION[storename]['rangeStart']+1
+        return int(self.REQUEST.SESSION[storename]['rangeStart'])+1
     
     def ZSQLRangeSize(self,storename=None):
         
@@ -800,6 +848,7 @@ class ZSQLBibliography(Folder,ZSQLExtend
                 return ret
         except:
             return None
+
     def findLabelsFromMapping(self,referenceType):
         """gib hash mit label -> generic zurueck"""
         self.referencetypes=self.ZopeFind(self.standardMD)
@@ -808,7 +857,7 @@ class ZSQLBibliography(Folder,ZSQLExtend
         fieldlist=self.standardMD.fieldList
         
 	for referenceTypeF in self.referencetypes:
-		print referenceType,referenceTypeF[1].title
+		#print referenceType,referenceTypeF[1].title
 		if referenceTypeF[1].title == referenceType: 
 			bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
 			bibdata['data']=referenceTypeF[1]