--- ZSQLExtend/ZSQLExtend.py 2004/05/17 15:41:39 1.17
+++ ZSQLExtend/ZSQLExtend.py 2004/07/12 17:01:55 1.21
@@ -10,11 +10,6 @@ from AccessControl import getSecurityMan
import os.path
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-def quoteString(name):
- #return re.sub(r'([\(\)\?])',"\\\1",name)
- #return "Euklid"
- return name
-
class ZSQLExtendFolder(Persistent, Implicit, Folder):
@@ -28,8 +23,9 @@ class ZSQLExtendFolder(Persistent, Impli
obj=getattr(self,"ZSQLBibliography_template")
return obj()
except:
- pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt').__of__(self)
+ pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt',content_type='text/htm').__of__(self)
pt.content_type="text/html"
+
return pt()
@@ -149,6 +145,48 @@ class ZSQLExtendFolder(Persistent, Impli
"""%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+="""%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):
+ """generate select oprions form a cr seperated list"""
+ fields=listField.split("\n")
+ ret=""""""
+ return ret
+
+ def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None):
+ """generate select oprions form a cr seperated list"""
+ if not valueName:
+ valueName=fieldName
+
+ ret=""""""
+ return ret
+
+
def ZSQLInlineSearch(self,storename=None,**argv):
"""inlinesearch"""
@@ -267,34 +305,51 @@ class ZSQLExtendFolder(Persistent, Impli
def ZSQLFind(self,qs="",select="oid,*",storename=None,**argv):
"""Find"""
-
+ def delEmpty(list):
+ ret=[]
+ for x in list:
+ splitted=x.split("=")
+ if (len(splitted)>1) and not (splitted[1]==' '):
+ ret.append(x)
+ return ret
+
if qs=="":
if self.REQUEST['QUERY_STRING']:
qs=self.REQUEST['QUERY_STRING']
qs=string.join(qs.split("&"),",")
+
for field in argv.keys():
+
qs+=",-%s=%s"%(field,argv[field])
- print qs
+ #print qs
else:
qs=self.REQUEST.SESSION['query']
+
else:
self.REQUEST['QUERY_STRING']=qs
+
qs=string.join(qs.split("&"),",")
-
+
+
qs=re.sub("\\+"," ",qs)# Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular.
+ qs=string.join(delEmpty(qs.split(",")),",")
+
if storename:
"""store"""
else:
storename="foundCount"
- #print "QS",qs
+
+
+
ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename)
#print self.REQUEST.SESSION["foundCount"]
+
return ret
def ZSQLFoundCountLen(self,var):
@@ -330,7 +385,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):
@@ -544,6 +599,8 @@ class ZSQLExtendFolder(Persistent, Impli
"""nextLink"""
try:
limit=self.REQUEST.SESSION[storename]['rangeSize']
+ if int(limit)==0 :
+ limit="1"
newRangeStart=int(self.REQUEST.SESSION[storename]['rangeStart'])+int(limit)
except:
limit=0
@@ -572,10 +629,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)
@@ -593,6 +652,8 @@ class ZSQLExtendFolder(Persistent, Impli
"""prev link"""
try:
limit=self.REQUEST.SESSION[storename]['rangeSize']
+ if int(limit)==0 :
+ limit="1"
newRangeStart=int(self.REQUEST.SESSION[storename]['rangeStart'])-int(limit)
except:
limit=0
@@ -811,7 +872,8 @@ class ZSQLBibliography(Folder,ZSQLExtend
return ret
except:
return None
- def findLabelsFromMapping(self,referenceType):
+
+ def findTagsFromMapping(self,referenceType):
"""gib hash mit label -> generic zurueck"""
self.referencetypes=self.ZopeFind(self.standardMD)
bibdata={}
@@ -819,18 +881,60 @@ 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]
self.fields=bibdata[referenceType]
for field in fieldlist:
- retdata[field]=referenceTypeF[1].getValue(field)[1]
+ retdata[field]=referenceTypeF[1].getValue(field)[0]
return retdata,fieldlist
+ def findLabelsFromMapping(self,referenceType):
+ """gib hash mit label -> generic zurueck"""
+ self.referencetypes=self.ZopeFind(self.standardMD)
+ bibdata={}
+ retdata={}
+ fieldlist=self.standardMD.fieldList
+ for referenceTypeF in self.referencetypes:
+ #print referenceType,referenceTypeF[1].title
+ if referenceTypeF[1].title == referenceType:
+ bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
+ bibdata['data']=referenceTypeF[1]
+ self.fields=bibdata[referenceType]
+ for field in fieldlist:
+ retdata[field]=referenceTypeF[1].getValue(field)[1]
+ return retdata,fieldlist
+
+ def createIndexTag(self,tag,content):
+ """creste tag"""
+ if content:
+ ret="""<%s>%s%s>"""%(tag,content,tag)
+ return ret
+ else:
+ return ""
+
+ def getMetaDataXML(self):
+ """crate index meta"""
+ pt=PageTemplateFile('Products/ZSQLExtend/zpt/record.xml').__of__(self)
+ pt.content_type="text/xml"
+ return pt()
+
+ def getMetaDatasXML(self):
+ """index"""
+ ret="""
+ """
+ for found in self.search(var="select oid from %s"%self.tableName):
+ link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid
+ metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid
+
+ ret+="""\n"""%(link,metalink)
+
+ return ret+"\n"
+
manage_addZSQLBibliographyForm=DTMLFile('ZSQLBibliographyAdd', globals())
def manage_addZSQLBibliography(self, id, tableName,label,description,title='',