--- ZSQLExtend/ZSQLExtend.py 2004/07/13 14:36:23 1.23 +++ ZSQLExtend/ZSQLExtend.py 2004/07/20 12:07:57 1.27 @@ -187,7 +187,27 @@ class ZSQLExtendFolder(Persistent, Impli return ret + def ZSQLInlineSearchU(self,storename=None,**argv): + """one element if exists""" + qs=[] + if storename: + """store""" + else: + storename="foundCount" + + + #print "INLINE:",argv + for a in argv.keys(): + qs.append(a+"="+urllib.quote(str(argv[a]))) + #return [] + ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) + + try: + return ret[0] + except: + return None + def ZSQLInlineSearch(self,storename=None,**argv): """inlinesearch""" qs=[] @@ -606,10 +626,10 @@ class ZSQLExtendFolder(Persistent, Impli limit="1" newRangeStart=int(self.REQUEST.SESSION[storename]['rangeStart'])+int(limit) except: - limit=0 + limit=1 newRangeStart=0 - if newRangeStart>self.REQUEST.SESSION[storename]['count']: + if newRangeStart>=self.REQUEST.SESSION[storename]['count']: #newRangeStart=self.REQUEST.SESSION[storename]['count']-1 return "" @@ -637,7 +657,7 @@ class ZSQLExtendFolder(Persistent, Impli if query[0]=="_" : query[0]="-" if query.split("=")[0].lower()=="-skip": - print "d", newRangeStart + skipFound=1 query="-skip=%i"%newRangeStart newquery.append(query) @@ -892,7 +912,10 @@ class ZSQLBibliography(Folder,ZSQLExtend bibdata['data']=referenceTypeF[1] self.fields=bibdata[referenceType] for field in fieldlist: - retdata[field]=referenceTypeF[1].getValue(field)[0] + if referenceTypeF[1].getValue(field)[0]==None: + retdata[field]=field + else: + retdata[field]=referenceTypeF[1].getValue(field)[0] return retdata,fieldlist @@ -922,6 +945,16 @@ class ZSQLBibliography(Folder,ZSQLExtend else: return "" + def getMetaDataXML2(self): + """crate index meta""" + + fn=os.path.splitext(self.REQUEST['fn'])[0]+"." + self.REQUEST['fn']=fn + + pt=PageTemplateFile('Products/ZSQLExtend/zpt/record2.xml').__of__(self) + pt.content_type="text/xml" + return pt() + def getMetaDataXML(self): """crate index meta""" pt=PageTemplateFile('Products/ZSQLExtend/zpt/record.xml').__of__(self) @@ -932,13 +965,14 @@ class ZSQLBibliography(Folder,ZSQLExtend """index""" ret=""" """ - for found in self.search(var="select oid from %s"%self.tableName): + 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())