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.41 and 1.53

version 1.41, 2006/08/10 10:03:28	version 1.53, 2006/12/22 11:56:08
Line 1	Line 1
"""CDLI extensions of the filearchive"""	"""CDLI extensions of the filearchive"""
from Products.versionedFile.versionedFile import *	from Products.versionedFile.extVersionedFile import *
from Products.ZCatalog.CatalogPathAwareness import CatalogAware	from Products.ZCatalog.CatalogPathAwareness import CatalogAware
from tempfile import mkstemp,mkdtemp	from tempfile import mkstemp,mkdtemp
import os.path	import os.path
import os	import os
from types import *	from types import *
import urlparse	import urlparse
	import urllib
	import cgi
from OFS.OrderedFolder import OrderedFolder	from OFS.OrderedFolder import OrderedFolder
from OFS.SimpleItem import SimpleItem	from OFS.SimpleItem import SimpleItem
import time	import time
Line 19 from ZPublisher.HTTPRequest import HTTPR	Line 21 from ZPublisher.HTTPRequest import HTTPR
from ZPublisher.HTTPResponse import HTTPResponse	from ZPublisher.HTTPResponse import HTTPResponse
from ZPublisher.BaseRequest import RequestContainer	from ZPublisher.BaseRequest import RequestContainer
import threading	import threading
	from BTrees.OOBTree import OOBTree

class BasketContent(SimpleItem):	class BasketContent(SimpleItem):
"""classe fuer den Inhalt eines Baskets"""	"""classe fuer den Inhalt eines Baskets"""
Line 98 class uploadATFfinallyThread(Thread):	Line 100 class uploadATFfinallyThread(Thread):
conn.close()	conn.close()
#set flag for end of this method	#set flag for end of this method
self.end=True	self.end=True
	print "ended"
return True	return True

def __del__(self):	def __del__(self):
Line 126 class uploadATFfinallyThread(Thread):	Line 129 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 141 class uploadATFfinallyThread(Thread):	Line 144 class uploadATFfinallyThread(Thread):
if len(founds)>0:	if len(founds)>0:
SESSION['author']=str(username)	SESSION['author']=str(username)
self.result+="<p>Changing : %s"%fn	self.result+="<p>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	#now add the new files
Line 268 class uploadATFThread(Thread):	Line 271 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 282 class uploadATFThread(Thread):	Line 287 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 308 class uploadATFThread(Thread):	Line 313 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)
	status=True
	msg=""
	if not status: # error
	errors.append((fn,msg))
	else:
if len(founds)==0:	if len(founds)==0:
newPs.append(fn)	newPs.append(fn)

Line 317 class uploadATFThread(Thread):	Line 330 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 331 class uploadATFThread(Thread):	Line 343 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 515 class BasketObject_old(Folder):	Line 528 class BasketObject_old(Folder):
ret=""	ret=""
lockedObjects={}	lockedObjects={}

	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 541 class BasketObject_old(Folder):	Line 557 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:

if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']):	if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']):
ret+=object.getLastVersion().data	ret+=object.getLastVersion().getData()

if lock and object.lockedBy=='':	if lock and object.lockedBy=='':
object.lockedBy=self.REQUEST['AUTHENTICATED_USER']	object.lockedBy=self.REQUEST['AUTHENTICATED_USER']
Line 556 class BasketObject_old(Folder):	Line 576 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 669 class CDLIBasketContainer(OrderedFolder)	Line 692 class CDLIBasketContainer(OrderedFolder)
self.title=title	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'):	def getBaskets(self,sortField='title'):
"""get all baskets files"""	"""get all baskets files"""

Line 742 class CDLIBasketContainer(OrderedFolder)	Line 777 class CDLIBasketContainer(OrderedFolder)
def setActiveBasket(self,basketId,REQUEST=None):	def setActiveBasket(self,basketId,REQUEST=None):
"""store active basketId in a cookie"""	"""store active basketId in a cookie"""
self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/")	self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/")
	try:
	qs=cgi.parse_qs(REQUEST['QUERY_STRING'])
	del(qs['basketId'])
	except:
	qs={}
