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.33 and 1.45

version 1.33, 2006/07/04 11:54:08	version 1.45, 2006/10/04 07:18:23
Line 13 from OFS.Folder import manage_addFolder	Line 13 from OFS.Folder import manage_addFolder
import re	import re
from AccessControl import ClassSecurityInfo	from AccessControl import ClassSecurityInfo
from Acquisition import Implicit	from Acquisition import Implicit
	from Globals import Persistent
from threading import Thread	from threading import Thread
from ZPublisher.HTTPRequest import HTTPRequest	from ZPublisher.HTTPRequest import HTTPRequest
from ZPublisher.HTTPResponse import HTTPResponse	from ZPublisher.HTTPResponse import HTTPResponse
Line 20 from ZPublisher.BaseRequest import Reque	Line 21 from ZPublisher.BaseRequest import Reque
import threading	import threading


	class BasketContent(SimpleItem):
	"""classe fuer den Inhalt eines Baskets"""

	def __init__(self,content=[]):
	"""content"""
	self.contentList=content[0:]

	def getContent(self):
	"""get content"""

	return self.contentList

	def setContent(self,content):
	self.contentList=content[0:]

	def numberOfItems(self):
	"""number"""

	return len(self.getContent())


class uploadATFfinallyThread(Thread):	class uploadATFfinallyThread(Thread):
"""class for adding uploaded filed (temporarily stored in the staging area at /tmp"""	"""class for adding uploaded filed (temporarily stored in the staging area at /tmp"""
Line 105 class uploadATFfinallyThread(Thread):	Line 126 class uploadATFfinallyThread(Thread):
elif procedure=="uploadAll":	elif procedure=="uploadAll":
uploadFns=[]	uploadFns=[]
for x in os.listdir(SESSION['tmpdir']):	for x in os.listdir(SESSION['tmpdir']):
if not x in SESSION['errors']:	if not x in SESSION['lockerrors']:
uploadFns.append(x)	uploadFns.append(x)

#or maybe nothing	#or maybe nothing
Line 247 class uploadATFThread(Thread):	Line 268 class uploadATFThread(Thread):

changed=[] # changed files	changed=[] # changed files
errors=[] # files with errors	errors=[] # files with errors
	lockerrors=[] # files with errors

newPs=[] # new p filed	newPs=[] # new p filed
psNotInCatalog=[] # files not in the catalog	psNotInCatalog=[] # files not in the catalog

Line 261 class uploadATFThread(Thread):	Line 284 class uploadATFThread(Thread):
if basketObj:	if basketObj:
basketId=basketObj.getId()	basketId=basketObj.getId()

#if there is no active baske and no basketid given, id is empty, else get besketname and length	#if there is no active basket and no basketid given, id is empty, else get besketname and length
if basketId == '0':	if basketId == '0':
basketNameFromId=""	basketNameFromId=""
basketLen=0	basketLen=0
Line 287 class uploadATFThread(Thread):	Line 310 class uploadATFThread(Thread):
founds=ctx2.CDLICatalog.search({'title':fn})	founds=ctx2.CDLICatalog.search({'title':fn})

#if not than add filename to the list of newfiles	#if not than add filename to the list of newfiles

	data=file(os.path.join(dir,fn)).read()
	status,msg=checkFile(fn,data,dir)

	if not status: # error
	errors.append((fn,msg))
	else:
if len(founds)==0:	if len(founds)==0:
newPs.append(fn)	newPs.append(fn)

Line 296 class uploadATFThread(Thread):	Line 326 class uploadATFThread(Thread):
obj=found.getObject()	obj=found.getObject()

if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))):	if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))):
errors.append(obj)	lockerrors.append(fn)
else:	else:
data=file(os.path.join(dir,fn)).read()
diffs=obj.diff(data)	diffs=obj.diff(data)
if diffs[0]>0:	if diffs[0]>0:
changed.append((obj,diffs))	changed.append((obj,diffs)) #hochladen
#hochladen

#ready, set the returnValues	#ready, set the returnValues
self.result+="<h3>Done</h3></body></html>"	self.result+="<h3>Done</h3></body></html>"
Line 310 class uploadATFThread(Thread):	Line 339 class uploadATFThread(Thread):
self.returnValue={}	self.returnValue={}
self.returnValue['changed']=changed	self.returnValue['changed']=changed
self.returnValue['errors']=errors	self.returnValue['errors']=errors
	self.returnValue['lockerrors']=lockerrors
