--- ZSQLExtend/ZSQLExtend.py	2004/04/18 08:58:28	1.15
+++ ZSQLExtend/ZSQLExtend.py	2004/06/11 14:23:28	1.18
@@ -21,11 +21,63 @@ class ZSQLExtendFolder(Persistent, Impli
     """Folder"""
     meta_type="ZSQLExtendFolder"
 
-   
+    def content_html(self):
+        """template fuer content"""
+        
+        try:
+            obj=getattr(self,"ZSQLBibliography_template")
+            return obj()
+        except:
+            pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt').__of__(self)
+            pt.content_type="text/html"
+            return pt()
+
+        
+    def getWeight(self):
+        """getLabe"""
+        try:
+            return self.weight
+        except:
+            return ""
+
+    def getLabel(self):
+        """getLabe"""
+        try:
+            return self.label
+        except:
+            return ""
+
+    def getDescription(self):
+        """getLabe"""
+        try:
+            return self.description
+        except:
+            return ""
+
+    manage_options=Folder.manage_options+(
+        {'label':'Main Config','action':'changeZSQLExtendForm'},
+       )
+
+    def changeZSQLExtendForm(self):
+        """change folder config"""
+        pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLExtendForm.zpt').__of__(self)
+        return pt()
+
+
+    def changeZSQLExtend(self,label,description,weight=0,REQUEST=None):
+        """change it"""
+
+        self.weight=weight
+        self.label=label
+        self.description=description
+        
+        if REQUEST is not None:
+            return self.manage_main(self, REQUEST)
+
     def formatAscii(self,str,url=None):
         """ersetze ascii umbrueche durch <br>"""
         #url=None
-        if url:
+        if url and str:
             
             retStr=""
             words=str.split("\n")
@@ -97,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"""
@@ -212,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"""
 
 
@@ -222,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']
@@ -275,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):
         
@@ -325,6 +417,7 @@ class ZSQLExtendFolder(Persistent, Impli
                     value=urllib.unquote(q.split("=",1)[1])
                 except:
                     value=""
+                #print "Hi",name[0:3],q
                 if name[0:3]==iCT+"op":
                     op=value
 
@@ -442,8 +535,11 @@ class ZSQLExtendFolder(Persistent, Impli
             self.REQUEST.SESSION[storename]['searchFields']=searchFields
             
 	#print "Q",query            
-        return self.search(var=query)
+        return self.ZSQLQuery(query)
 
+    def ZSQLQuery(self,query):
+        """query"""
+        return self.search(var=query)
     
     def ZSQLSearch(self):
         """To be done"""
@@ -643,7 +739,7 @@ class ZSQLExtendFolder(Persistent, Impli
     
 manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals())
 
-def manage_addZSQLExtendFolder(self, id, title='',
+def manage_addZSQLExtendFolder(self, id, title='', label='', description='',
                      createPublic=0,
                      createUserF=0,
                      REQUEST=None):
@@ -660,7 +756,9 @@ def manage_addZSQLExtendFolder(self, id,
     ob.title=title
     self._setObject(id, ob)
     ob=self._getOb(id)
-
+    setattr(ob,'label',label)
+    setattr(ob,'description',description)
+    
     checkPermission=getSecurityManager().checkPermission
 
     if createUserF:
@@ -683,7 +781,7 @@ def manage_addZSQLExtendFolder(self, id,
 
 
 
-class ZSQLBibliography(ZSQLExtendFolder):
+class ZSQLBibliography(Folder,ZSQLExtendFolder):
     """Bibliography"""
     meta_type="ZSQLBibliography"
     def getLabel(self):
@@ -724,8 +822,8 @@ class ZSQLBibliography(ZSQLExtendFolder)
         if REQUEST is not None:
             return self.manage_main(self, REQUEST)
 
-    manage_options=ZSQLExtendFolder.manage_options+(
-        {'label':'Edit Biblio','action':'changeZSQLBibliographyForm'},
+    manage_options=Folder.manage_options+(
+        {'label':'Main Config','action':'changeZSQLBibliographyForm'},
        )
 
 
@@ -750,6 +848,7 @@ class ZSQLBibliography(ZSQLExtendFolder)
                 return ret
         except:
             return None
+
     def findLabelsFromMapping(self,referenceType):
         """gib hash mit label -> generic zurueck"""
         self.referencetypes=self.ZopeFind(self.standardMD)
@@ -758,7 +857,7 @@ class ZSQLBibliography(ZSQLExtendFolder)
         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]