if REQUEST:	if REQUEST:
REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+REQUEST['QUERY_STRING'])	REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+urllib.urlencode(qs))

def getActiveBasket(self):	def getActiveBasket(self):
"""get active basket from cookie"""	"""get active basket from cookie"""
Line 948 class CDLIBasket(Folder,CatalogAware):	Line 987 class CDLIBasket(Folder,CatalogAware):
newContent=[]	newContent=[]
added=0	added=0
for id in ids:	for id in ids:
	try:
founds=self.CDLICatalog.search({'title':id})	founds=self.CDLICatalog.search({'title':id})
	except:
	founds=[]
for found in founds:	for found in founds:
if found.getObject() not in oldContent:	if found.getObject() not in oldContent:
#TODO: was passiert wenn, man eine Object dazuf�gt, das schon da ist aber eine neuere version	#TODO: was passiert wenn, man eine Object dazuf�gt, das schon da ist aber eine neuere version
Line 966 class CDLIBasket(Folder,CatalogAware):	Line 1007 class CDLIBasket(Folder,CatalogAware):

return added	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):	def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None):
"""change a basket"""	"""change a basket"""
if submit=="update":	if submit=="update":
Line 1046 class CDLIBasketVersion(Implicit,Persist	Line 1100 class CDLIBasketVersion(Implicit,Persist
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"):	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():	if (check=="yes") and self.containsNonActualFiles():
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self)

return pt(lock=lock)	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.
Line 1074 class CDLIBasketVersion(Implicit,Persist	Line 1148 class CDLIBasketVersion(Implicit,Persist
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.content.getContent():	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']):
if current=="no": #version as they are in the basket	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":	elif current=="yes":
#search current object	#search current object
founds=self.CDLICatalog.search({'title':object[0].getId()})	founds=self.CDLICatalog.search({'title':object[0].getId()})
if len(founds)>0:	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=='':	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"""
Line 1188 def manage_addCDLIBasketVersion(self,use	Line 1272 def manage_addCDLIBasketVersion(self,use
else:	else:
return ob	return ob

class CDLIFileObject(CatalogAware,versionedFileObject):	class CDLIFileObject(CatalogAware,extVersionedFileObject):
"""CDLI file object"""	"""CDLI file object"""

meta_type="CDLI File Object"	meta_type="CDLI File Object"
Line 1224 class CDLIFileObject(CatalogAware,versio	Line 1308 class CDLIFileObject(CatalogAware,versio

security.declarePublic('view')	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):	def view(self):
"""view file"""	"""view file"""
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)
Line 1233 class CDLIFileObject(CatalogAware,versio	Line 1322 class CDLIFileObject(CatalogAware,versio
def getPNumber(self):	def getPNumber(self):
"""get the pnumber"""	"""get the pnumber"""
try:	try:
txt=re.match("&[Pp](\d)\s=([^\r\n]*)",self.data[0:])	txt=re.match("&[Pp](\d)\s=([^\r\n]*)",self.getData()[0:])
except:	except:
txt=self.data[0:]	txt=self.getData()[0:]

return "ERROR"	return "ERROR"
try:	try:
Line 1247 class CDLIFileObject(CatalogAware,versio	Line 1336 class CDLIFileObject(CatalogAware,versio
def getDesignation(self):	def getDesignation(self):
"""get the designation out of the file"""	"""get the designation out of the file"""
try:	try:
txt=re.match("&[Pp](\d)\s=([^\r\n]*)",self.data[0:])	txt=re.match("&[Pp](\d)\s=([^\r\n]*)",self.getData()[0:])
except:	except:
txt=self.data[0:]	txt=self.getData()[0:]

return "ERROR"	return "ERROR"
try:	try:
Line 1260 class CDLIFileObject(CatalogAware,versio	Line 1349 class CDLIFileObject(CatalogAware,versio
manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1')	manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1')

def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='',	def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='',
REQUEST=None):	from_tmp=False,REQUEST=None):
"""Add a new File object.	"""Add a new File object.

Creates a new File object 'id' with the contents of 'file'"""	Creates a new File object 'id' with the contents of 'file'"""
Line 1281 def manage_addCDLIFileObject(self,id,vC=	Line 1370 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 and not from_tmp:
self._getOb(id).manage_upload(file)	self._getOb(id).manage_upload(file)
	elif file and from_tmp:
	self._getOb(id).manage_upload_from_tmp(file)
if content_type:	if content_type:
self._getOb(id).content_type=content_type	self._getOb(id).content_type=content_type

	self.reindex_object()
	self._getOb(id).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')

class CDLIFile(versionedFile,CatalogAware):	class CDLIFile(extVersionedFile,CatalogAware):
"""CDLI file"""	"""CDLI file"""

meta_type="CDLI file"	meta_type="CDLI file"
default_catalog='CDLICatalog'	default_catalog='CDLICatalog'

#security.declarePublic('history')	#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):	def history(self):
"""history"""	"""history"""

Line 1309 class CDLIFile(versionedFile,CatalogAwar	Line 1416 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 1346 class CDLIFile(versionedFile,CatalogAwar	Line 1465 class CDLIFile(versionedFile,CatalogAwar
precondition='',	precondition='',
content_type='',	content_type='',
changeName='no',newName='',	changeName='no',newName='',
come_from=None,RESPONSE=None):	come_from=None,
	from_tmp=False,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']
except:	except:
Line 1380 class CDLIFile(versionedFile,CatalogAwar	Line 1501 class CDLIFile(versionedFile,CatalogAwar
id=tmp[0]+"_V%i"%self.getVersion()	id=tmp[0]+"_V%i"%self.getVersion()


manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type)	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=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion()))
	objs=getattr(self,id).setVersionNumber(int(self.getVersion()))
try:	try:
#FIXME: wozu ist das gut?	#FIXME: wozu ist das gut?
self.REQUEST.SESSION['objID_parent']=self.getId()	self.REQUEST.SESSION['objID_parent']=self.getId()
Line 1421 def manage_addCDLIFile(self,id,title,loc	Line 1543 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

	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:

	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"""
ret=None	ret=None
nf=None	nf=None
i=0	i=0
for line in fh.readlines():
	for lineTmp in fh.readlines():
	for line in lineTmp.split("\r"):
if ext:	if ext:
i+=1	i+=1
if (i%100)==0:	if (i%100)==0:
Line 1443 def splitatf(fh,dir=None,ext=None):	Line 1587 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 1457 def splitatf(fh,dir=None,ext=None):	Line 1605 def splitatf(fh,dir=None,ext=None):
filename=os.path.join(dir,filename)	filename=os.path.join(dir,filename)
nf=file(filename,"w")	nf=file(filename,"w")
if nf:	if nf:
nf.write(line)	nf.write(line.replace("\n","")+"\n")

nf.close()	nf.close()
fh.close()	fh.close()
return ret,len(os.listdir(dir))	return ret,len(os.listdir(dir))


class CDLIFileFolder(versionedFileFolder):	class CDLIFileFolder(extVersionedFileFolder):
"""CDLI File Folder"""	"""CDLI File Folder"""

security=ClassSecurityInfo()	security=ClassSecurityInfo()
Line 1473 class CDLIFileFolder(versionedFileFolder	Line 1621 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 1517 class CDLIFileFolder(versionedFileFolder	Line 1665 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 1530 class CDLIFileFolder(versionedFileFolder	Line 1678 class CDLIFileFolder(versionedFileFolder

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

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



Line 1595 class CDLIFileFolder(versionedFileFolder	Line 1743 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 1605 class CDLIFileFolder(versionedFileFolder	Line 1752 class CDLIFileFolder(versionedFileFolder

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

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 1620 class CDLIFileFolder(versionedFileFolder	Line 1777 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().getData()[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 1653 class CDLIFileFolder(versionedFileFolder	Line 1813 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 1710 class CDLIRoot(Folder):	Line 1860 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 showInLineIndex(self):
	"""get the index for debug purposes"""
	print "show"
	for x in self.lineIndex.iterkeys():
	print "word:",x
	for y in self.lineIndex[x].iterkeys():
	print "doc",y,self.lineIndex[x][y]

	return self.lineIndex

	def searchInLineIndexDocs(self,word):
	"""search occurences"""
	return list(self.lineIndex.get(word.upper()).keys())

	def getLinesFromIndex(self,word,doc):
	"""get lines"""
	return self.lineIndex[word][doc]

	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]])):
	li[key][value[0]].append(value[1]) # add it if now in the array
	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

	get_transaction().commit()


	def showFile(self,fileId):
	"""show a file"""
	f=self.CDLICatalog({'title':fileId})
	if not f:
	return ""

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

def URLquote(self,str):	def URLquote(self,str):
"""quote url"""	"""quote url"""
Line 1728 class CDLIRoot(Folder):	Line 1938 class CDLIRoot(Folder):

if un and un !="":	if un and un !="":
ret.append((f[0],un))	ret.append((f[0],un))
print ret
return ret	return ret

def getChangesByAuthor(self,author,n=100):	def getChangesByAuthor(self,author,n=100):
Line 1753 class CDLIRoot(Folder):	Line 1963 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 1785 class CDLIRoot(Folder):	Line 1995 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 1846 class CDLIRoot(Folder):	Line 2062 class CDLIRoot(Folder):
# tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:]	# tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:]
# else:	# else:
# tmp[key]=self._v_uploadATF[threadName].returnValue[key]	# tmp[key]=self._v_uploadATF[threadName].returnValue[key]
# print repr(tmp[key]),repr(key)	# repr(tmp[key]),repr(key)
#	#
# #	# #
#tmp=self.cdli_main.tmpStore2[threadName]	#tmp=self.cdli_main.tmpStore2[threadName]
tmp=self._v_uploadATF[threadName].returnValue	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['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])
Line 1863 class CDLIRoot(Folder):	Line 2080 class CDLIRoot(Folder):

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 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 1886 class CDLIRoot(Folder):	Line 2103 class CDLIRoot(Folder):
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 1926 class CDLIRoot(Folder):	Line 2144 class CDLIRoot(Folder):
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect(self.absolute_url())	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"""	"""import files"""
root=self.cdli_main	root=self.cdli_main
	count=0
if not files:	if not files:
files=os.listdir(folderName)	files=os.listdir(folderName)

Line 1939 class CDLIRoot(Folder):	Line 2157 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)
Line 1956 class CDLIRoot(Folder):	Line 2174 class CDLIRoot(Folder):
else:	else:
fobj2=obj2[0][1]	fobj2=obj2[0][1]

file2=file(os.path.join(folderName,f))	file2=os.path.join(folderName,f)
id=f	id=f
manage_addCDLIFile(fobj2,f,'','')	manage_addCDLIFile(fobj2,f,'','')
id=f	id=f
ob=fobj2._getOb(f)	ob=fobj2._getOb(f)
ob.title=id	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.catalog_object(ob)
#self.CDLICatalog.manage_catalogFoundItems(obj_ids=[id],search_sub=1)	#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])	#self.CDLICatalog.manage_catalogObject(self.REQUEST, self.REQUEST.RESPONSE, 'CDLICatalog', urlparse.urlparse(ob.absolute_url())[1])
	count+=1

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

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

Removed from v.1.41
changed lines
	Added in v.1.53