self.returnValue['newPs']=newPs	self.returnValue['newPs']=newPs
self.returnValue['tmpdir']=dir	self.returnValue['tmpdir']=dir
self.returnValue['basketLen']=basketLen	self.returnValue['basketLen']=basketLen
Line 446 class BasketObject_old(Folder):	Line 476 class BasketObject_old(Folder):

def numberOfItems(self):	def numberOfItems(self):
"""return anzahl der elemente im basket"""	"""return anzahl der elemente im basket"""
return len(self.contents)	num=len(self.contents)

	return num

def addObjects(self,ids):	def addObjects(self,ids):
"""addObjects"""	"""addObjects"""
Line 491 class BasketObject_old(Folder):	Line 523 class BasketObject_old(Folder):

ret=""	ret=""
lockedObjects={}	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!"""


if lock:	if lock:
Line 518 class BasketObject_old(Folder):	Line 553 class BasketObject_old(Folder):
elif not procedure: #keine fails gesperrt dann alle donwloaden	elif not procedure: #keine fails gesperrt dann alle donwloaden
procedure="downloadAll"	procedure="downloadAll"

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


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

Line 533 class BasketObject_old(Folder):	Line 572 class BasketObject_old(Folder):
length=len(ret)	length=len(ret)
self.REQUEST.RESPONSE.setHeader("Content-Length",length)	self.REQUEST.RESPONSE.setHeader("Content-Length",length)
self.REQUEST.RESPONSE.write(ret)	self.REQUEST.RESPONSE.write(ret)
	self.temp_folder.downloadCounter-=1
	self._p_changed=1
	get_transaction().commit()


def manage_addBasket_oldObjectForm(self):	def manage_addBasket_oldObjectForm(self):
Line 560 class CDLIBasketContainer(OrderedFolder)	Line 602 class CDLIBasketContainer(OrderedFolder)
security=ClassSecurityInfo()	security=ClassSecurityInfo()
meta_type="CDLIBasketContainer"	meta_type="CDLIBasketContainer"

	def upDateBaskets(self):
	"""update content in to objects"""

	founds=self.ZopeFind(self,obj_metatypes=['CDLIBasketVersion'],search_sub=1)

	for found in founds:
	found[1].updateBasket()

security.declareProtected('manage','deleteBaskets')	security.declareProtected('manage','deleteBaskets')
def deleteBaskets(self,ids=None):	def deleteBaskets(self,ids=None):
"""delete baskets, i.e. move them into trash folder"""	"""delete baskets, i.e. move them into trash folder"""
Line 693 class CDLIBasketContainer(OrderedFolder)	Line 743 class CDLIBasketContainer(OrderedFolder)
baskets.sort(sortAuthor)	baskets.sort(sortAuthor)
elif sortField=='comment':	elif sortField=='comment':
baskets.sort(sortComment)	baskets.sort(sortComment)
print "got the baskets"
return baskets	return baskets


Line 785 class CDLIBasket(Folder,CatalogAware):	Line 835 class CDLIBasket(Folder,CatalogAware):
meta_type="CDLIBasket"	meta_type="CDLIBasket"
default_catalog="CDLIBasketCatalog"	default_catalog="CDLIBasketCatalog"


def getFile(self,obj):	def getFile(self,obj):
return obj[1]	return obj[1]

Line 796 class CDLIBasket(Folder,CatalogAware):	Line 847 class CDLIBasket(Folder,CatalogAware):

return [x[1].getId() for x in self.getLastVersion().getContent()]	return [x[1].getId() for x in self.getLastVersion().getContent()]


def isActual(self,obj):	def isActual(self,obj):
"""teste ob im basket die aktuelle version ist"""	"""teste ob im basket die aktuelle version ist"""
actualNo=obj[1].getLastVersion().getVersionNumber()	actualNo=obj[1].getLastVersion().getVersionNumber()
storedNo=obj[0].getVersionNumber()	storedNo=obj[0].getVersionNumber()

founds=self.CDLICatalog.search({'title':obj[0].getId()})	founds=self.CDLICatalog.search({'title':obj[0].getId()})
	if len(founds)>0:
	actualNo=founds[0].getObject().getLastVersion().getVersionNumber()

if len(founds)>0 and founds[0].getObject().aq_parent.getId()==".trash":	if len(founds)>0 and founds[0].getObject().aq_parent.getId()==".trash":
return False, -1	return False, -1

Line 836 class CDLIBasket(Folder,CatalogAware):	Line 891 class CDLIBasket(Folder,CatalogAware):

def getLastVersion(self):	def getLastVersion(self):
"""hole letzte version"""	"""hole letzte version"""
ids=[int(x[0]) for x in self.ZopeFind(self,obj_metatypes=["CDLIBasketVersion"])]
	ids=[]
	idsTmp= self.objectIds()
	for x in idsTmp:
	try:
	ids.append(int(x))
	except:
	pass
ids.sort()	ids.sort()

if len(ids)==0:	if len(ids)==0:
return None	return None
else:	else:
ob=getattr(self,str(ids[-1]))	ob=getattr(self,str(ids[-1]))


return ob	return ob

def getVersions(self):	def getVersions(self):
Line 850 class CDLIBasket(Folder,CatalogAware):	Line 915 class CDLIBasket(Folder,CatalogAware):
return versions	return versions


	def updateObjects(self,ids,RESPONSE=None,REQUEST=None):
	"""update ids, ids not in the basket the add"""
	if type(ids) is not ListType:
	ids=[ids]

	lastVersion=self.getLastVersion()
	oldContent=lastVersion.content.getContent()
	newContent=[]

	#first copy the old
	for obj in oldContent:
	if obj[1].getId() not in ids:
	newContent.append(obj)
	#now add the new

	for id in ids:
	founds=self.CDLICatalog.search({'title':id})

	for found in founds:
	if found.getObject() not in oldContent:
	#TODO: was passiert wenn, man eine Object dazuf�gt, das schon da ist aber eine neuere version
	newContent.append((found.getObject().getLastVersion(),found.getObject()))


	content=newContent
	user=self.getActualUserName()

	ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent)

	obj=self._getOb(ob.getId())
	if RESPONSE:

	RESPONSE.redirect(obj.absolute_url())

	return obj

def addObjects(self,ids,deleteOld=None,username=None):	def addObjects(self,ids,deleteOld=None,username=None):
"""generate a new version of the basket with objects added"""	"""generate a new version of the basket with objects added"""
Line 859 class CDLIBasket(Folder,CatalogAware):	Line 959 class CDLIBasket(Folder,CatalogAware):
if lastVersion is None:	if lastVersion is None:
oldContent=[]	oldContent=[]
else:	else:
oldContent=lastVersion.basketContent[0:]	oldContent=lastVersion.content.getContent()

if deleteOld:	if deleteOld:
oldContent=[]	oldContent=[]
Line 885 class CDLIBasket(Folder,CatalogAware):	Line 985 class CDLIBasket(Folder,CatalogAware):

return added	return added

	def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None):
	"""change a basket"""
	if submit=="update":
	return self.updateObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
	elif submit=="delete":
	return self.deleteObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)

def deleteObjects(self,ids,RESPONSE=None,REQUEST=None):	def deleteObjects(self,ids,RESPONSE=None,REQUEST=None):
"""delete objects"""	"""delete objects"""

Line 892 class CDLIBasket(Folder,CatalogAware):	Line 999 class CDLIBasket(Folder,CatalogAware):
ids=[ids]	ids=[ids]

lastVersion=self.getLastVersion()	lastVersion=self.getLastVersion()
oldContent=lastVersion.basketContent[0:]	oldContent=lastVersion.content.getContent()
newContent=[]	newContent=[]
for obj in oldContent:	for obj in oldContent:
if obj[1].getId() not in ids:	if obj[1].getId() not in ids:
Line 926 def manage_addCDLIBasket(self,title,shor	Line 1033 def manage_addCDLIBasket(self,title,shor
else:	else:
return ob	return ob

class CDLIBasketVersion(SimpleItem):	class CDLIBasketVersion(Implicit,Persistent,Folder):
"""version of a basket"""	"""version of a basket"""

meta_type="CDLIBasketVersion"	meta_type="CDLIBasketVersion"
security=ClassSecurityInfo()	security=ClassSecurityInfo()

	def updateBasket(self):
	"""update"""
	try:
	self._setObject('content',BasketContent(self.basketContent))
	except:
	try:
	if len(self.basketContent)>0:
	self.content.setContent(self.basketContent)
	except:
	print "error",self.getId(),self.aq_parent.getId()
	self.basketContent=[]


	def containsNonActualFiles(self):
	"""returns True if basket contains one or more non current files"""

	objs=self.getContent()
	for obj in objs:
	if not self.isActual(obj)[0]:
	return True
	return False

security.declareProtected('View','downloadObjectsAsOneFile')	security.declareProtected('View','downloadObjectsAsOneFile')
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None):	def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"):
"""download all selected files in one file"""	"""download all selected files in one file"""

	if self.temp_folder.downloadCounterBaskets > 10000:
	return """I am sorry, currently the server has to many requests for downloads, please come back later!"""


	if (check=="yes") and self.containsNonActualFiles():
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self)

	return pt(lock=lock)

	else:

	return self.downloadObjectsAsOneFileFinally(lock=lock,procedure=procedure,REQUEST=REQUEST,current="no")

	def downloadObjectsAsOneFileFinally(self,lock=None,procedure=None,REQUEST=None,current="no"):
	"""print do the download"""

ret=""	ret=""
lockedObjects={}	lockedObjects={}

	self.temp_folder.downloadCounterBaskets+=1
	self._p_changed=1
	get_transaction().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._p_changed=1
	get_transaction().commit()
	self.temp_folder.downloadCounterBaskets-=1
	self._p_changed=1
	get_transaction().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.
lockedObjects={}	lockedObjects={}
for object in self.basketContent:	for object in self.content.getContent():

if not object[1].lockedBy=="":	if not object[1].lockedBy=="":
lockedObjects[object[1].title]=repr(object[1].lockedBy)	lockedObjects[object[1].title]=repr(object[1].lockedBy)
Line 960 class CDLIBasketVersion(SimpleItem):	Line 1113 class CDLIBasketVersion(SimpleItem):
if len(keys)>0 and (not procedure):	if len(keys)>0 and (not procedure):
self.REQUEST.SESSION['lockedObjects']=lockedObjects	self.REQUEST.SESSION['lockedObjects']=lockedObjects
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','lockedObjects.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','lockedObjects.zpt')).__of__(self)

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

return pt()	return pt()

elif not procedure: #keine fails gesperrt dann alle donwloaden	elif not procedure: #keine fails gesperrt dann alle donwloaden
procedure="downloadAll"	procedure="downloadAll"


for object in self.basketContent:

	for object in self.content.getContent():

if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']):	if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']):
ret+=str(object[0].data)	if current=="no": #version as they are in the basket
	ret+=str(object[0].data)+"\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"

if lock and object[1].lockedBy=='':	if lock and object[1].lockedBy=='':
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']	object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']

basket_name=self.aq_parent.title+"_V"+self.getId()	basket_name=self.aq_parent.title+"_V"+self.getId()

#write basketname to header of atf file	#write basketname to header of atf file
ret="#atf basket %s\n"%basket_name+ret	ret="#basket: %s\n"%basket_name+ret

	self.temp_folder.downloadCounterBaskets-=1
	self._p_changed=1
	get_transaction().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")
length=len(ret)	length=len(ret)
self.REQUEST.RESPONSE.setHeader("Content-Length",length)	self.REQUEST.RESPONSE.setHeader("Content-Length",length)
self.REQUEST.RESPONSE.write(ret)	self.REQUEST.RESPONSE.write(ret)
	return True

def numberOfItems(self):	def numberOfItems(self):
"""return anzahl der elemente im basket"""	"""return anzahl der elemente im basket"""
return len(self.basketContent)	return self.content.numberOfItems()

def getTime(self):	def getTime(self):
"""getTime"""	"""getTime"""
Line 1004 class CDLIBasketVersion(SimpleItem):	Line 1173 class CDLIBasketVersion(SimpleItem):

def getContent(self):	def getContent(self):
"""get Basket Content"""	"""get Basket Content"""
return self.basketContent	return self.content.getContent()


def __init__(self,id,user,comment="",basketContent=[]):	def __init__(self,id,user,comment="",basketContent=[]):
""" init a basket version"""	""" init a basket version"""
self.id=id	self.id=id
self.coment=comment	self.coment=comment
self.basketContent=basketContent[0:]	self._setObject('content',BasketContent(basketContent))
	#self.basketContent=basketContent[0:]a
self.user=user	self.user=user
self.time=time.localtime()	self.time=time.localtime()

Line 1026 class CDLIBasketVersion(SimpleItem):	Line 1196 class CDLIBasketVersion(SimpleItem):
security.declareProtected('View','index_html')	security.declareProtected('View','index_html')
def index_html(self):	def index_html(self):
"""view the basket"""	"""view the basket"""

	if self.REQUEST.get('change',False):
	ob=self.aq_parent.updateObjects(self.REQUEST['change'])

	self.REQUEST.RESPONSE.redirect(ob.absolute_url())#go to new basket, because changing generates a new basket

pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self)
return pt()	return pt()

Line 1102 class CDLIFileObject(CatalogAware,versio	Line 1278 class CDLIFileObject(CatalogAware,versio
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)
return pt()	return pt()

	security.declarePublic('getPNumber')
	def getPNumber(self):
	"""get the pnumber"""
	try:
	txt=re.match("&[Pp](\d)\s=([^\r\n]*)",self.data[0:])
	except:
	txt=self.data[0:]

	return "ERROR"
	try:
	return "P"+txt.group(1)
	except:
	return "ERROR"

security.declarePublic('getDesignation')	security.declarePublic('getDesignation')
def getDesignation(self):	def getDesignation(self):
"""get the designation out of the file"""	"""get the designation out of the file"""
Line 1140 def manage_addCDLIFileObject(self,id,vC=	Line 1330 def manage_addCDLIFileObject(self,id,vC=

setattr(self._getOb(id),'author',author)	setattr(self._getOb(id),'author',author)


# Now we "upload" the data. By doing this in two steps, we	# Now we "upload" the data. By doing this in two steps, we
# can use a database trick to make the upload more efficient.	# can use a database trick to make the upload more efficient.
if file:	if file:
Line 1147 def manage_addCDLIFileObject(self,id,vC=	Line 1338 def manage_addCDLIFileObject(self,id,vC=
if content_type:	if content_type:
self._getOb(id).content_type=content_type	self._getOb(id).content_type=content_type

	self.reindex_object()
if REQUEST is not None:	if REQUEST is not None:
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main')	REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main')

Line 1168 class CDLIFile(versionedFile,CatalogAwar	Line 1360 class CDLIFile(versionedFile,CatalogAwar
return pt()	return pt()


	def getBasketFromId(self,basketid, context=None):
	"""get basket from id"""

	if not context:
	context=self

	for basket in self.ZopeFind(context,obj_metatypes=["CDLIBasket"]):
	if basket[0]==basketid:
	return basket[1]
	else:
	None


def isContainedInBaskets(self,context=None):	def isContainedInBaskets(self,context=None):
"""check is this file is part of any basket	"""check is this file is part of any basket
Line 1200 class CDLIFile(versionedFile,CatalogAwar	Line 1404 class CDLIFile(versionedFile,CatalogAwar
else:	else:
return "Sorry file is locked by somebody else"	return "Sorry file is locked by somebody else"

def manage_addCDLIFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',newName='', RESPONSE=None):	def manage_addCDLIFileObject(self,id,vC,author,
	file='',title='',
	precondition='',
	content_type='',
	changeName='no',newName='',
	come_from=None,RESPONSE=None):
"""add"""	"""add"""
try: #TODO: der ganze vC unsinn muss ueberarbeitet werden	try: #TODO: der ganze vC unsinn muss ueberarbeitet werden
vC=self.REQUEST['vC']	vC=self.REQUEST['vC']
Line 1222 class CDLIFile(versionedFile,CatalogAwar	Line 1431 class CDLIFile(versionedFile,CatalogAwar




positionVersionNum=getattr(self,'positionVersionNum','front')	positionVersionNum=getattr(self,'positionVersionNum','front')

if positionVersionNum=='front':	if positionVersionNum=='front':
Line 1242 class CDLIFile(versionedFile,CatalogAwar	Line 1450 class CDLIFile(versionedFile,CatalogAwar
self.REQUEST.SESSION['objID_parent']=self.getId()	self.REQUEST.SESSION['objID_parent']=self.getId()
except:	except:
pass	pass

if RESPONSE:	if RESPONSE:

obj=self.ZopeFind(self,obj_ids=[id])[0][1]	obj=self.ZopeFind(self,obj_ids=[id])[0][1]
if obj.getSize()==0:	if obj.getSize()==0:
self.REQUEST.SESSION['objID']=obj.getId()	self.REQUEST.SESSION['objID']=obj.getId()
Line 1250 class CDLIFile(versionedFile,CatalogAwar	Line 1460 class CDLIFile(versionedFile,CatalogAwar
return pt()	return pt()

else:	else:
	if come_from and (come_from!=""):
	RESPONSE.redirect(come_from+"?change="+self.getId())
	else:
RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title)	RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title)

else:	else:
Line 1271 def manage_addCDLIFile(self,id,title,loc	Line 1484 def manage_addCDLIFile(self,id,title,loc


self._setObject(id,newObj)	self._setObject(id,newObj)
	getattr(self,id).reindex_object()

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')



	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:
	return False,"P number has not the right length 6"
	else:
	fn=os.path.join(folder,filename)
	stin,out=os.popen4("/usr/bin/atfcheck.plx %s"%fn)
	value=out.read()
	ret= out.close()

	if value:
	print "ERRR"
	return False,"atf checker error: %s"%value
	else:
	return True,""

def splitatf(fh,dir=None,ext=None):	def splitatf(fh,dir=None,ext=None):
"""split it"""	"""split it"""
Line 1293 def splitatf(fh,dir=None,ext=None):	Line 1526 def splitatf(fh,dir=None,ext=None):
i=0	i=0
ext.result+="<br>"	ext.result+="<br>"
#check if basket name is in the first line	#check if basket name is in the first line
if line.find("#atf basket")>=0:	if line.find("#atf basket")>=0: #old convention
ret=line.replace('#atf basket ','')	ret=line.replace('#atf basket ','')
ret=ret.split('_')[0]	ret=ret.split('_')[0]
	elif line.find("#basket:")>=0: #new convention
	ret=line.replace('#basket: ','')
	ret=ret.split('_')[0]

else:	else:
if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile	if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile
if nf:	if nf:
Line 1323 class CDLIFileFolder(versionedFileFolder	Line 1560 class CDLIFileFolder(versionedFileFolder
folderMetaType=['CDLI Folder']	folderMetaType=['CDLI Folder']
default_catalog='CDLICatalog'	default_catalog='CDLICatalog'
defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzuf�gen einer neuen version eines files dieser catalog neuiniziert	defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzuf�gen einer neuen version eines files dieser catalog neuiniziert
	#downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert.
tmpStore2={}	tmpStore2={}
def setTemp(self,name,value):	def setTemp(self,name,value):
"""set tmp"""	"""set tmp"""
Line 1367 class CDLIFileFolder(versionedFileFolder	Line 1604 class CDLIFileFolder(versionedFileFolder



def findObjectsFromListWithVersion(self,list):	def findObjectsFromListWithVersion(self,list,author=None):
"""find objects from a list with versions	"""find objects from a list with versions
@param list: list of tuples (cdliFile,version)	@param list: list of tuples (cdliFile,version)
"""	"""
Line 1380 class CDLIFileFolder(versionedFileFolder	Line 1617 class CDLIFileFolder(versionedFileFolder

pt=getattr(self,'filelistVersioned.html')	pt=getattr(self,'filelistVersioned.html')

return pt(search=list)	return pt(search=list,author=author)



def findObjectsFromList(self,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):	def findObjectsFromList(self,enterList=None,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
"""findObjectsFromList (, TAB oder LINE separated)"""	"""findObjectsFromList (, TAB oder LINE separated)"""


if upload: # list from file upload	if upload: # list from file upload
txt=upload.read()	txt=upload.read()

	if enterList:
	txt=enterList

	if upload or enterList:
txt=txt.replace(",","\n")	txt=txt.replace(",","\n")
txt=txt.replace("\t","\n")	txt=txt.replace("\t","\n")
txt=txt.replace("\r","\n")	txt=txt.replace("\r","\n")
Line 1416 class CDLIFileFolder(versionedFileFolder	Line 1658 class CDLIFileFolder(versionedFileFolder
if list is not None: # got already a list	if list is not None: # got already a list
ret=[]	ret=[]
for fileId in list:	for fileId in list:
if len(fileId.split("."))==1:	if fileId.find("*"): #check for wildcards
	fileId=fileId
	elif len(fileId.split("."))==1:
fileId=fileId+".atf"	fileId=fileId+".atf"

ret+=self.CDLICatalog({'title':fileId})	ret+=self.CDLICatalog({'title':fileId})
Line 1438 class CDLIFileFolder(versionedFileFolder	Line 1682 class CDLIFileFolder(versionedFileFolder
RESPONSE.redirect("filelist.html?start:int="+str(start))	RESPONSE.redirect("filelist.html?start:int="+str(start))



security.declareProtected('Manage','createAllFilesAsSingleFile')	security.declareProtected('Manage','createAllFilesAsSingleFile')
def createAllFilesAsSingleFile(self,RESPONSE=None):	def createAllFilesAsSingleFile(self,RESPONSE=None):
"""download all files"""	"""download all files"""
Line 1448 class CDLIFileFolder(versionedFileFolder	Line 1691 class CDLIFileFolder(versionedFileFolder

catalog=getattr(self,self.default_catalog)	catalog=getattr(self,self.default_catalog)
#tf,tfilename=mkstemp()	#tf,tfilename=mkstemp()
	print self.temp_folder.downloadCounter
	if self.temp_folder.downloadCounter > 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()

list=[(x.getId,x) for x in catalog()]	list=[(x.getId,x) for x in catalog()]
list.sort(sortF)	list.sort(sortF)



RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%"all.atf")	RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%"all.atf")
RESPONSE.setHeader("Content-Type","application/octet-stream")	RESPONSE.setHeader("Content-Type","application/octet-stream")
	tmp=""
for l in list:	for l in list:
obj=l[1].getObject()	obj=l[1].getObject()

Line 1464 class CDLIFileFolder(versionedFileFolder	Line 1715 class CDLIFileFolder(versionedFileFolder
#os.write(tf,obj.getLastVersion().data)	#os.write(tf,obj.getLastVersion().data)
if RESPONSE:	if RESPONSE:
RESPONSE.write(obj.getLastVersion().data[0:])	RESPONSE.write(obj.getLastVersion().data[0:])
	self.temp_folder.downloadCounter-=1
	self._p_changed=1
	get_transaction().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 1496 class CDLIFileFolder(versionedFileFolder	Line 1750 class CDLIFileFolder(versionedFileFolder
return ret	return ret


def getFolders_OLD(self):
"""get all subfolders"""
ret=[]
folders=self.ZopeFind(self,obj_metatypes=self.folderMetaType)
for folder in folders:
ret.append((folder[1],
len(self.ZopeFind(folder[1],obj_metatypes=self.folderMetaType)),
len(getattr(self,self.default_catalog)({'path':folder[0]}))
))
return ret
security.declareProtected('View','index_html')	security.declareProtected('View','index_html')
def index_html(self):	def index_html(self):
"""main"""	"""main"""
Line 1553 class CDLIRoot(Folder):	Line 1797 class CDLIRoot(Folder):
"""main folder for cdli"""	"""main folder for cdli"""

meta_type="CDLIRoot"	meta_type="CDLIRoot"
	downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible
	def URLquote(self,str):
	"""quote url"""
	return urllib.quote(str)

	def URLunquote(self,str):
	"""unquote url"""
	return urllib.unquote(str)


def forceunlock(self):	def forceunlock(self):
"break all locks"	"break all locks"
ret=[]	ret=[]
for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):	for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):
un=f[1].forceunlock()	un=f[1].forceunlock()
print un
if un and un !="":	if un and un !="":
ret.append((f[0],un))	ret.append((f[0],un))
print ret	print ret
Line 1587 class CDLIRoot(Folder):	Line 1840 class CDLIRoot(Folder):
tmp[id]=(x.getObject().aq_parent,nr)	tmp[id]=(x.getObject().aq_parent,nr)


return self.cdli_main.findObjectsFromListWithVersion(list=tmp.values())	return self.cdli_main.findObjectsFromListWithVersion(list=tmp.values(),author=author)

def getLastChanges(self,n=100):	def getLastChanges(self,n=100):
"""get the last n changes"""	"""get the last n changes"""
Line 1619 class CDLIRoot(Folder):	Line 1872 class CDLIRoot(Folder):

def checkThreads(self):	def checkThreads(self):
"""check threads"""	"""check threads"""
return threading.enumerate()	ret="<html><body>"
	for thread in threading.enumerate():
	ret+="<p>%s (%s): %s</p>"%(repr(thread),thread.getName(),thread.isAlive())

	return ret



def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):	def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
"""standard ausgabe"""	"""standard ausgabe"""
Line 1631 class CDLIRoot(Folder):	Line 1890 class CDLIRoot(Folder):

thread=uploadATFThread()	thread=uploadATFThread()
threadName=thread.getName()[0:]	threadName=thread.getName()[0:]
if not hasattr(self,'_v_uploadATF'):	if (not hasattr(self,'_v_uploadATF')):
self._v_uploadATF={}	self._v_uploadATF={}

self._v_uploadATF[threadName]=thread	self._v_uploadATF[threadName]=thread
Line 1654 class CDLIRoot(Folder):	Line 1913 class CDLIRoot(Folder):

else:	else:
#recover thread, if lost	#recover thread, if lost
if not hasattr(self,'_v_uploadATF'):	if (not hasattr(self,'_v_uploadATF')):
self._v_uploadATF={}	self._v_uploadATF={}
if not self._v_uploadATF.get(threadName,None):	if not self._v_uploadATF.get(threadName,None):
for thread in threading.enumerate():	for thread in threading.enumerate():
Line 1689 class CDLIRoot(Folder):	Line 1948 class CDLIRoot(Folder):
#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['changed']=[x[0].getId() for x in tmp['changed']]
self.REQUEST.SESSION['errors']=[x.getId() for x in tmp['errors']]	self.REQUEST.SESSION['lockerrors']=[x[0].getId() for x in tmp['lockerrors']]
	self.REQUEST.SESSION['errors']=tmp['errors']
self.REQUEST.SESSION['newPs']=tmp['newPs']	self.REQUEST.SESSION['newPs']=tmp['newPs']
self.REQUEST.SESSION['tmpdir']=tmp['dir']	self.REQUEST.SESSION['tmpdir']=tmp['dir']
#del(self.cdli_main.tmpStore2[threadName])	#del(self.cdli_main.tmpStore2[threadName])
print "here the templates"

pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
print "init p"
return pt(changed=tmp['changed'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],	return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])	basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])

def redoUpload(self,threadName):	def redoUpload(self,threadName):
"""redo the upload"""	"""redo the upload"""
tmp=self.cdli_main.tmpStore2[threadName]	tmp=self.cdli_main.tmpStore2[threadName]
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
return pt(changed=tmp['changed'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],	return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])	basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])

def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None):	def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None):
Line 1716 class CDLIRoot(Folder):	Line 1976 class CDLIRoot(Folder):
if not threadName or threadName=="":	if not threadName or threadName=="":
thread=uploadATFfinallyThread()	thread=uploadATFfinallyThread()
threadName=thread.getName()[0:]	threadName=thread.getName()[0:]

	if (not hasattr(self,'_v_uploadATF')):
	self._v_uploadATF={}


self._v_uploadATF[threadName]=thread	self._v_uploadATF[threadName]=thread


Line 1769 class CDLIRoot(Folder):	Line 2034 class CDLIRoot(Folder):
obj=self.ZopeFind(root,obj_ids=[folder])	obj=self.ZopeFind(root,obj_ids=[folder])
if ext:	if ext:

ext.result+="<p>Adding: %s </p>"%f	ext.result+="<p>adding: %s </p>"%f
if not obj:	if not obj:
manage_addCDLIFileFolder(root,folder,folder)	manage_addCDLIFileFolder(root,folder,folder)
fobj=getattr(root,folder)	fobj=getattr(root,folder)

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

Removed from v.1.33
changed lines
	Added in v.1.45