--- ZSQLExtend/ZSQLExtend.py 2004/06/11 16:54:29 1.20
+++ ZSQLExtend/ZSQLExtend.py 2004/07/13 17:41:37 1.25
@@ -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()
@@ -172,9 +168,11 @@ class ZSQLExtendFolder(Persistent, Impli
ret+=""""""
return ret
- def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,start=None):
+ 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
@@ -306,34 +305,54 @@ 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
else:
qs=self.REQUEST.SESSION['query']
+ for field in argv.keys():
+ #print field
+ qs+=",-%s=%s"%(field,argv[field])
+
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):
@@ -387,7 +406,7 @@ class ZSQLExtendFolder(Persistent, Impli
else:
storename="foundCount"
- return self.REQUEST.SESSION[storename]['rangeEnd']
+ return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count'])))
def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None):
"""analysieren den QueryString"""
@@ -536,7 +555,7 @@ class ZSQLExtendFolder(Persistent, Impli
self.REQUEST.SESSION[storename]['rangeSize']=limit
self.REQUEST.SESSION[storename]['searchFields']=searchFields
- #print "Q",query
+ #print "Q",query
return self.ZSQLQuery(query)
def ZSQLQuery(self,query):
@@ -583,14 +602,16 @@ 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
newRangeStart=0
if newRangeStart>self.REQUEST.SESSION[storename]['count']:
- newRangeStart=self.REQUEST.SESSION[storename]['count']-10
-
+ #newRangeStart=self.REQUEST.SESSION[storename]['count']-1
+ return ""
#create new query string
@@ -611,10 +632,12 @@ class ZSQLExtendFolder(Persistent, Impli
skipFound=0
for query in queries:
+
#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)
@@ -632,10 +655,14 @@ 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
+ limit=1
newRangeStart=0
+ if newRangeStart <0:
+ return ""
#print "limit",limit,newRangeStart,int(self.REQUEST.SESSION[storename]['rangeStart'])
@@ -851,7 +878,7 @@ class ZSQLBibliography(Folder,ZSQLExtend
except:
return None
- def findLabelsFromMapping(self,referenceType):
+ def findTagsFromMapping(self,referenceType):
"""gib hash mit label -> generic zurueck"""
self.referencetypes=self.ZopeFind(self.standardMD)
bibdata={}
@@ -865,12 +892,57 @@ class ZSQLBibliography(Folder,ZSQLExtend
bibdata['data']=referenceTypeF[1]
self.fields=bibdata[referenceType]
for field in fieldlist:
- retdata[field]=referenceTypeF[1].getValue(field)[1]
+ if referenceTypeF[1].getValue(field)[0]==None:
+ retdata[field]=field
+ else:
+ 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"""%(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 limit ALL"%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='',