cdli/cdli_files.py - diff

Return to cdli_files.py CVS log

Up to [Repository] / cdli

Diff for /cdli/cdli_files.py between versions 1.55 and 1.59

version 1.55, 2006/12/22 20:35:33	version 1.59, 2007/01/24 18:08:15
Line 22 from ZPublisher.HTTPResponse import HTTP	Line 22 from ZPublisher.HTTPResponse import HTTP
from ZPublisher.BaseRequest import RequestContainer	from ZPublisher.BaseRequest import RequestContainer
import threading	import threading
from BTrees.OOBTree import OOBTree	from BTrees.OOBTree import OOBTree
	import logging
	import transaction

def unique(s):	def unique(s):
"""Return a list of the elements in s, but without duplicates.	"""Return a list of the elements in s, but without duplicates.
Line 166 class uploadATFfinallyThread(Thread):	Line 168 class uploadATFfinallyThread(Thread):
#add the files	#add the files
self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username)	self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username)
#commit the transactions	#commit the transactions
get_transaction().commit()	transaction.get().commit()
conn.close()	conn.close()
#set flag for end of this method	#set flag for end of this method
self.end=True	self.end=True
Line 311 class uploadATFThread(Thread):	Line 313 class uploadATFThread(Thread):

#ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue	#ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue

get_transaction().commit()

	transaction.get().commit()
while self.continueVar:	while self.continueVar:
pass	pass

Line 629 class BasketObject_old(Folder):	Line 631 class BasketObject_old(Folder):

self.temp_folder.downloadCounter+=1	self.temp_folder.downloadCounter+=1
self._p_changed=1	self._p_changed=1
get_transaction().commit()

	transaction.get().commit()

for object in self.contents:	for object in self.contents:

Line 648 class BasketObject_old(Folder):	Line 650 class BasketObject_old(Folder):
self.REQUEST.RESPONSE.write(ret)	self.REQUEST.RESPONSE.write(ret)
self.temp_folder.downloadCounter-=1	self.temp_folder.downloadCounter-=1
self._p_changed=1	self._p_changed=1
get_transaction().commit()	transaction.get().commit()



