--- cdli/cdli_files.py 2006/06/13 20:59:56 1.21
+++ cdli/cdli_files.py 2006/10/04 07:33:22 1.46
@@ -1,7 +1,7 @@
-"""CDLI extensions of the filearchive"""
+"""CDLI extensions of the filearchive"""
from Products.versionedFile.versionedFile import *
from Products.ZCatalog.CatalogPathAwareness import CatalogAware
-from tempfile import mkstemp,mkdtemp
+from tempfile import mkstemp,mkdtemp
import os.path
import os
from types import *
@@ -13,13 +13,35 @@ from OFS.Folder import manage_addFolder
import re
from AccessControl import ClassSecurityInfo
from Acquisition import Implicit
+from Globals import Persistent
from threading import Thread
from ZPublisher.HTTPRequest import HTTPRequest
from ZPublisher.HTTPResponse import HTTPResponse
from ZPublisher.BaseRequest import RequestContainer
import threading
-global tmpVar
+
+
+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 for adding uploaded filed (temporarily stored in the staging area at /tmp"""
@@ -57,7 +79,7 @@ class uploadATFfinallyThread(Thread):
req = HTTPRequest(None, env, resp)
return app.__of__(RequestContainer(REQUEST = req))
-
+
def run(self):
"""run"""
@@ -78,6 +100,11 @@ class uploadATFfinallyThread(Thread):
self.end=True
return True
+ def __del__(self):
+ """delete"""
+
+
+
def getResult(self):
"""method for accessing result"""
@@ -99,7 +126,7 @@ class uploadATFfinallyThread(Thread):
elif procedure=="uploadAll":
uploadFns=[]
for x in os.listdir(SESSION['tmpdir']):
- if not x in SESSION['errors']:
+ if not x in SESSION['lockerrors']:
uploadFns.append(x)
#or maybe nothing
@@ -123,7 +150,8 @@ class uploadATFfinallyThread(Thread):
tmpDir=SESSION['tmpdir']
self.result+="
Adding files
"
#TODO: make this configurable, at the moment base folder for the files has to be cdli_main
- ctx2.cdli_main.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self)
+
+ ctx2.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self)
@@ -207,12 +235,16 @@ class uploadATFThread(Thread):
app = root['Application']
ctx = self.getContext(app,serverport=self.serverport)
self.uploadATFThread(ctx,self.upload,self.basketId)
+
+ #ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue
+
+ get_transaction().commit()
while self.continueVar:
pass
- get_transaction().abort()
+
conn.close()
- print "done"
+
def getResult(self):
"""method for accessing result"""
@@ -222,7 +254,8 @@ class uploadATFThread(Thread):
"""upload an atf file"""
#TODO: add comments
#TODO: finish uploadATF
- self.result="I am loading your file...
"
+ self.result="I got your file, start now to split it into single atf-files!
"
+
#make sure that id is a string and not an integer
basketId=str(basketId)
@@ -235,11 +268,13 @@ class uploadATFThread(Thread):
changed=[] # changed files
errors=[] # files with errors
+ lockerrors=[] # files with errors
+
newPs=[] # new p filed
psNotInCatalog=[] # files not in the catalog
#split the uploadedd atf file
- basketNameFromFile, numberOfFiles=splitatf(upload,dir)
+ basketNameFromFile, numberOfFiles=splitatf(upload,dir,ext=self)
#find basketId if not set
@@ -249,7 +284,7 @@ class uploadATFThread(Thread):
if basketObj:
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':
basketNameFromId=""
basketLen=0
@@ -258,12 +293,13 @@ class uploadATFThread(Thread):
basketLen=getattr(ctx2.basketContainer,basketId).getLastVersion().numberOfItems()
- self.result+="
I got the files
I am checking now the files
"
+ self.result+="""I got the files
<
+ p>I am computing the differences to the exisiting files"""
#start to check the files
for fn in os.listdir(dir):
- self.result+="check:%s
"%fn
+ self.result+="process:%s
"%fn
# check if file is in the catalog
#TODO: checkCatalog is not implemented yet
@@ -274,29 +310,36 @@ class uploadATFThread(Thread):
founds=ctx2.CDLICatalog.search({'title':fn})
#if not than add filename to the list of newfiles
- if len(founds)==0:
- newPs.append(fn)
- #if p file alread at the server
- for found in founds:
- #analyse the differences to the actual file
- obj=found.getObject()
-
- if (not obj.lockedBy=='') and (not obj.lockedBy==self.username):
- errors.append(obj)
- else:
- data=file(os.path.join(dir,fn)).read()
- diffs=obj.diff(data)
- if diffs[0]>0:
- changed.append((obj,diffs))
- #hochladen
-
+ 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:
+ newPs.append(fn)
+
+ #if p file alread at the server
+ for found in founds:
+ #analyse the differences to the actual file
+ obj=found.getObject()
+
+ if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))):
+ lockerrors.append(fn)
+ else:
+
+ diffs=obj.diff(data)
+ if diffs[0]>0:
+ changed.append((obj,diffs)) #hochladen
+
#ready, set the returnValues
self.result+="Done
"
self.returnValue={}
self.returnValue['changed']=changed
self.returnValue['errors']=errors
+ self.returnValue['lockerrors']=lockerrors
self.returnValue['newPs']=newPs
self.returnValue['tmpdir']=dir
self.returnValue['basketLen']=basketLen
@@ -433,7 +476,9 @@ class BasketObject_old(Folder):
def numberOfItems(self):
"""return anzahl der elemente im basket"""
- return len(self.contents)
+ num=len(self.contents)
+
+ return num
def addObjects(self,ids):
"""addObjects"""
@@ -478,7 +523,10 @@ 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!"""
+
if lock:
@@ -505,11 +553,15 @@ class BasketObject_old(Folder):
elif not procedure: #keine fails gesperrt dann alle donwloaden
procedure="downloadAll"
+ self.temp_folder.downloadCounter+=1
+ self._p_changed=1
+ get_transaction().commit()
+
for object in self.contents:
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=='':
object.lockedBy=self.REQUEST['AUTHENTICATED_USER']
@@ -520,6 +572,9 @@ class BasketObject_old(Folder):
length=len(ret)
self.REQUEST.RESPONSE.setHeader("Content-Length",length)
self.REQUEST.RESPONSE.write(ret)
+ self.temp_folder.downloadCounter-=1
+ self._p_changed=1
+ get_transaction().commit()
def manage_addBasket_oldObjectForm(self):
@@ -547,6 +602,15 @@ class CDLIBasketContainer(OrderedFolder)
security=ClassSecurityInfo()
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')
def deleteBaskets(self,ids=None):
"""delete baskets, i.e. move them into trash folder"""
@@ -564,6 +628,7 @@ class CDLIBasketContainer(OrderedFolder)
cut=self.manage_cutObjects(ids)
trash.manage_pasteObjects(cut)
+ security.declareProtected('manage','manageBaskets')
def manageBaskets(self,ids,submit,REQUEST=None,RESPONSE=None):
"""manage baskets, delete or copy"""
if submit=="delete":
@@ -573,6 +638,8 @@ class CDLIBasketContainer(OrderedFolder)
if RESPONSE:
RESPONSE.redirect(self.absolute_url())
+
+ security.declareProtected('View','getBasketIdfromName')
def getBasketIdfromName(self,basketname):
"""get id from name"""
@@ -598,7 +665,7 @@ class CDLIBasketContainer(OrderedFolder)
return pt(basketId=basketId,basketName=basketName)
-
+ security.declareProtected('View','index_html')
def index_html(self):
"""stanadard ansicht"""
@@ -768,6 +835,7 @@ class CDLIBasket(Folder,CatalogAware):
meta_type="CDLIBasket"
default_catalog="CDLIBasketCatalog"
+
def getFile(self,obj):
return obj[1]
@@ -779,12 +847,16 @@ class CDLIBasket(Folder,CatalogAware):
return [x[1].getId() for x in self.getLastVersion().getContent()]
+
def isActual(self,obj):
"""teste ob im basket die aktuelle version ist"""
actualNo=obj[1].getLastVersion().getVersionNumber()
storedNo=obj[0].getVersionNumber()
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":
return False, -1
@@ -819,12 +891,22 @@ class CDLIBasket(Folder,CatalogAware):
def getLastVersion(self):
"""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()
+
if len(ids)==0:
return None
else:
ob=getattr(self,str(ids[-1]))
+
+
return ob
def getVersions(self):
@@ -833,6 +915,41 @@ class CDLIBasket(Folder,CatalogAware):
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 dazufgt, 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):
"""generate a new version of the basket with objects added"""
@@ -842,7 +959,7 @@ class CDLIBasket(Folder,CatalogAware):
if lastVersion is None:
oldContent=[]
else:
- oldContent=lastVersion.basketContent[0:]
+ oldContent=lastVersion.content.getContent()
if deleteOld:
oldContent=[]
@@ -868,6 +985,13 @@ class CDLIBasket(Folder,CatalogAware):
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):
"""delete objects"""
@@ -875,7 +999,7 @@ class CDLIBasket(Folder,CatalogAware):
ids=[ids]
lastVersion=self.getLastVersion()
- oldContent=lastVersion.basketContent[0:]
+ oldContent=lastVersion.content.getContent()
newContent=[]
for obj in oldContent:
if obj[1].getId() not in ids:
@@ -909,27 +1033,75 @@ def manage_addCDLIBasket(self,title,shor
else:
return ob
-class CDLIBasketVersion(SimpleItem):
+class CDLIBasketVersion(Implicit,Persistent,Folder):
"""version of a basket"""
meta_type="CDLIBasketVersion"
+ security=ClassSecurityInfo()
- def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None):
+ 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')
+ def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"):
"""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=""
lockedObjects={}
-
+ self.temp_folder.downloadCounterBaskets+=1
+ self._p_changed=1
+ get_transaction().commit()
+
if lock:
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"
#check if a locked object exist in the basket.
lockedObjects={}
- for object in self.basketContent:
+ for object in self.content.getContent():
if not object[1].lockedBy=="":
lockedObjects[object[1].title]=repr(object[1].lockedBy)
@@ -941,35 +1113,51 @@ class CDLIBasketVersion(SimpleItem):
if len(keys)>0 and (not procedure):
self.REQUEST.SESSION['lockedObjects']=lockedObjects
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()
elif not procedure: #keine fails gesperrt dann alle donwloaden
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']):
- ret+=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=='':
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']
-
basket_name=self.aq_parent.title+"_V"+self.getId()
#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-Type","application/octet-stream")
length=len(ret)
self.REQUEST.RESPONSE.setHeader("Content-Length",length)
self.REQUEST.RESPONSE.write(ret)
+ return True
-
def numberOfItems(self):
"""return anzahl der elemente im basket"""
- return len(self.basketContent)
+ return self.content.numberOfItems()
def getTime(self):
"""getTime"""
@@ -985,14 +1173,15 @@ class CDLIBasketVersion(SimpleItem):
def getContent(self):
"""get Basket Content"""
- return self.basketContent
+ return self.content.getContent()
def __init__(self,id,user,comment="",basketContent=[]):
""" init a basket version"""
self.id=id
self.coment=comment
- self.basketContent=basketContent[0:]
+ self._setObject('content',BasketContent(basketContent))
+ #self.basketContent=basketContent[0:]a
self.user=user
self.time=time.localtime()
@@ -1004,8 +1193,15 @@ class CDLIBasketVersion(SimpleItem):
"""get Comment"""
return self.comment
+ security.declareProtected('View','index_html')
def index_html(self):
"""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)
return pt()
@@ -1041,25 +1237,68 @@ def manage_addCDLIBasketVersion(self,use
else:
return ob
-class CDLIFileObject(versionedFileObject):
+class CDLIFileObject(CatalogAware,extVersionedFileObject):
"""CDLI file object"""
meta_type="CDLI File Object"
+ default_catalog='CDLIObjectsCatalog'
security=ClassSecurityInfo()
+
+ security.declarePublic('makeThisVersionCurrent')
+
+ def PrincipiaSearchSource(self):
+ """Return cataloguable key for ourselves."""
+ return str(self)
+
+ def makeThisVersionCurrent_html(self):
+ """form for making this version current"""
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self)
+ return pt()
+ def makeThisVersionCurrent(self,comment,author,RESPONSE=None):
+ """copy this version to current"""
+ parent=self.aq_parent
+
+
+ newversion=parent.manage_addCDLIFileObject('',comment,author)
+ newversion.data=self.data[0:]
+
+ if RESPONSE is not None:
+ RESPONSE.redirect(self.aq_parent.absolute_url()+'/history')
+
+
+ return True
+
+ security.declarePublic('view')
+
def view(self):
"""view file"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)
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')
def getDesignation(self):
"""get the designation out of the file"""
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:
@@ -1091,6 +1330,7 @@ def manage_addCDLIFileObject(self,id,vC=
setattr(self._getOb(id),'author',author)
+
# 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:
@@ -1098,16 +1338,40 @@ def manage_addCDLIFileObject(self,id,vC=
if content_type:
self._getOb(id).content_type=content_type
+ self.reindex_object()
if REQUEST is not None:
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main')
-class CDLIFile(versionedFile,CatalogAware):
+class CDLIFile(extVersionedFile,CatalogAware):
"""CDLI file"""
meta_type="CDLI file"
default_catalog='CDLICatalog'
-
+ #security.declarePublic('history')
+ def history(self):
+ """history"""
+
+ ext=self.ZopeFind(self.aq_parent,obj_ids=["history_template.html"])
+ if ext:
+ return getattr(self,ext[0][1].getId())()
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionHistory')).__of__(self)
+ 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):
"""check is this file is part of any basket
@@ -1140,7 +1404,12 @@ class CDLIFile(versionedFile,CatalogAwar
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"""
try: #TODO: der ganze vC unsinn muss ueberarbeitet werden
vC=self.REQUEST['vC']
@@ -1161,8 +1430,7 @@ class CDLIFile(versionedFile,CatalogAwar
-
-
+
positionVersionNum=getattr(self,'positionVersionNum','front')
if positionVersionNum=='front':
@@ -1174,12 +1442,17 @@ class CDLIFile(versionedFile,CatalogAwar
else:
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()))
- self.REQUEST.SESSION['objID_parent']=self.getId()
-
+ try:
+ #FIXME: wozu ist das gut?
+ self.REQUEST.SESSION['objID_parent']=self.getId()
+ except:
+ pass
+
if RESPONSE:
+
obj=self.ZopeFind(self,obj_ids=[id])[0][1]
if obj.getSize()==0:
self.REQUEST.SESSION['objID']=obj.getId()
@@ -1187,7 +1460,10 @@ class CDLIFile(versionedFile,CatalogAwar
return pt()
else:
- RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title)
+ if come_from and (come_from!=""):
+ RESPONSE.redirect(come_from+"?change="+self.getId())
+ else:
+ RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title)
else:
return self.ZopeFind(self,obj_ids=[id])[0][1]
@@ -1201,23 +1477,62 @@ def manage_addCDLIFileForm(self):
def manage_addCDLIFile(self,id,title,lockedBy, author=None, RESPONSE=None):
"""add the OSAS_root"""
newObj=CDLIFile(id,title,lockedBy,author)
- self._setObject(id,newObj)
-
+
+ tryToggle=True
+ tryCount=0
+
+
+
+ self._setObject(id,newObj)
+ getattr(self,id).reindex_object()
+
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
-
-def splitatf(fh,dir=None):
+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):
"""split it"""
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:
+ 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:
@@ -1236,7 +1551,7 @@ def splitatf(fh,dir=None):
return ret,len(os.listdir(dir))
-class CDLIFileFolder(versionedFileFolder):
+class CDLIFileFolder(extVersionedFileFolder):
"""CDLI File Folder"""
security=ClassSecurityInfo()
@@ -1244,7 +1559,9 @@ class CDLIFileFolder(versionedFileFolder
filesMetaType=['CDLI file']
folderMetaType=['CDLI Folder']
default_catalog='CDLICatalog'
-
+ defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzufgen 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={}
def setTemp(self,name,value):
"""set tmp"""
@@ -1285,133 +1602,36 @@ class CDLIFileFolder(versionedFileFolder
"""check if fn is in the catalog"""
#TODO add checkCatalog
- def refreshTxt(self,txt=""):
- """txt fuer refresh"""
-
- return """ 2;url=%s?repeat=%s """%(self.absolute_url()+txt,self.threadName)
-
-
- def getResult(self):
- """result of thread"""
- try:
- return self._v_uploadATF.getResult()
- except:
- return "One moment, please"
-
- def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
- """standard ausgabe"""
- #self._v_uploadATF.returnValue=None
-
- threadName=repeat
- if not threadName or threadName=="":
- tmpVar=False
- thread=uploadATFThread()
- self._v_uploadATF=thread
- #self._xmltrans.start()
- #thread=Thread(target=self._v_uploadATF)
-
- self._v_uploadATF.set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
- #thread.start()
- self._v_uploadATF.start()
-
-
- self.threadName=self._v_uploadATF.getName()[0:]
- wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
-
- if wait_template:
- return wait_template[0][1]()
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
- return pt(txt='/uploadATF')
- #_v_xmltrans.run()
-
- else:
- #recover thread, if lost
- if not hasattr(self,'_v_uploadATF'):
- for thread in threading.enumerate():
- if threadName == thread.getName():
- self._v_uploadATF=thread
-
- if not self._v_uploadATF.returnValue:
-
- wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
- if wait_template:
- return wait_template[0][1]()
-
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
-
- return pt(txt='/uploadATF')
-
- else:
-
- tmp=self._v_uploadATF.returnValue
- self._v_uploadATF.continueVar=False
-
- 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['newPs']=tmp['newPs']
- self.REQUEST.SESSION['tmpdir']=tmp['dir']
-
- 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'],
- basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])
-
- def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None):
- """nowupload the files"""
-
+
+ def findObjectsFromListWithVersion(self,list,author=None):
+ """find objects from a list with versions
+ @param list: list of tuples (cdliFile,version)
+ """
+
- threadName=repeat
- if not threadName or threadName=="":
-
-
- self._v_uploadATF=uploadATFfinallyThread()
-
+ #self.REQUEST.SESSION['fileIds']=list#store fieldIds in session for further usage
+ #self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds']
- self._v_uploadATF.set(procedure,comment=comment,basketname=basketname,unlock=unlock,SESSION=self.REQUEST.SESSION,username=self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
-
- self._v_uploadATF.start()
-
-
- self.threadName=self._v_uploadATF.getName()[0:]
- wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
-
- if wait_template:
- return wait_template[0][1]()
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
-
- return pt(txt='/uploadATFfinally')
- #_v_xmltrans.run()
- else:
- #recover thread, if lost
- if not hasattr(self,'_v_uploadATF'):
- for thread in threading.enumerate():
- if threadName == thread.getName():
- self._v_uploadATF=thread
-
- if hasattr(self,'_v_uploadATF') and (self._v_uploadATF is not None) and (not self._v_uploadATF.end) :
-
- wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
- if wait_template:
- return wait_template[0][1]()
-
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
- return pt(txt='/uploadATFfinally')
- else:
-
- if RESPONSE is not None:
- RESPONSE.redirect(self.aq_parent.absolute_url())
-
-
-
-
- def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
+ pt=getattr(self,'filelistVersioned.html')
+
+ return pt(search=list,author=author)
+
+
+
+ def findObjectsFromList(self,enterList=None,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
"""findObjectsFromList (, TAB oder LINE separated)"""
if upload: # list from file upload
txt=upload.read()
+
+ if enterList:
+ txt=enterList
+
+ if upload or enterList:
txt=txt.replace(",","\n")
txt=txt.replace("\t","\n")
txt=txt.replace("\r","\n")
@@ -1438,20 +1658,30 @@ class CDLIFileFolder(versionedFileFolder
if list is not None: # got already a list
ret=[]
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"
-
+
ret+=self.CDLICatalog({'title':fileId})
#TODO: get rid of one of these..
- self.REQUEST.SESSION['fileIds']=[x.getObject().getId() for x in ret]#store fieldIds in session for further usage
+ ids=[x.getObject().getId() for x in ret]
+ self.REQUEST.SESSION['fileIds']=ids#store fieldIds in session for further usage
self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds']
- return ret
+
+ if display:
+ pt=getattr(self,'filelist.html')
+
+ return pt(search=ids)
+ else:
+ return ret
+
+
if start:
RESPONSE.redirect("filelist.html?start:int="+str(start))
-
security.declareProtected('Manage','createAllFilesAsSingleFile')
def createAllFilesAsSingleFile(self,RESPONSE=None):
"""download all files"""
@@ -1461,14 +1691,22 @@ class CDLIFileFolder(versionedFileFolder
catalog=getattr(self,self.default_catalog)
#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.sort(sortF)
+
+
RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%"all.atf")
RESPONSE.setHeader("Content-Type","application/octet-stream")
-
+ tmp=""
for l in list:
obj=l[1].getObject()
@@ -1477,6 +1715,9 @@ class CDLIFileFolder(versionedFileFolder
#os.write(tf,obj.getLastVersion().data)
if RESPONSE:
RESPONSE.write(obj.getLastVersion().data[0:])
+ self.temp_folder.downloadCounter-=1
+ self._p_changed=1
+ get_transaction().commit()
#os.close(tf)
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)
return True
@@ -1509,17 +1750,7 @@ class CDLIFileFolder(versionedFileFolder
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')
def index_html(self):
"""main"""
ext=self.ZopeFind(self,obj_ids=["index.html"])
@@ -1529,8 +1760,270 @@ class CDLIFileFolder(versionedFileFolder
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','CDLIFileFolderMain')).__of__(self)
return pt()
+
+manage_addCDLIFileFolderForm=DTMLFile('dtml/folderAdd', globals())
+
+
+def manage_addCDLIFileFolder(self, id, title='',
+ createPublic=0,
+ createUserF=0,
+ REQUEST=None):
+ """Add a new Folder object with id *id*.
+
+ If the 'createPublic' and 'createUserF' parameters are set to any true
+ value, an 'index_html' and a 'UserFolder' objects are created respectively
+ in the new folder.
+ """
+ ob=CDLIFileFolder()
+ ob.id=str(id)
+ ob.title=title
+ self._setObject(id, ob)
+ ob=self._getOb(id)
+
+ checkPermission=getSecurityManager().checkPermission
+
+ if createUserF:
+ if not checkPermission('Add User Folders', ob):
+ raise Unauthorized, (
+ 'You are not authorized to add User Folders.'
+ )
+ ob.manage_addUserFolder()
+
+
+ if REQUEST is not None:
+ return self.manage_main(self, REQUEST, update_menu=1)
+
+class CDLIRoot(Folder):
+ """main folder for cdli"""
+
+ 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):
+ "break all locks"
+ ret=[]
+ for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):
+ un=f[1].forceunlock()
+
+ if un and un !="":
+ ret.append((f[0],un))
+
+ return ret
+
+ def getChangesByAuthor(self,author,n=100):
+ """getChangesByAuthor"""
+ zcat=self.CDLIObjectsCatalog
+ res=zcat({'lastEditor':author,
+ 'sort_on':'getTime',
+ 'sort_order':'descending',
+ 'sort_limit':n})[:n ]
+
+ return res
+
+ def getChangesByAuthor_html(self,author,n=100):
+ """html output for changes by author"""
+ tmp={}
+ list=[]
+ for x in self.getChangesByAuthor(author):
+ nr=x.getObject().getVersionNumber()
+ id=x.getObject().aq_parent.getId()
+ #hinzufuegen, wenn Version neuer als die
+ if tmp.get(id,(0,0))[1] < nr:
+ tmp[id]=(x.getObject().aq_parent,nr)
+
+
+ return self.cdli_main.findObjectsFromListWithVersion(list=tmp.values(),author=author)
+
+ def getLastChanges(self,n=100):
+ """get the last n changes"""
+ n=int(n)
+ zcat=self.CDLICatalog
+ return zcat({'sort_on':'getLastChangeDate',
+ 'sort_order':'descending',
+ 'sort_limit':n})[:n ]
+
+
+ def getLastChanges_html(self,n=100):
+ """get the last n changes"""
+ list = [x.getId for x in self.getLastChanges(n)]
+ return self.cdli_main.findObjectsFromList(list=list,display=True)
+
+ def refreshTxt(self,txt="",threadName=None):
+ """txt fuer refresh"""
+
+ return """ 2;url=%s?repeat=%s """%(self.absolute_url()+txt,threadName)
+
+
+ def getResult(self,threadName=None):
+ """result of thread"""
+ try:
+ return self._v_uploadATF[threadName].getResult()
+ except:
+ return "One moment, please"
+
+
+ def checkThreads(self):
+ """check threads"""
+ ret=""
+ for thread in threading.enumerate():
+ ret+="%s (%s): %s
"%(repr(thread),thread.getName(),thread.isAlive())
+
+ return ret
+
+
+
+ def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
+ """standard ausgabe"""
+ #self._v_uploadATF.returnValue=None
+
+ threadName=repeat
+ if not threadName or threadName=="":
+ tmpVar=False
+
+ thread=uploadATFThread()
+ threadName=thread.getName()[0:]
+ if (not hasattr(self,'_v_uploadATF')):
+ self._v_uploadATF={}
+
+ self._v_uploadATF[threadName]=thread
+ #self._xmltrans.start()
+ #thread=Thread(target=self._v_uploadATF)
+
+ self._v_uploadATF[threadName].set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
+ #thread.start()
+ self._v_uploadATF[threadName].start()
+
+
+ self.threadName=self._v_uploadATF[threadName].getName()[0:]
+ wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
+
+ if wait_template:
+ return wait_template[0][1]()
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
+ return pt(txt='/uploadATF',threadName=threadName)
+ #_v_xmltrans.run()
+
+ else:
+ #recover thread, if lost
+ if (not hasattr(self,'_v_uploadATF')):
+ self._v_uploadATF={}
+ if not self._v_uploadATF.get(threadName,None):
+ for thread in threading.enumerate():
+ if threadName == thread.getName():
+ self._v_uploadATF[threadName]=thread
+
+ if not self._v_uploadATF[threadName].returnValue:
+
+
+ wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
+ if wait_template:
+ return wait_template[0][1]()
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
+
+ return pt(txt='/uploadATF',threadName=threadName)
+
+ else:
+# tmp={}
+# for key in self._v_uploadATF[threadName].returnValue.keys():
+# t=self._v_uploadATF[threadName].returnValue[key]
+# if type(t) is ListType:
+# tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:]
+# else:
+# tmp[key]=self._v_uploadATF[threadName].returnValue[key]
+# repr(tmp[key]),repr(key)
+#
+# #
+ #tmp=self.cdli_main.tmpStore2[threadName]
+ tmp=self._v_uploadATF[threadName].returnValue
+
+ #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']]
+ self.REQUEST.SESSION['errors']=tmp['errors']
+ self.REQUEST.SESSION['newPs']=tmp['newPs']
+ self.REQUEST.SESSION['tmpdir']=tmp['dir']
+ #del(self.cdli_main.tmpStore2[threadName])
+
+
+ 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'],
+ basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])
+
+ def redoUpload(self,threadName):
+ """redo the upload"""
+ tmp=self.cdli_main.tmpStore2[threadName]
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
+ 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'])
+
+ def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None):
+ """nowupload the files"""
+
+
+
+ threadName=repeat
+ if not threadName or threadName=="":
+ thread=uploadATFfinallyThread()
+ threadName=thread.getName()[0:]
+
+ if (not hasattr(self,'_v_uploadATF')):
+ self._v_uploadATF={}
+
+
+ self._v_uploadATF[threadName]=thread
+
+
+ self._v_uploadATF[threadName].set(procedure,comment=comment,basketname=basketname,unlock=unlock,SESSION=self.REQUEST.SESSION,username=self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
+
+ self._v_uploadATF[threadName].start()
+
+
+
+ wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
+
+ if wait_template:
+ return wait_template[0][1]()
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
+
+ return pt(txt='/uploadATFfinally',threadName=threadName)
+ #_v_xmltrans.run()
+
+ else:
+ #recover thread, if lost
+ if not hasattr(self,'_v_uploadATF'):
+ self._v_uploadATF={}
+ if not self._v_uploadATF.get(threadName,None):
+ for thread in threading.enumerate():
+ if threadName == thread.getName():
+ self._v_uploadATF[threadName]=thread
+
+ if self._v_uploadATF.get(threadName,None) and (self._v_uploadATF[threadName] is not None) and (not self._v_uploadATF[threadName].end) :
+
+ wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
+ if wait_template:
+ return wait_template[0][1]()
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
+ return pt(txt='/uploadATFfinally',threadName=threadName)
+ else:
+
+ 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):
"""import files"""
+ root=self.cdli_main
if not files:
files=os.listdir(folderName)
@@ -1538,14 +2031,14 @@ class CDLIFileFolder(versionedFileFolder
for f in files:
folder=f[0:3]
f2=f[0:5]
- obj=self.ZopeFind(self,obj_ids=[folder])
+ obj=self.ZopeFind(root,obj_ids=[folder])
if ext:
- ext.result+="Adding: %s
"%f
+ ext.result+="adding: %s
"%f
if not obj:
- manage_addCDLIFileFolder(self,folder,folder)
- fobj=getattr(self,folder)
-
+ manage_addCDLIFileFolder(root,folder,folder)
+ fobj=getattr(root,folder)
+ #get_transaction().commit()
else:
fobj=obj[0][1]
@@ -1571,11 +2064,12 @@ class CDLIFileFolder(versionedFileFolder
#self.CDLICatalog.manage_catalogObject(self.REQUEST, self.REQUEST.RESPONSE, 'CDLICatalog', urlparse.urlparse(ob.absolute_url())[1])
return "ok"
-
-manage_addCDLIFileFolderForm=DTMLFile('dtml/folderAdd', globals())
+
+
+manage_addCDLIRootForm=DTMLFile('dtml/rootAdd', globals())
-def manage_addCDLIFileFolder(self, id, title='',
+def manage_addCDLIRoot(self, id, title='',
createPublic=0,
createUserF=0,
REQUEST=None):
@@ -1585,7 +2079,7 @@ def manage_addCDLIFileFolder(self, id, t
value, an 'index_html' and a 'UserFolder' objects are created respectively
in the new folder.
"""
- ob=CDLIFileFolder()
+ ob=CDLIRoot()
ob.id=str(id)
ob.title=title
self._setObject(id, ob)
@@ -1602,5 +2096,5 @@ def manage_addCDLIFileFolder(self, id, t
if REQUEST is not None:
- return self.manage_main(self, REQUEST, update_menu=1)
-
+ return self.manage_main(self, REQUEST, update_menu=1)
+