--- ZSQLExtend/ZSQLExtend.py 2004/10/19 11:24:12 1.41
+++ ZSQLExtend/ZSQLExtend.py 2005/02/23 14:53:57 1.61
@@ -1,17 +1,38 @@
from OFS.Folder import Folder
-from Globals import Persistent
from Acquisition import Implicit
-from Globals import DTMLFile
+from Globals import DTMLFile,package_home,Persistent
import urllib
import re
import string
+import sys
#from pyPgSQL import libpq
from AccessControl import getSecurityManager
-import os.path
+from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.ZSQLMethods.SQL import SQLConnectionIDs
import Shared.DC.ZRDB.DA
+import zLOG
+import os.path
+import os
+
+def analyseIntSearch(word):
+ #analyse integer searches
+
+ splitted=word.split("-")
+
+ if len(splitted)==1:
+ return "="+splitted[0]
+
+ if splitted[0]=="":
+ return "< "+splitted[1]
+
+ if splitted[1]=='':
+ return "> "+splitted[0]
+ else:
+ return "BETWEEN "+splitted[0]+" AND "+splitted[1]
+
+
def sql_quote(v):
# quote dictionary
@@ -35,15 +56,18 @@ class ZSQLExtendFolder(Folder,Persistent
wherePart="museum_no like 'VAT%'"
classes=['Uruk III','Uruk IV']
return self.searchRel(relStatement,statement,wherePart,classes)
-
+
+ def URLquote(self,txt):
+ """urlquote"""
+ return urllib.quote(txt)
def searchRel(self,relStatement,statement,wherePart,classes):
"""suche relative haufigkeiten"""
ret={}
allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart))
- print statement + " where "+wherePart
+
for oneclass in classes:
ret[oneclass]=len(self.ZSQLSimpleSearch(statement + " where ("+wherePart+") and "+ relStatement%oneclass))
- print statement + " where ("+wherePart+") and "+ relStatement%oneclass
+
return (ret,allRecords)
def content_html(self):
@@ -53,7 +77,7 @@ class ZSQLExtendFolder(Folder,Persistent
obj=getattr(self,"ZSQLBibliography_template")
return obj()
except:
- pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt',content_type='text/htm').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt'),content_type='text/html').__of__(self)
pt.content_type="text/html"
return pt()
@@ -86,7 +110,7 @@ class ZSQLExtendFolder(Folder,Persistent
def changeZSQLExtendForm(self):
"""change folder config"""
- pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLExtendForm.zpt').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLExtendForm.zpt')).__of__(self)
return pt()
@@ -177,7 +201,7 @@ class ZSQLExtendFolder(Folder,Persistent
return ret
def ZSQLSelectionFromCRList(self,fieldname,listField,boxType="checkbox",checked=None):
- """generate select oprions form a cr seperated list"""
+ """generate select options from a cr seperated list"""
fields=listField.split("\n")
ret=""
for field in fields:
@@ -187,35 +211,79 @@ class ZSQLExtendFolder(Folder,Persistent
ret+="""%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8'))
return ret
+ def ZSQLSelectionFromSearchList(self,fieldname,results,fieldnameResult,boxType="checkbox",checked=None):
+ """generate select options from a cr seperated list"""
+
+ ret=""
+ if not results: return ""
+
+ for result in results:
+ field=getattr(result,fieldnameResult)
+ if field:
+ if checked and (getattr(result,fieldnameResult) in checked.split("\n")):
+ ret+="""%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8'))
+ else:
+ ret+="""%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8'))
+ return ret
+
- def ZSQLOptionsFromCRList(self,fieldname,listField, multiple=''):
+ def ZSQLOptionsFromCRList(self,fieldname,listField, multiple='',start=None,startValue=None,size=None):
"""generate select oprions form a cr seperated list"""
fields=listField.split("\n")
- ret="""