--- cdli/cdli_files.py 2006/06/15 20:08:44 1.24
+++ cdli/cdli_files.py 2006/06/17 14:53:35 1.26
@@ -18,7 +18,7 @@ from ZPublisher.HTTPRequest import HTTPR
from ZPublisher.HTTPResponse import HTTPResponse
from ZPublisher.BaseRequest import RequestContainer
import threading
-
+
class uploadATFfinallyThread(Thread):
@@ -58,7 +58,7 @@ class uploadATFfinallyThread(Thread):
req = HTTPRequest(None, env, resp)
return app.__of__(RequestContainer(REQUEST = req))
-
+
def run(self):
"""run"""
@@ -233,7 +233,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)
@@ -250,7 +251,7 @@ class uploadATFThread(Thread):
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
@@ -269,12 +270,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
@@ -1052,13 +1054,33 @@ def manage_addCDLIBasketVersion(self,use
else:
return ob
-class CDLIFileObject(versionedFileObject):
+class CDLIFileObject(versionedFileObject,CatalogAware):
"""CDLI file object"""
meta_type="CDLI File Object"
+ default_catalog='CDLIObjectsCatalog'
security=ClassSecurityInfo()
+
+ security.declarePublic('makeThisVersionCurrent')
+
+ 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):
+ """copy this version to current"""
+ parent=self.aq_parent
+
+
+ newversion=parent.manage_addCDLIFileObject('',comment,author)
+ newversion.data=self.data[0:]
+ return True
+
+ security.declarePublic('view')
+
def view(self):
"""view file"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)
@@ -1118,7 +1140,18 @@ class CDLIFile(versionedFile,CatalogAwar
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 isContainedInBaskets(self,context=None):
"""check is this file is part of any basket
@@ -1230,11 +1263,19 @@ def manage_addCDLIFile(self,id,title,loc
-def splitatf(fh,dir=None):
+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:
ret=line.replace('#atf basket ','')
@@ -1265,6 +1306,8 @@ 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
+
tmpStore2={}
def setTemp(self,name,value):
"""set tmp"""
@@ -1308,9 +1351,24 @@ class CDLIFileFolder(versionedFileFolder
-
-
- def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
+ def findObjectsFromListWithVersion(self,list):
+ """find objects from a list with versions
+ @param list: list of tuples (cdliFile,version)
+ """
+
+
+
+ #self.REQUEST.SESSION['fileIds']=list#store fieldIds in session for further usage
+ #self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds']
+
+
+ pt=getattr(self,'filelistVersioned.html')
+
+ return pt(search=list)
+
+
+
+ def findObjectsFromList(self,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
"""findObjectsFromList (, TAB oder LINE separated)"""
@@ -1347,9 +1405,18 @@ class CDLIFileFolder(versionedFileFolder
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))
@@ -1471,6 +1538,55 @@ class CDLIRoot(Folder):
meta_type="CDLIRoot"
+ def forceunlock(self):
+ "break all locks"
+ ret=[]
+ for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):
+ un=f[1].forceunlock()
+ print un
+ if un and un !="":
+ ret.append((f[0],un))
+ print ret
+ 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())
+
+ 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"""