def manage_addBasket_oldObjectForm(self):	def manage_addBasket_oldObjectForm(self):
Line 1191 class CDLIBasketVersion(Implicit,Persist	Line 1194 class CDLIBasketVersion(Implicit,Persist

self.temp_folder.downloadCounterBaskets+=1	self.temp_folder.downloadCounterBaskets+=1
self._p_changed=1	self._p_changed=1
get_transaction().commit()	transaction.get().commit()

if lock:	if lock:

if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':	if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
self.temp_folder.downloadCounterBaskets-=1	self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1	self._p_changed=1
get_transaction().commit()	transaction.get().commit()
self.temp_folder.downloadCounterBaskets-=1	self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1	self._p_changed=1
get_transaction().commit()	transaction.get().commit()
return "please login first"	return "please login first"

#check if a locked object exist in the basket.	#check if a locked object exist in the basket.
Line 1221 class CDLIBasketVersion(Implicit,Persist	Line 1224 class CDLIBasketVersion(Implicit,Persist

self.temp_folder.downloadCounterBaskets-=1	self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1	self._p_changed=1
get_transaction().commit()	transaction.get().commit()

return pt()	return pt()

Line 1251 class CDLIBasketVersion(Implicit,Persist	Line 1254 class CDLIBasketVersion(Implicit,Persist

self.temp_folder.downloadCounterBaskets-=1	self.temp_folder.downloadCounterBaskets-=1
self._p_changed=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-Disposition","""attachement; filename="%s.atf" """%basket_name)
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")	self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
Line 1830 class CDLIFileFolder(extVersionedFileFol	Line 1833 class CDLIFileFolder(extVersionedFileFol

self.temp_folder.downloadCounter+=1	self.temp_folder.downloadCounter+=1
self._p_changed=1	self._p_changed=1
get_transaction().commit()	transaction.get().commit()

list=[(x.getId,x) for x in catalog()]	list=[(x.getId,x) for x in catalog()]
list.sort(sortF)	list.sort(sortF)
Line 1850 class CDLIFileFolder(extVersionedFileFol	Line 1853 class CDLIFileFolder(extVersionedFileFol
RESPONSE.write(obj.getLastVersion().getData()[0:])	RESPONSE.write(obj.getLastVersion().getData()[0:])
self.temp_folder.downloadCounter-=1	self.temp_folder.downloadCounter-=1
self._p_changed=1	self._p_changed=1
get_transaction().commit()	transaction.get().commit()
#os.close(tf)	#os.close(tf)
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)	#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)
return True	return True
Line 1932 class CDLIRoot(Folder):	Line 1935 class CDLIRoot(Folder):
meta_type="CDLIRoot"	meta_type="CDLIRoot"
downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible	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):	def showInLineIndex(self):
"""get the index for debug purposes"""	"""get the index for debug purposes"""
print "show"	print "show"
for x in self.lineIndex.iterkeys():	for x in self.lineIndex.iterkeys():
print "word:",x	logging.info("word:%s"%repr(x))
for y in self.lineIndex[x].iterkeys():	#for y in self.lineIndex[x].iterkeys():
print "doc",y,self.lineIndex[x][y]	# print "doc",repr(y),repr(self.lineIndex[x][y])

return self.lineIndex	return self.lineIndex

def searchInLineIndexDocs(self,word,uniq=True):	def searchInLineIndexDocs(self,word,uniq=True,regExp=False):
"""search occurences"""	"""search occurences"""

	if regExp:
	return self.searchRegExpInLineIndexDocs(word)

lst=list(self.lineIndex.get(word.upper()).keys())	try:
	lst=list(self.lineIndex.get(word).keys())
	except:
	lst=[]
if uniq:	if uniq:
return unique(lst)	return unique(lst)
else:	else:
return lst	return lst

def getLinesFromIndex(self,word,doc):	def getLinesFromIndex(self,word,doc,regExp=False):
"""get lines"""	"""get lines"""
return self.lineIndex[word][doc]	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):	def cleanInLineIndex(self):
"""delete InlineIndex"""	"""delete InlineIndex"""
Line 1989 class CDLIRoot(Folder):	Line 2026 class CDLIRoot(Folder):

self.lineIndex=li	self.lineIndex=li

get_transaction().commit()	transaction.get().commit()


def showFile(self,fileId):	def showFile(self,fileId):
Line 2000 class CDLIRoot(Folder):	Line 2037 class CDLIRoot(Folder):

return f[0].getObject().getLastVersionFormattedData()	return f[0].getObject().getLastVersionFormattedData()

def showLineFromFile(self,fileId,lineNum):	def showLineFromFile(self,fileId,lineNum,word):
"""get line lineNum fromFileId"""	"""get line lineNum fromFileId"""

file=self.showFile(fileId)	file=self.showFile(fileId)
str="^%s\.(.*)"%lineNum	#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

m=re.search(str,file,flags=re.M)	def showWordInFile(self,fileId,word,lineList=None):
if m:	"""get lines with word fromFileId"""
return m.group(1)
	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="""<span class="found">%s</span>"""
	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:	else:
return ""	ret.append(line)
	return "<br>\n".join(ret)

def URLquote(self,str):	def URLquote(self,str):
"""quote url"""	"""quote url"""
Line 2020 class CDLIRoot(Folder):	Line 2108 class CDLIRoot(Folder):
"""unquote url"""	"""unquote url"""
return urllib.unquote(str)	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):	def forceunlock(self):
"break all locks"	"break all locks"
Line 2252 class CDLIRoot(Folder):	Line 2348 class CDLIRoot(Folder):
if not obj:	if not obj:
manage_addCDLIFileFolder(root,folder,folder)	manage_addCDLIFileFolder(root,folder,folder)
fobj=getattr(root,folder)	fobj=getattr(root,folder)
#get_transaction().commit()	#transaction.get().commit()
else:	else:
fobj=obj[0][1]	fobj=obj[0][1]

Line 2280 class CDLIRoot(Folder):	Line 2376 class CDLIRoot(Folder):

if count > 1000:	if count > 1000:
print "committing"	print "committing"
get_transaction().commit()	transaction.get().commit()
count=0	count=0
get_transaction().commit()	transaction.get().commit()
return "ok"	return "ok"

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.55
changed lines
	Added in v.1.59