--- ZSQLExtend/ZSQLExtend.py	2004/04/18 08:58:28	1.15
+++ ZSQLExtend/ZSQLExtend.py	2004/05/17 15:41:39	1.17
@@ -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")
@@ -212,7 +264,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 +274,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']
@@ -325,6 +380,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 +498,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 +702,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 +719,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 +744,7 @@ def manage_addZSQLExtendFolder(self, id,
 
 
 
-class ZSQLBibliography(ZSQLExtendFolder):
+class ZSQLBibliography(Folder,ZSQLExtendFolder):
     """Bibliography"""
     meta_type="ZSQLBibliography"
     def getLabel(self):
@@ -724,8 +785,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'},
        )