--- cdli/cdli_files.py 2006/10/05 06:38:13 1.47 +++ cdli/cdli_files.py 2007/01/24 18:08:15 1.59 @@ -1,5 +1,4 @@ """CDLI extensions of the filearchive""" -from Products.versionedFile.versionedFile import * from Products.versionedFile.extVersionedFile import * from Products.ZCatalog.CatalogPathAwareness import CatalogAware from tempfile import mkstemp,mkdtemp @@ -7,6 +6,8 @@ import os.path import os from types import * import urlparse +import urllib +import cgi from OFS.OrderedFolder import OrderedFolder from OFS.SimpleItem import SimpleItem import time @@ -20,7 +21,79 @@ from ZPublisher.HTTPRequest import HTTPR from ZPublisher.HTTPResponse import HTTPResponse from ZPublisher.BaseRequest import RequestContainer import threading - +from BTrees.OOBTree import OOBTree +import logging +import transaction + +def unique(s): + """Return a list of the elements in s, but without duplicates. + + For example, unique([1,2,3,1,2,3]) is some permutation of [1,2,3], + unique("abcabc") some permutation of ["a", "b", "c"], and + unique(([1, 2], [2, 3], [1, 2])) some permutation of + [[2, 3], [1, 2]]. + + For best speed, all sequence elements should be hashable. Then + unique() will usually work in linear time. + + If not possible, the sequence elements should enjoy a total + ordering, and if list(s).sort() doesn't raise TypeError it's + assumed that they do enjoy a total ordering. Then unique() will + usually work in O(N*log2(N)) time. + + If that's not possible either, the sequence elements must support + equality-testing. Then unique() will usually work in quadratic + time. + (from the python cookbook) + """ + + n = len(s) + if n == 0: + return [] + + # Try using a dict first, as that's the fastest and will usually + # work. If it doesn't work, it will usually fail quickly, so it + # usually doesn't cost much to *try* it. It requires that all the + # sequence elements be hashable, and support equality comparison. + u = {} + try: + for x in s: + u[x] = 1 + except TypeError: + del u # move on to the next method + else: + return u.keys() + + # We can't hash all the elements. Second fastest is to sort, + # which brings the equal elements together; then duplicates are + # easy to weed out in a single pass. + # NOTE: Python's list.sort() was designed to be efficient in the + # presence of many duplicate elements. This isn't true of all + # sort functions in all languages or libraries, so this approach + # is more effective in Python than it may be elsewhere. + try: + t = list(s) + t.sort() + except TypeError: + del t # move on to the next method + else: + assert n > 0 + last = t[0] + lasti = i = 1 + while i < n: + if t[i] != last: + t[lasti] = last = t[i] + lasti += 1 + i += 1 + return t[:lasti] + + # Brute force is all that's left. + u = [] + for x in s: + if x not in u: + u.append(x) + return u + class BasketContent(SimpleItem): """classe fuer den Inhalt eines Baskets""" @@ -95,11 +168,12 @@ class uploadATFfinallyThread(Thread): #add the files self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username) #commit the transactions - get_transaction().commit() + transaction.get().commit() conn.close() #set flag for end of this method self.end=True - return True + print "ended" + return True def __del__(self): """delete""" @@ -142,7 +216,7 @@ class uploadATFfinallyThread(Thread): if len(founds)>0: SESSION['author']=str(username) self.result+="
Changing : %s"%fn
- founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=file(os.path.join(SESSION['tmpdir'],fn)))
+ founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn),from_tmp=True)
#now add the new files
@@ -238,12 +312,12 @@ class uploadATFThread(Thread):
self.uploadATFThread(ctx,self.upload,self.basketId)
#ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue
-
- get_transaction().commit()
+
+ transaction.get().commit()
while self.continueVar:
pass
-
+
conn.close()
@@ -315,7 +389,7 @@ class uploadATFThread(Thread):
data=file(os.path.join(dir,fn)).read()
#status,msg=checkFile(fn,data,dir)
status=True
- msg=""
+ msg=""
if not status: # error
errors.append((fn,msg))
else:
@@ -525,7 +599,7 @@ class BasketObject_old(Folder):
ret=""
lockedObjects={}
- print "x",self.temp_folder.downloadCounter
+
if self.temp_folder.downloadCounter > 10:
return """I am sorry, currently the server has to many requests for downloads, please come back later!"""
@@ -557,8 +631,8 @@ class BasketObject_old(Folder):
self.temp_folder.downloadCounter+=1
self._p_changed=1
- get_transaction().commit()
-
+
+ transaction.get().commit()
for object in self.contents:
@@ -576,7 +650,8 @@ class BasketObject_old(Folder):
self.REQUEST.RESPONSE.write(ret)
self.temp_folder.downloadCounter-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
+
def manage_addBasket_oldObjectForm(self):
@@ -689,7 +764,19 @@ class CDLIBasketContainer(OrderedFolder)
self.id=id
self.title=title
-
+
+ def getBasketsId(self):
+ """get all baskets als klartext"""
+
+ ret=""
+ baskets=self.ZopeFind(self,obj_metatypes=['CDLIBasket'])
+ for basket in baskets:
+ com,user,time,values = basket[1].getContentIds()
+ ret+= "BASKET:"+com+"\t"+user+"\t"+time+"\n"
+ for x in values:
+ ret+= x[0]+"\t"+x[1]+"\n"
+ return ret
+
def getBaskets(self,sortField='title'):
"""get all baskets files"""
@@ -763,9 +850,13 @@ class CDLIBasketContainer(OrderedFolder)
def setActiveBasket(self,basketId,REQUEST=None):
"""store active basketId in a cookie"""
self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/")
-
+ try:
+ qs=cgi.parse_qs(REQUEST['QUERY_STRING'])
+ del(qs['basketId'])
+ except:
+ qs={}
if REQUEST:
- REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+REQUEST['QUERY_STRING'])
+ REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+urllib.urlencode(qs))
def getActiveBasket(self):
"""get active basket from cookie"""
@@ -969,8 +1060,10 @@ class CDLIBasket(Folder,CatalogAware):
newContent=[]
added=0
for id in ids:
- founds=self.CDLICatalog.search({'title':id})
-
+ try:
+ founds=self.CDLICatalog.search({'title':id})
+ except:
+ founds=[]
for found in founds:
if found.getObject() not in oldContent:
#TODO: was passiert wenn, man eine Object dazufgt, das schon da ist aber eine neuere version
@@ -987,6 +1080,19 @@ class CDLIBasket(Folder,CatalogAware):
return added
+
+
+
+ def getContentIds(self):
+ """print basket content"""
+ ret=[]
+ lv=self.getLastVersion()
+ for obj in lv.content.getContent():
+ ret.append((obj[0].getId(),obj[1].getId()))
+
+
+ return lv.getComment(),lv.getUser(),lv.getTime(),ret
+
def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None):
"""change a basket"""
if submit=="update":
@@ -1088,17 +1194,17 @@ class CDLIBasketVersion(Implicit,Persist
self.temp_folder.downloadCounterBaskets+=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
if lock:
if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
return "please login first"
#check if a locked object exist in the basket.
@@ -1118,7 +1224,7 @@ class CDLIBasketVersion(Implicit,Persist
self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
return pt()
@@ -1132,12 +1238,12 @@ class CDLIBasketVersion(Implicit,Persist
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']):
if current=="no": #version as they are in the basket
- ret+=str(object[0].data)+"\n"
+ ret+=str(object[0].getData())+"\n"
elif current=="yes":
#search current object
founds=self.CDLICatalog.search({'title':object[0].getId()})
if len(founds)>0:
- ret+=str(founds[0].getObject().getLastVersion().data)+"\n"
+ ret+=str(founds[0].getObject().getLastVersion().getData())+"\n"
if lock and object[1].lockedBy=='':
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']
@@ -1148,7 +1254,7 @@ class CDLIBasketVersion(Implicit,Persist
self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.atf" """%basket_name)
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
@@ -1274,7 +1380,12 @@ class CDLIFileObject(CatalogAware,extVer
return True
security.declarePublic('view')
-
+
+ def getFormattedData(self):
+ """fromat text"""
+ data=self.getData()
+ return re.sub("\s\#lem"," #lem",data) #remove return vor #lem
+
def view(self):
"""view file"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)
@@ -1284,9 +1395,9 @@ class CDLIFileObject(CatalogAware,extVer
def getPNumber(self):
"""get the pnumber"""
try:
- txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.data[0:])
+ txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.getData()[0:])
except:
- txt=self.data[0:]
+ txt=self.getData()[0:]
return "ERROR"
try:
@@ -1311,11 +1422,11 @@ class CDLIFileObject(CatalogAware,extVer
manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1')
def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='',
- REQUEST=None):
+ from_tmp=False,REQUEST=None):
"""Add a new File object.
Creates a new File object 'id' with the contents of 'file'"""
-
+
id=str(id)
title=str(title)
content_type=str(content_type)
@@ -1335,12 +1446,17 @@ def manage_addCDLIFileObject(self,id,vC=
# Now we "upload" the data. By doing this in two steps, we
# can use a database trick to make the upload more efficient.
- if file:
+
+ if file and not from_tmp:
self._getOb(id).manage_upload(file)
+ elif file and from_tmp:
+ self._getOb(id).manage_upload_from_tmp(file)
if content_type:
self._getOb(id).content_type=content_type
self.reindex_object()
+ self._getOb(id).reindex_object()
+
if REQUEST is not None:
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main')
@@ -1351,6 +1467,17 @@ class CDLIFile(extVersionedFile,CatalogA
default_catalog='CDLICatalog'
#security.declarePublic('history')
+ def getLastVersionData(self):
+ """get last version data"""
+ return self.getLastVersion().getData()
+
+ def getLastVersionFormattedData(self):
+ """get last version data"""
+ return self.getLastVersion().getFormattedData()
+
+ #security.declarePublic('history')
+
+
def history(self):
"""history"""
@@ -1411,8 +1538,10 @@ class CDLIFile(extVersionedFile,CatalogA
precondition='',
content_type='',
changeName='no',newName='',
- come_from=None,RESPONSE=None):
+ come_from=None,
+ from_tmp=False,RESPONSE=None):
"""add"""
+
try: #TODO: der ganze vC unsinn muss ueberarbeitet werden
vC=self.REQUEST['vC']
except:
@@ -1445,8 +1574,9 @@ class CDLIFile(extVersionedFile,CatalogA
id=tmp[0]+"_V%i"%self.getVersion()
- manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type)
- objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion()))
+ manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type,from_tmp=from_tmp)
+ #objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion()))
+ objs=getattr(self,id).setVersionNumber(int(self.getVersion()))
try:
#FIXME: wozu ist das gut?
self.REQUEST.SESSION['objID_parent']=self.getId()
@@ -1497,7 +1627,7 @@ def checkFile(filename,data,folder):
"""check the files"""
# first check the file name
fn=filename.split(".") # no extension
- print "_____",fn
+
if not fn[0][0]=="P":
return False,"P missing in the filename"
elif len(fn[0])!=7:
@@ -1509,7 +1639,7 @@ def checkFile(filename,data,folder):
ret= out.close()
if value:
- print "ERRR"
+
return False,"atf checker error: %s"%value
else:
return True,""
@@ -1519,35 +1649,37 @@ def splitatf(fh,dir=None,ext=None):
ret=None
nf=None
i=0
- for line in fh.readlines():
- if ext:
- i+=1
- if (i%100)==0:
- ext.result+="."
- if i==10000:
- i=0
- ext.result+="
"
- #check if basket name is in the first line
- if line.find("#atf basket")>=0: #old convention
- ret=line.replace('#atf basket ','')
- ret=ret.split('_')[0]
- elif line.find("#basket:")>=0: #new convention
- ret=line.replace('#basket: ','')
- ret=ret.split('_')[0]
-
- else:
- if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile
- if nf:
- nf.close() #close last file
-
-
- filename=line[1:].split("=")[0].rstrip()+".atf"
- if dir:
- filename=os.path.join(dir,filename)
- nf=file(filename,"w")
- if nf:
- nf.write(line)
-
+
+ for lineTmp in fh.readlines():
+ for line in lineTmp.split("\r"):
+ if ext:
+ i+=1
+ if (i%100)==0:
+ ext.result+="."
+ if i==10000:
+ i=0
+ ext.result+="
"
+ #check if basket name is in the first line
+ if line.find("#atf basket")>=0: #old convention
+ ret=line.replace('#atf basket ','')
+ ret=ret.split('_')[0]
+ elif line.find("#basket:")>=0: #new convention
+ ret=line.replace('#basket: ','')
+ ret=ret.split('_')[0]
+
+ else:
+ if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile
+ if nf:
+ nf.close() #close last file
+
+
+ filename=line[1:].split("=")[0].rstrip()+".atf"
+ if dir:
+ filename=os.path.join(dir,filename)
+ nf=file(filename,"w")
+ if nf:
+ nf.write(line.replace("\n","")+"\n")
+
nf.close()
fh.close()
return ret,len(os.listdir(dir))
@@ -1693,13 +1825,15 @@ class CDLIFileFolder(extVersionedFileFol
catalog=getattr(self,self.default_catalog)
#tf,tfilename=mkstemp()
- print self.temp_folder.downloadCounter
- if self.temp_folder.downloadCounter > 5:
+ if not hasattr(self.temp_folder,'downloadCounter'):
+ self.temp_folder.downloadCounter=0
+
+ if getattr(self.temp_folder,'downloadCounter',0) > 5:
return """I am sorry, currently the server has to many requests for downloads, please come back later!"""
self.temp_folder.downloadCounter+=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
list=[(x.getId,x) for x in catalog()]
list.sort(sortF)
@@ -1716,10 +1850,10 @@ class CDLIFileFolder(extVersionedFileFol
#os.write(tf,obj.getLastVersion().data)
if RESPONSE:
- RESPONSE.write(obj.getLastVersion().data[0:])
+ RESPONSE.write(obj.getLastVersion().getData()[0:])
self.temp_folder.downloadCounter-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
#os.close(tf)
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)
return True
@@ -1800,6 +1934,172 @@ class CDLIRoot(Folder):
meta_type="CDLIRoot"
downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible
+
+ def findWordRegExp(self,searchTerm):
+ """find all words in index which match regexp in SearchTerm"""
+ ret=[]
+ for x in self.lineIndex.iterkeys():
+ if re.match(searchTerm,x):
+ ret.append(x)
+ return ret
+
+ def searchRegExpInLineIndexDocs(self,searchTerm):
+ """search in inLineIndex with regexp"""
+ if not searchTerm:
+ return []
+ ret=[]
+ words=self.findWordRegExp(searchTerm) # suche nach allen Treffern
+ logging.info("wd:%s"%words)
+ for word in words:
+ ret+=self.searchInLineIndexDocs(word)
+
+ return unique(ret)
+
+ def showInLineIndex(self):
+ """get the index for debug purposes"""
+ print "show"
+ for x in self.lineIndex.iterkeys():
+ logging.info("word:%s"%repr(x))
+ #for y in self.lineIndex[x].iterkeys():
+ # print "doc",repr(y),repr(self.lineIndex[x][y])
+
+ return self.lineIndex
+
+ def searchInLineIndexDocs(self,word,uniq=True,regExp=False):
+ """search occurences"""
+
+ if regExp:
+ return self.searchRegExpInLineIndexDocs(word)
+
+ try:
+ lst=list(self.lineIndex.get(word).keys())
+ except:
+ lst=[]
+ if uniq:
+ return unique(lst)
+ else:
+ return lst
+
+ def getLinesFromIndex(self,word,doc,regExp=False):
+ """get lines"""
+ if not regExp:
+ return self.lineIndex.get(word)[doc]
+ else: # wenn regexp, suche welches word
+ for w in self.findWordRegExp(word):
+ if self.lineIndex.get(w): # ein word in im dex gefunden
+ try:
+ dc=self.lineIndex.get(word)[doc]
+ return dc # und ein document dann gib es zurueck
+ except:
+ pass #andernfalls weiter
+
+ def cleanInLineIndex(self):
+ """delete InlineIndex"""
+ for x in list(self.lineIndex.keys()):
+ del(self.lineIndex[x])
+ print [x for x in self.lineIndex.keys()]
+
+ return "ok"
+
+ def storeInLineIndex(self,key,value):
+ """store in index"""
+
+ if (not hasattr(self,'lineIndex')) or (type(self.lineIndex) is DictType):
+ self.lineIndex=OOBTree()
+ li=self.lineIndex
+
+ if li.has_key(key):
+
+# if li[key].has_key(value[0]) and (not (value[1] in li[key][value[0]])):
+ if li[key].has_key(value[0]):
+ tmp=li[key][value[0]]
+ tmp.append(value[1]) # add it if now in the array
+ li[key][value[0]]=tmp[0:]
+ else:
+ li[key][value[0]]=[value[1]] # new array for lines
+
+ else:
+
+ li[key]=OOBTree()# new btree for lines
+ li[key][value[0]]=[value[1]]
+
+
+ self.lineIndex=li
+
+ transaction.get().commit()
+
+
+ def showFile(self,fileId):
+ """show a file"""
+ f=self.CDLICatalog({'title':fileId})
+ if not f:
+ return ""
+
+ return f[0].getObject().getLastVersionFormattedData()
+
+ def showLineFromFile(self,fileId,lineNum,word):
+ """get line lineNum fromFileId"""
+
+ file=self.showFile(fileId)
+ #str="^%s\.[^%s\.]*%s[^\n]*\n"%(lineNum,lineNum,word)
+ #str="^%s\..*?%s[^\n]*\n"%(lineNum,word)
+
+ #print str
+ #m=re.search(str,file,flags=re.M|re.DOTALL)
+ #if m:
+ # return m.group()
+ #else:
+ # return ""
+ #ret=lineNum+"."
+ #splitted=file.split(lineNum+".")
+ #if len(splitted)>1:
+ #for part in splitted[1:]:
+ #if part.find(word)>-1:
+ # for x in part.split("\n"):
+ #ret+=x
+ #if x.find(word)>-1:
+ #break
+ #break;
+ #return ret
+
+ def showWordInFile(self,fileId,word,lineList=None):
+ """get lines with word fromFileId"""
+
+ file=self.showFile(fileId)
+
+ ret=[]
+ for line in file.split("\n"):
+ if line.find(word)>-1:
+ if lineList: #liste of moeglichen Zeilennummern
+ num=line.split(".")[0] #Zeilenummer ist alles vor dem . in der Zeile
+
+ if num in lineList:
+
+ ret.append(line)
+ else: # nimm alles ohne line check
+ ret.append(line)
+ return ret
+
+ def tagWordInFile(self,fileId,word,lineList=None):
+ """get lines with word fromFileId"""
+
+ file=self.showFile(fileId)
+ tagStr="""%s"""
+ ret=[]
+ for line in file.split("\n"):
+ if line.find(word)>-1:
+ if lineList: #liste of moeglichen Zeilennummern
+ num=line.split(".")[0] #Zeilenummer ist alles vor dem . in der Zeile
+
+ if num in lineList:
+
+ ret.append(line.replace(word,tagStr%word))
+ else: # nimm alles ohne line check
+ ret.append(line.replace(word,tagStr%word))
+ else:
+ ret.append(line)
+ return "
\n".join(ret)
+
def URLquote(self,str):
"""quote url"""
return urllib.quote(str)
@@ -1808,6 +2108,14 @@ class CDLIRoot(Folder):
"""unquote url"""
return urllib.unquote(str)
+ def URLquote_plus(self,str):
+ """quote url"""
+ return urllib.quote_plus(str)
+
+ def URLunquote_plus(self,str):
+ """unquote url"""
+ return urllib.unquote_plus(str)
+
def forceunlock(self):
"break all locks"
@@ -1947,7 +2255,7 @@ class CDLIRoot(Folder):
#tmp=self.cdli_main.tmpStore2[threadName]
tmp=self._v_uploadATF[threadName].returnValue
- #self._v_uploadATF[threadName].continueVar=False
+ self._v_uploadATF[threadName].continueVar=False
self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']]
self.REQUEST.SESSION['lockerrors']=[x[0].getId() for x in tmp['lockerrors']]
@@ -2023,10 +2331,10 @@ class CDLIRoot(Folder):
if RESPONSE is not None:
RESPONSE.redirect(self.absolute_url())
- def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/Documents/workspace/cdli/atf", files=None,ext=None):
+ def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/atf", files=None,ext=None):
"""import files"""
root=self.cdli_main
-
+ count=0
if not files:
files=os.listdir(folderName)
@@ -2040,7 +2348,7 @@ class CDLIRoot(Folder):
if not obj:
manage_addCDLIFileFolder(root,folder,folder)
fobj=getattr(root,folder)
- #get_transaction().commit()
+ #transaction.get().commit()
else:
fobj=obj[0][1]
@@ -2053,18 +2361,24 @@ class CDLIRoot(Folder):
else:
fobj2=obj2[0][1]
- file2=file(os.path.join(folderName,f))
+ file2=os.path.join(folderName,f)
id=f
manage_addCDLIFile(fobj2,f,'','')
id=f
ob=fobj2._getOb(f)
ob.title=id
- manage_addCDLIFileObject(ob,id,comment,author,file2,content_type='')
+ manage_addCDLIFileObject(ob,id,comment,author,file2,content_type='',from_tmp=True)
self.CDLICatalog.catalog_object(ob)
#self.CDLICatalog.manage_catalogFoundItems(obj_ids=[id],search_sub=1)
#self.CDLICatalog.manage_catalogObject(self.REQUEST, self.REQUEST.RESPONSE, 'CDLICatalog', urlparse.urlparse(ob.absolute_url())[1])
-
+ count+=1
+
+ if count > 1000:
+ print "committing"
+ transaction.get().commit()
+ count=0
+ transaction.get().commit()
return "ok"