--- cdli/cdli_files.py 2006/06/13 20:59:56 1.21
+++ cdli/cdli_files.py 2009/09/01 08:36:04 1.114
@@ -1,11 +1,11 @@
-"""CDLI extensions of the filearchive"""
-from Products.versionedFile.versionedFile import *
+"""CDLI extensions of the filearchive"""
+from Products.versionedFile.extVersionedFile import *
from Products.ZCatalog.CatalogPathAwareness import CatalogAware
-from tempfile import mkstemp,mkdtemp
import os.path
import os
-from types import *
import urlparse
+import urllib
+import cgi
from OFS.OrderedFolder import OrderedFolder
from OFS.SimpleItem import SimpleItem
import time
@@ -13,1068 +13,116 @@ 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 uploadATFfinallyThread(Thread):
- """class for adding uploaded filed (temporarily stored in the staging area at /tmp"""
-
- def __init__(self):
- """init for uploadATFfinallyThread"""
- self.continueVar=True
- self.returnValue=None
- self.end=False
- Thread.__init__(self)
-
- def set(self,procedure,comment="",basketname='',unlock=None,SESSION=None,username=None,serverport="8080"):
- """set start values for the thread"""
- self.procedure=procedure
- self.comment=comment
- self.basketname=basketname
- self.unlock=unlock
- self.SESSION=SESSION
- self.username=username
- self.serverport=serverport
-
- def __call__(self):
- """call of the thread (equals run)"""
- self.run()
- return True
-
- def getContext(self, app,serverport="8080"):
- """get the context within the ZODB"""
-
- resp = HTTPResponse(stdout=None)
- env = {
- 'SERVER_NAME':'localhost',
- 'SERVER_PORT':serverport,
- 'REQUEST_METHOD':'GET'
- }
- req = HTTPRequest(None, env, resp)
- return app.__of__(RequestContainer(REQUEST = req))
-
-
- def run(self):
- """run"""
-
- self.result=""
- #find context within ZODB
- from Zope import DB
- conn = DB.open()
- root = conn.root()
- app = root['Application']
- ctx = self.getContext(app,serverport=self.serverport)
-
- #add the files
- self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username)
- #commit the transactions
- get_transaction().commit()
- conn.close()
- #set flag for end of this method
- self.end=True
- return True
-
- def getResult(self):
- """method for accessing result"""
-
- return self.result
-
- def uploadATFfinallyThread(self,ctx,procedure,comment="",basketname='',unlock=None,RESPONSE=None,SESSION=None,username=None):
- """upload the files"""
- #TODO: make this configurable, at the moment, rootFolder for cdli has to be cdliRoot
- ctx2=ctx.cdliRoot
-
- self.result+="Start processing
"
-
- #shall I only upload the changed files?
- if procedure=="uploadchanged":
-
- uploadFns=SESSION.get('changed',[])+SESSION.get('newPs',[])
-
- #or all
- elif procedure=="uploadAll":
- uploadFns=[]
- for x in os.listdir(SESSION['tmpdir']):
- if not x in SESSION['errors']:
- uploadFns.append(x)
-
- #or maybe nothing
- elif procedure=="noupload":
- return True
- else:
- uploadFns=[]
-
- #do first the changed files
- for fn in uploadFns:
- founds=ctx2.CDLICatalog.search({'title':fn})
- if len(founds)>0:
- SESSION['author']=str(username)
- self.result+="Changing : %s"%fn
- founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=file(os.path.join(SESSION['tmpdir'],fn)))
-
-
- #now add the new files
- newPs=SESSION['newPs']
- if len(newPs)>0:
- 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)
-
-
-
- #unlock locked files?
- if unlock:
- self.result+="Unlock files
"
- unlockFns=[]
- for x in os.listdir(SESSION['tmpdir']):
- if not x in SESSION['errors']:
- unlockFns.append(x)
-
- for fn in unlockFns:
- founds=ctx2.CDLICatalog.search({'title':fn})
- if len(founds)>0:
- SESSION['author']=str(username)
-
- founds[0].getObject().lockedBy=""
-
- #if a basketname is give, add files to the basket
- if not (basketname ==''):
- self.result+="Add basket
"
- basketId=ctx2.basketContainer.getBasketIdfromName(basketname)
-
- if not basketId: # create new basket
- ob=ctx2.basketContainer.addBasket(basketname)
- basketId=ob.getId()
- basket=getattr(ctx2.basketContainer,str(basketId))
- ids=os.listdir(SESSION['tmpdir'])
- basket.addObjects(ids,deleteOld=True,username=str(username))
-
- if RESPONSE is not None:
- RESPONSE.redirect(self.aq_parent.absolute_url())
-
-
-
- return True
-
-class uploadATFThread(Thread):
- """class for checking the files befor uploading"""
-
- def __init__(self):
- """initialise"""
-
- self.continueVar=True
- self.returnValue=None
-
- Thread.__init__(self)
-
-
- def set(self,upload,basketId,username,serverport="8080"):
- """set start values for the thread"""
- self.result=""
- self.upload=upload
- self.basketId=basketId
- self.username=username
- self.serverport=serverport
-
- def __call__(self):
- """call method """
- self.run()
- return True
-
- def getContext(self, app,serverport="8080"):
- """get the context within the ZODB"""
- resp = HTTPResponse(stdout=None)
- env = {
- 'SERVER_NAME':'localhost',
- 'SERVER_PORT':serverport,
- 'REQUEST_METHOD':'GET'
- }
- req = HTTPRequest(None, env, resp)
- return app.__of__(RequestContainer(REQUEST = req))
-
- def run(self):
-
- self.result=""
- #find context within ZODB
- from Zope import DB
- conn = DB.open()
- root = conn.root()
- app = root['Application']
- ctx = self.getContext(app,serverport=self.serverport)
- self.uploadATFThread(ctx,self.upload,self.basketId)
-
- while self.continueVar:
- pass
- get_transaction().abort()
- conn.close()
- print "done"
-
- def getResult(self):
- """method for accessing result"""
- return self.result
-
- def uploadATFThread(self,ctx,upload,basketId=0):
- """upload an atf file"""
- #TODO: add comments
- #TODO: finish uploadATF
- self.result="I am loading your file...
"
- #make sure that id is a string and not an integer
- basketId=str(basketId)
-
- #TODO: make this configurable, at the moment, rootFolder for cdli has to be cdliRoot
- ctx2=ctx.cdliRoot
-
- #get temporary file for staging the downloaded and splitted files
- dir=mkdtemp()
-
-
- changed=[] # changed files
- errors=[] # files with errors
- newPs=[] # new p filed
- psNotInCatalog=[] # files not in the catalog
-
- #split the uploadedd atf file
- basketNameFromFile, numberOfFiles=splitatf(upload,dir)
-
- #find basketId if not set
-
- #get active abaket
- if basketId == '0':
- basketObj=ctx2.basketContainer.getActiveBasket()
- if basketObj:
- basketId=basketObj.getId()
-
- #if there is no active baske and no basketid given, id is empty, else get besketname and length
- if basketId == '0':
- basketNameFromId=""
- basketLen=0
- else:
- basketNameFromId=getattr(ctx2.basketContainer,basketId).title
- basketLen=getattr(ctx2.basketContainer,basketId).getLastVersion().numberOfItems()
-
-
- self.result+="I got the files
I am checking now the files
"
-
- #start to check the files
- for fn in os.listdir(dir):
-
- self.result+="check:%s
"%fn
-
- # check if file is in the catalog
- #TODO: checkCatalog is not implemented yet
- if ctx2.cdli_main.checkCatalog(fn):
- psNotInCatalog.append(fn)
-
- #check if p-file already at the server
- 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
-
- #ready, set the returnValues
- self.result+="Done
"
-
- self.returnValue={}
- self.returnValue['changed']=changed
- self.returnValue['errors']=errors
- self.returnValue['newPs']=newPs
- self.returnValue['tmpdir']=dir
- self.returnValue['basketLen']=basketLen
- self.returnValue['numberOfFiles']=numberOfFiles
- self.returnValue['basketNameFromId']=basketNameFromId
- self.returnValue['basketNameFromFile']=basketNameFromFile
- self.returnValue['basketId']=basketId
- self.returnValue['dir']=dir
-
- #ctx2.cdli_main.setTemp('v_uploadATF_returnValue',True)
-
-
-class Basket_old(Folder):
- """shopping basket - alte fassung """
-
- meta_type="Basket"
- _v_stack={}
-
- def getObjUrl(self,objId):
- """getUrl"""
- founds=self.CDLICatalog.search({'title':objId})
- if len(founds)>0:
- return founds[0].getObject().absolute_url()
-
- else: #assume version number
- splitted=objId.split("_")
- founds=self.CDLICatalog.search({'title':splitted[1]})
- return founds[0].getObject().absolute_url()+'/'+objId
-
- def storeAllLink(self,results):
- """erzeuge link zum speicher aller results"""
- nr=self.REQUEST['_ZopeId']
-
- if results:
- self._v_stack[nr]=[x.getObject().getId() for x in results]
-
- return self.absolute_url()+"/storeAll?id="+nr
-
- def storeAll(self,id):
- """store all"""
- try:
- results=self._v_stack[id]
- except:
- #TODO: write expired page
- return "expired"
-
- return self.storeInBasketForm(results)
-
- def storeInBasketForm(self,ids):
- """ store an object form"""
-
- if type(ids) is not ListType:
- ids=[ids]
- self.REQUEST.SESSION['ids']=ids[0:]
-
- self.REQUEST.SESSION['BACKLINK']=self.REQUEST['HTTP_REFERER']
-
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','storeBasketObject.zpt')).__of__(self)
- return pt()
-
- def storeInBasket(self,username,ids=None,RESPONSE=None,REQUEST=None):
- """store it"""
-
- if not ids:
- ids=REQUEST.SESSION['ids']
-
- self.REQUEST.SESSION['basketUser']=username
-
- baskets=self.ZopeFind(self,obj_ids=[username])
- if len(baskets)>0:
- basket=baskets[0][1]
- else:
- manage_addBasketObject(self,username)
- basket=self._getOb(username)
-
-
- basket.addObjects(ids)
- back=self.REQUEST.SESSION.get('BACKLINK', None)
-
- if RESPONSE:
- RESPONSE.redirect(back)
-
-
-
- def showBasket(self,user=None,set=None,RESPONSE=None):
- """show the basket"""
-
- if user:
- self.REQUEST.SESSION['basketUser']=user
-
- if not user and not set:
- user=self.REQUEST.SESSION.get('basketUser',None)
-
- if not user:
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','orizeBasketUser.zpt')).__of__(self)
- return pt()
- else:
- baskets=self.ZopeFind(self,obj_ids=[user])
-
-
- if len(baskets)>0:
- RESPONSE.redirect(baskets[0][1].absolute_url())
- return True
- else:
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','emptyBasket.zpt')).__of__(self)
- return pt()
-
-
-def manage_addBasket_oldForm(self):
- """add the basket form"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addBasket.zpt')).__of__(self)
- return pt()
-
-def manage_addBasket_old(self,id,title,RESPONSE=None):
- """add the basket"""
- ob=Basket()
-
- ob.id=str(id)
- ob.title=title
- self._setObject(id, ob)
- ob=self._getOb(id)
-
- if RESPONSE is not None:
- RESPONSE.redirect('manage_main')
-
-
-class BasketObject_old(Folder):
- """Basket Object - alte fassung"""
-
- meta_type="basketObject"
- def __init__(self):
- """init basket object"""
- self.contents=[]
-
- def numberOfItems(self):
- """return anzahl der elemente im basket"""
- return len(self.contents)
-
- def addObjects(self,ids):
- """addObjects"""
-
- for id in ids:
- founds=self.CDLICatalog.search({'title':id})
- for found in founds:
- if found.getObject() not in self.contents:
- tm=self.contents[0:]
- tm.append(found.getObject())
- self.contents=tm[0:]
-
- return True
-
- def index_html(self):
- """view the basket"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','basketObject_index_html.zpt')).__of__(self)
- return pt()
-
- def deleteObjects(self,ids,RESPONSE=None):
- """delete objects"""
- list = self.contents[0:]
- for content in list:
-
- if content.getId() in ids:
- self.contents.remove(content)
-
-
- if RESPONSE:
- RESPONSE.redirect(self.absolute_url())
-
-
- def unlockTest(self):
- """unlock all files of the testuser for debuggin"""
- for object in self.contents:
-
- if str(object.lockedBy)=="test":
- object.lockedBy=""
-
- def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None):
- """download all selected files in one file"""
-
- ret=""
- lockedObjects={}
-
-
- if lock:
-
- if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
-
- return "please login first"
-
- #check if a locked object exist in the basket.
- lockedObjects={}
- for object in self.contents:
-
- if not object.lockedBy=="":
- lockedObjects[object.title]=repr(object.lockedBy)
-
-
- keys=lockedObjects.keys()
-
-
- 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)
- return pt()
-
- elif not procedure: #keine fails gesperrt dann alle donwloaden
- procedure="downloadAll"
-
-
- for object in self.contents:
-
- if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']):
- ret+=object.getLastVersion().data
-
- if lock and object.lockedBy=='':
- object.lockedBy=self.REQUEST['AUTHENTICATED_USER']
-
-
- self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="basket_%s.atf" """%self.getId())
- self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
- length=len(ret)
- self.REQUEST.RESPONSE.setHeader("Content-Length",length)
- self.REQUEST.RESPONSE.write(ret)
-
-
-def manage_addBasket_oldObjectForm(self):
- """add form"""
- pass
+import logging
+import transaction
+import copy
+import codecs
+import sys
+from BTrees.IOBTree import IOBTree
+from BTrees.OOBTree import OOBTree
+import cdliSplitter
+from sets import Set
+import md5
+from DownloadBasket import DownloadBasketFinallyThread
+from types import *
+import pickle
+import tempfile
+
+from cdli_helpers import *
-def manage_addBasket_oldObject(self,id,title='',RESPONSE=None):
- """add"""
-
- ob=BasketObject()
-
- ob.id=str(id)
- ob.title=title
- self._setObject(id, ob)
- ob=self._getOb(id)
+class CDLIFileObject(CatalogAware,extVersionedFileObject):
+ """CDLI file object"""
- if RESPONSE is not None:
- RESPONSE.redirect('manage_main')
-
-
-class CDLIBasketContainer(OrderedFolder):
- """contains the baskets"""
+ meta_type="CDLI File Object"
+ default_catalog='CDLIObjectsCatalog'
-
security=ClassSecurityInfo()
- meta_type="CDLIBasketContainer"
- def deleteBaskets(self,ids=None):
- """delete baskets, i.e. move them into trash folder"""
-
-
- found=self.ZopeFind(self,obj_ids=['trash'])
-
- if len(found)<1:
- manage_addFolder(self, 'trash')
- trash=self._getOb('trash')
- else:
- trash=found[0][1]
-
- if type(ids) is not ListType:
- ids=[ids]
- cut=self.manage_cutObjects(ids)
- trash.manage_pasteObjects(cut)
-
- def manageBaskets(self,ids,submit,REQUEST=None,RESPONSE=None):
- """manage baskets, delete or copy"""
- if submit=="delete":
- self.deleteBaskets(ids)
-
-
-
- if RESPONSE:
- RESPONSE.redirect(self.absolute_url())
- def getBasketIdfromName(self,basketname):
- """get id from name"""
-
- for basket in self.ZopeFind(self,obj_metatypes=["CDLIBasket"]):
- if basket[1].title==basketname:
- return basket[0]
- else:
- None
-
- security.declareProtected('manage','uploadBasket_html')
-
- def uploadBasket_html(self,basketId='0'):
- """upload an atf file, html form"""
-
-
- basketId=str(basketId)
- if not basketId=='0':
- basketName=getattr(self.basketContainer,basketId).title
- else:
- basketName=""
-
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadBasket_html.zpt')).__of__(self)
- return pt(basketId=basketId,basketName=basketName)
-
-
-
- def index_html(self):
- """stanadard ansicht"""
-
-
-
- ext=self.ZopeFind(self,obj_ids=["index.html"])
- if ext:
- return ext[0][1]()
-
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketContainerMain')).__of__(self)
- return pt()
-
- def getStorageFolderRoot(self):
- """root des storage folders"""
- return self.cdli_main
-
- def __init__(self,id,title):
- """ init basket container"""
- self.id=id
- self.title=title
-
-
- def getBaskets(self,sortField='title'):
- """get all baskets files"""
-
- def sortName(x,y):
- return cmp(x[1].title.lower(),y[1].title.lower())
-
- def sortDate(x,y):
- return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime())
-
-
- def sortComment(x,y):
-
-
-
- try:
- xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower()
- except:
- xc='ZZZZZZZZZZZZZ'.lower()
- try:
- yc=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower()
- except:
- yc='ZZZZZZZZZZZZZ'.lower()
-
-
- if (xc=='') or (xc=='ZZZZZZZZZZZZZ'.lower()):
-
- try:
- xc=x[1].getLastVersion().getComment().lower()
- except:
- xc='ZZZZZZZZZZZZZ'.lower()
-
- if (yc=='') or (yc=='ZZZZZZZZZZZZZ'.lower()):
- try:
- yc=y[1].getLastVersion().getComment().lower()
- except:
- yc='ZZZZZZZZZZZZZ'.lower()
-
-
- return cmp(xc,yc)
-
- def sortAuthor(x,y):
-
- return cmp(x[1].getLastVersion().getUser().lower(),y[1].getLastVersion().getUser().lower())
-
- baskets=self.ZopeFind(self,obj_metatypes=['CDLIBasket'])
-
-
- if sortField=='title':
- baskets.sort(sortName)
- elif sortField=='date':
- baskets.sort(sortDate)
- elif sortField=='author':
- baskets.sort(sortAuthor)
- elif sortField=='comment':
- baskets.sort(sortComment)
+ security.declareProtected('manage','index_html')
- return baskets
+ security.declarePublic('view')
+ view = PageTemplateFile('zpt/viewCDLIFile.zpt', globals())
+ security.declarePublic('editATF')
+ editATF = PageTemplateFile('zpt/editATFFile.zpt', globals())
-
- def getNewId(self):
- """createIds"""
- last=getattr(self,'last',0)
- last +=1
- while len(self.ZopeFind(self,obj_ids=[str(last)]))>0:
- last+=1
-
- self.last=last
- return last
-
- def setActiveBasket(self,basketId,REQUEST=None):
- """store active basketId in a cookie"""
- self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/")
-
- if REQUEST:
- REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+REQUEST['QUERY_STRING'])
-
- def getActiveBasket(self):
- """get active basket from cookie"""
-
- id= self.REQUEST.cookies.get('CDLIActiveBasket',None)
- if id:
- obj=getattr(self,str(id),None)
- else:
- obj=None
- return obj
-
- def getActualUserName(self):
- """get name of the actualuser"""
- return str(self.REQUEST['AUTHENTICATED_USER'])
-
-
- def addBasket(self,newBasketName):
- """add a new basket"""
-
- ob=manage_addCDLIBasket(self,newBasketName)
- return ob
-
- def storeInBasket(self,submit,ids=None,newBasketName=None,fromFileList=None,RESPONSE=None,REQUEST=None):
- """store it"""
- if not ids:
- ids=self.REQUEST.SESSION['fileIds']
-
- if type(ids) is not ListType:
- ids=[ids]
-
- if (submit.lower()=="store in new basket") or (submit.lower()=="new basket"):
- basketRet=self.addBasket(newBasketName)
- self.setActiveBasket(basketRet.getId())
- basket=getattr(self,basketRet.getId())
- elif (submit.lower()=="store in active basket") or (submit.lower()=="active basket"):
- basket=self.getActiveBasket()
-
- added=basket.addObjects(ids)
- back=self.REQUEST['HTTP_REFERER'].split("?")[0]+"?basketName="+basket.title+"&numberOfObjects="+str(added)
-
-
- if fromFileList:
-
- return self.cdli_main.findObjectsFromList(list=self.REQUEST.SESSION['fileIds'],basketName=basket.title,numberOfObjects=added)
+ def PrincipiaSearchSource(self):
+ """Return cataloguable key for ourselves."""
+ return str(self)
- if RESPONSE:
-
- RESPONSE.redirect(back)
-
- return True
-
-def manage_addCDLIBasketContainerForm(self):
- """add the CDLIBasketContainer form"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addCDLIBasketContainer.zpt')).__of__(self)
- return pt()
-
-def manage_addCDLIBasketContainer(self,id,title,RESPONSE=None):
- """add the basket"""
- ob=CDLIBasketContainer(id,title)
-
- self._setObject(id, ob)
-
- if RESPONSE is not None:
- RESPONSE.redirect('manage_main')
-
-class CDLIBasket(Folder,CatalogAware):
- """basket"""
-
- meta_type="CDLIBasket"
- default_catalog="CDLIBasketCatalog"
-
- def getFile(self,obj):
- return obj[1]
-
- def getFileLastVersion(self,obj):
- return obj[0]
-
- def getFileNamesInLastVersion(self):
- """get content of the last version as list"""
-
- 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 and founds[0].getObject().aq_parent.getId()==".trash":
- return False, -1
-
- if actualNo==storedNo:
- return True , 0
- else:
- return False, actualNo
-
- 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','BasketHistory')).__of__(self)
- return pt()
-
- def getStorageFolderRoot(self):
- """root des storage folders"""
- return self.aq_parent.cdli_main
-
- def __init__(self,id,title,shortDescription="",comment=""):
- """init a CDLIBasket"""
-
- self.id=id
- self.title=title
- self.shortDescription=shortDescription
- self.comment=comment
-
-
-
- def getLastVersion(self):
- """hole letzte version"""
- ids=[int(x[0]) for x in self.ZopeFind(self,obj_metatypes=["CDLIBasketVersion"])]
- ids.sort()
- if len(ids)==0:
- return None
- else:
- ob=getattr(self,str(ids[-1]))
- return ob
-
- def getVersions(self):
- """get versions"""
- versions=self.ZopeFind(self,obj_metatypes=["CDLIBasketVersion"])
- return versions
-
-
-
- def addObjects(self,ids,deleteOld=None,username=None):
- """generate a new version of the basket with objects added"""
+ def setAuthor(self, author):
+ """change the author"""
+ self.author = author
- lastVersion=self.getLastVersion()
+ def makeThisVersionCurrent_html(self):
+ """form for mthis version current"""
- if lastVersion is None:
- oldContent=[]
- else:
- oldContent=lastVersion.basketContent[0:]
-
- if deleteOld:
- oldContent=[]
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self)
+ return pt()
- newContent=[]
- added=0
- for id in ids:
- founds=self.CDLICatalog.search({'title':id})
+ security.declarePublic('makeThisVersionCurrent')
+ def makeThisVersionCurrent(self,comment,author,RESPONSE=None):
+ """copy this version to current"""
+ parent=self.aq_parent
+ parent.manage_addVersionedFileObject(id=None,vC=comment,author=author,file=self.getData(),RESPONSE=RESPONSE)
+ #newversion=parent.manage_addCDLIFileObject('',comment,author)
+ #newversion.manage_upload(self.getData())
+
+ #if RESPONSE is not None:
+ # RESPONSE.redirect(self.aq_parent.absolute_url()+'/history')
- 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()))
- added+=1
-
- content=oldContent+newContent
- if not username:
- user=self.getActualUserName()
- else:
- user = username
-
- ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content)
-
- return added
+ return True
- def deleteObjects(self,ids,RESPONSE=None,REQUEST=None):
- """delete objects"""
-
- if type(ids) is not ListType:
- ids=[ids]
-
- lastVersion=self.getLastVersion()
- oldContent=lastVersion.basketContent[0:]
- newContent=[]
- for obj in oldContent:
- if obj[1].getId() not in ids:
- newContent.append(obj)
-
-
- user=self.getActualUserName()
-
- ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent)
-
- if RESPONSE:
- obj=self._getOb(ob.getId())
- RESPONSE.redirect(obj.absolute_url())
+ def getFormattedData(self):
+ """fromat text"""
+ data=self.getData()
+# return re.sub("\s\#lem"," #lem",data) #remove return vor #lem
+ return re.sub("#lem"," #lem",data) #remove return vor #lem
-def manage_addCDLIBasketForm(self):
- """add the CDLIBasketContainer form"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addCDLIBasket.zpt')).__of__(self)
- return pt()
-
-def manage_addCDLIBasket(self,title,shortDescription="",comment="",RESPONSE=None):
- """add the basket"""
-
- id=str(self.getNewId())
-
- ob=CDLIBasket(id,title,shortDescription,comment)
-
- self._setObject(id, ob)
-
- if RESPONSE is not None:
- RESPONSE.redirect('manage_main')
- else:
- return ob
-
-class CDLIBasketVersion(SimpleItem):
- """version of a basket"""
- meta_type="CDLIBasketVersion"
-
- def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None):
- """download all selected files in one file"""
-
- ret=""
- lockedObjects={}
-
-
- if lock:
-
- if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
-
- return "please login first"
-
- #check if a locked object exist in the basket.
- lockedObjects={}
- for object in self.basketContent:
-
- if not object[1].lockedBy=="":
- lockedObjects[object[1].title]=repr(object[1].lockedBy)
-
-
- keys=lockedObjects.keys()
-
-
- 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)
- return pt()
-
- elif not procedure: #keine fails gesperrt dann alle donwloaden
- procedure="downloadAll"
-
-
- for object in self.basketContent:
-
- if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']):
- ret+=object[0].data
+ security.declarePublic('getPNumber')
+ def getPNumber(self):
+ """get the pnumber"""
+ try:
+ txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.getData()[0:])
+ except:
+ txt=self.getData()[0:]
- if lock and object[1].lockedBy=='':
- object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']
+ return "ERROR"
+ try:
+ return "P"+txt.group(1)
+ except:
+ return "ERROR"
- basket_name=self.aq_parent.title+"_V"+self.getId()
-
- #write basketname to header of atf file
- ret="#atf basket %s\n"%basket_name+ret
-
- 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)
-
-
- def numberOfItems(self):
- """return anzahl der elemente im basket"""
- return len(self.basketContent)
-
- def getTime(self):
- """getTime"""
- #return self.bobobase_modification_time().ISO()
-
- if hasattr(self,'time'):
- return time.strftime("%Y-%m-%d %H:%M:%S",self.time)
- elif hasattr(self,'timefixed'):
- return self.timefixed
- else:
- setattr(self,'timefixed',self.bobobase_modification_time().ISO())
- return self.bobobase_modification_time().ISO()
-
- def getContent(self):
- """get Basket Content"""
- return self.basketContent
-
-
- def __init__(self,id,user,comment="",basketContent=[]):
- """ init a basket version"""
- self.id=id
- self.coment=comment
- self.basketContent=basketContent[0:]
- self.user=user
- self.time=time.localtime()
-
- def getUser(self):
- """get user"""
- return self.user
-
- def getComment(self):
- """get Comment"""
- return self.comment
-
- def index_html(self):
- """view the basket"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self)
- return pt()
-
- def getObjUrl(self,result):
- """getUrl of the version of the object"""
- objId=result[1].getTitle()
- founds=self.CDLICatalog.search({'title':objId})
- if len(founds)>0:
- return founds[0].getObject().getLastVersion().absolute_url()
-
- else: #assume version number
- splitted=objId.split("_")
- founds=self.CDLICatalog.search({'title':splitted[1]})
- return founds[0].getObject().getLastVersion().absolute_url()+'/'+objId
-
-def manage_addCDLIBasketVersion(self,user,comment="",basketContent=[],RESPONSE=None):
- """add a version"""
-
- #check for already existing versions
-
- lastVersion=self.getLastVersion()
- if lastVersion is None:
- newId=str(1)
- else:
- newId=str(int(lastVersion.getId())+1)
-
- ob=CDLIBasketVersion(newId,user,comment,basketContent)
-
- self._setObject(newId, ob)
-
- if RESPONSE is not None:
- RESPONSE.redirect('manage_main')
- else:
- return ob
-
-class CDLIFileObject(versionedFileObject):
- """CDLI file object"""
-
- meta_type="CDLI File Object"
-
- security=ClassSecurityInfo()
-
- def view(self):
- """view file"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)
- return pt()
-
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:
return txt.group(2)
except:
return "ERROR"
+
manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1')
-def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='',
- REQUEST=None):
+def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',versionNumber=0,
+ precondition='', content_type='',
+ from_tmp=False,REQUEST=None):
"""Add a new File object.
-
Creates a new File object 'id' with the contents of 'file'"""
-
+
id=str(id)
title=str(title)
content_type=str(content_type)
@@ -1085,29 +133,80 @@ def manage_addCDLIFileObject(self,id,vC=
self=self.this()
# First, we create the file without data:
- self._setObject(id, CDLIFileObject(id,title,'',content_type, precondition))
- self._getOb(id).versionComment=str(vC)
- self._getOb(id).time=time.localtime()
-
- setattr(self._getOb(id),'author',author)
+ self._setObject(id, CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=vC,time=time.localtime(),author=author))
+ fob = self._getOb(id)
# 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:
- self._getOb(id).manage_upload(file)
+
+ if file and not from_tmp:
+ fob.manage_upload(file)
+ elif file and from_tmp:
+ fob.manage_file_upload(file) # manage_upload_from_tmp doesn't exist in ExtFile2
+ # fob.manage_upload_from_tmp(file) # manage_upload_from_tmp doesn't exist in ExtFile2
if content_type:
- self._getOb(id).content_type=content_type
+ fob.content_type=content_type
+
+ #logging.debug("manage_add: lastversion=%s"%self.getData())
+ logging.debug("reindex1: %s in %s"%(repr(self),repr(self.default_catalog)))
+ self.reindex_object()
+ #logging.debug("manage_add: fob_data=%s"%fob.getData())
+ logging.debug("reindex2: %s in %s"%(repr(fob), repr(fob.default_catalog)))
+ fob.index_object()
+ self.CDLIRoot.updateOrAddToFileBTree(ob)
if REQUEST is not None:
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main')
-class CDLIFile(versionedFile,CatalogAware):
+
+class CDLIFile(extVersionedFile,CatalogAware):
"""CDLI file"""
+ security=ClassSecurityInfo()
meta_type="CDLI file"
+ content_meta_type = ["CDLI File Object"]
+
default_catalog='CDLICatalog'
+ security.declareProtected('manage','index_html')
+ def getLastVersionData(self):
+ """get last version data"""
+ return self.getData()
+
+ def getLastVersionFormattedData(self):
+ """get last version data"""
+ return self.getContentObject().getFormattedData()
+
+ def getTextId(self):
+ """returns P-number of text"""
+ # assuming that its the beginning of the title
+ return self.title[:7]
+
+ #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
@@ -1129,6 +228,12 @@ class CDLIFile(versionedFile,CatalogAwar
#return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})]
+ def _newContentObject(self, id, title='', versionNumber=0, versionComment=None, time=None, author=None):
+ """factory for content objects. to be overridden in derived classes."""
+ logging.debug("_newContentObject(CDLI)")
+ return CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author)
+
+
def addCDLIFileObjectForm(self):
"""add a new version"""
@@ -1140,57 +245,44 @@ 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,
+ from_tmp=False,RESPONSE=None):
"""add"""
+
try: #TODO: der ganze vC unsinn muss ueberarbeitet werden
vC=self.REQUEST['vC']
except:
pass
-
- if changeName=="yes":
- filename=file.filename
- self.title=filename[max(filename.rfind('/'),
- filename.rfind('\\'),
- filename.rfind(':'),
- )+1:]
-
-
- if not newName=='':
- self.title=newName[0:]
-
-
+ ob = self.addContentObject(id, vC, author, file, title, changeName=changeName, newName=newName, from_tmp=from_tmp,
+ precondition=precondition, content_type=content_type)
+ try:
+ #FIXME: wozu ist das gut?
+ self.REQUEST.SESSION['objID_parent']=self.getId()
+ except:
+ pass
+
+ #self.cdliRoot.updateOrAddToFileBTree(self)# now update the object in the cache
+
-
- positionVersionNum=getattr(self,'positionVersionNum','front')
-
- if positionVersionNum=='front':
- id="V%i"%self.getVersion()+"_"+self.title
- else:
- tmp=os.path.splitext(self.title)
- if len(tmp)>1:
- id=tmp[0]+"_V%i"%self.getVersion()+tmp[1]
- 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()
-
if RESPONSE:
- obj=self.ZopeFind(self,obj_ids=[id])[0][1]
- if obj.getSize()==0:
- self.REQUEST.SESSION['objID']=obj.getId()
+ if ob.getSize()==0:
+ self.REQUEST.SESSION['objID']=ob.getId()
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self)
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]
+ return ob
def manage_addCDLIFileForm(self):
@@ -1201,72 +293,132 @@ 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 checkUTF8(data):
+ """check utf 8"""
+ try:
+ data.encode('utf-8')
+ return True
+ except:
+ return False
+
-
-def splitatf(fh,dir=None):
+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"
+ elif not checkUTF8(data):
+ return False,"not utf-8"
+ else:
+ return True,""
+
+
+def splitatf(fh,dir=None,ext=None):
"""split it"""
ret=None
nf=None
- for line in fh.readlines():
- #check if basket name is in the first line
- if line.find("#atf basket")>=0:
- ret=line.replace('#atf basket ','')
- ret=ret.split('_')[0]
- else:
- if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile
- if nf:
- nf.close() #close last file
-
-
- filename=line[1:].split("=")[0].rstrip()+".atf"
- if dir:
- filename=os.path.join(dir,filename)
- nf=file(filename,"w")
- if nf:
- nf.write(line)
+ i=0
+
+ #ROC: why split \n first and then \r???
+ if (type(fh) is StringType) or (type(fh) is UnicodeType):
+ iter=fh.split("\n")
+ else:
+ iter=fh.readlines()
- nf.close()
- fh.close()
+ for lineTmp in iter:
+ lineTmp=lineTmp.replace(codecs.BOM_UTF8,'') # make sure that all BOM are removed..
+ for line in lineTmp.split("\r"):
+ #logging.info("Deal with: %s"%line)
+ 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: #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:
+ nf.close() #close last file
+
+
+ filename=line[1:].split("=")[0].rstrip()+".atf"
+ if dir:
+ filename=os.path.join(dir,filename)
+ nf=file(filename,"w")
+ logging.info("open %s"%filename)
+ if nf:
+ nf.write(line.replace("\n","")+"\n")
+
+ try:
+ nf.close()
+ except:
+ pass
+
+ if not((type(fh) is StringType) or (type(fh) is UnicodeType)):
+ fh.close()
return ret,len(os.listdir(dir))
-class CDLIFileFolder(versionedFileFolder):
+class CDLIFileFolder(extVersionedFileFolder):
"""CDLI File Folder"""
security=ClassSecurityInfo()
meta_type="CDLI Folder"
- filesMetaType=['CDLI file']
- folderMetaType=['CDLI Folder']
- default_catalog='CDLICatalog'
-
+ file_meta_type=['CDLI file']
+ folder_meta_type=['CDLI Folder']
+
+ file_catalog='CDLICatalog'
+
+ #downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert.
+ tmpStore2={}
+
+ def _newVersionedFile(self, id, title='', lockedBy=None, author=None):
+ """factory for versioned files. to be overridden in derived classes."""
+ logging.debug("_newVersionedFile(CDLI)")
+ return CDLIFile(id, title, lockedBy=lockedBy, author=author)
+
def setTemp(self,name,value):
"""set tmp"""
setattr(self,name,value)
+ deleteFileForm = PageTemplateFile("zpt/doDeleteFile", globals())
- def delete(self,ids):
- """delete this file, i.e. move into a trash folder"""
-
- found=self.ZopeFind(self,obj_ids=['.trash'])
-
- if len(found)<1:
- manage_addCDLIFileFolder(self, '.trash',title="Trash")
- trash=self._getOb('.trash')
- else:
- trash=found[0][1]
-
+ def delete(self,ids,REQUEST=None):
+ """delete these files"""
if type(ids) is not ListType:
ids=[ids]
- cut=self.manage_cutObjects(ids)
- trash.manage_pasteObjects(cut)
+
+ self.manage_delObjects(ids)
+ if REQUEST is not None:
+ return self.index_html()
+
+
def getVersionNumbersFromIds(self,ids):
"""get the numbers of the current versions of documents described by their ids"""
@@ -1276,142 +428,72 @@ class CDLIFileFolder(versionedFileFolder
founds=self.CDLICatalog.search({'title':searchStr})
for found in founds:
- lastVersion=found.getObject().getLastVersion()
+ lastVersion=found.getObject().getContentObject()
ret.append((found.getId,lastVersion))
return ret
+ def getFile(self,fn):
+ """get the content of the file fn"""
+ logging.debug("getFile: %s"%repr(fn))
+ if not self.hasObject(fn):
+ # search deeper
+ founds=getattr(self, self.file_catalog).search({'textid':fn})
+ if founds:
+ obj=founds[0].getObject().getContentObject()
+ else:
+ return ""
+ else:
+ obj = self[fn].getContentObject()
+
+ return obj.getData()[0:]
+
+
def checkCatalog(self,fn):
"""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"""
-
-
-
- threadName=repeat
- if not threadName or threadName=="":
-
-
- self._v_uploadATF=uploadATFfinallyThread()
-
+
+ def findObjectsFromListWithVersion(self,list,author=None):
+ """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']
- 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()
-
+ pt=getattr(self,'filelistVersioned.html')
- 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()
+ return pt(search=list,author=author)
+
+
+ def getAllPNumbers(self):
+ """get a list of all files (resp their p-numbers) stored"""
- 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):
+ ret=[x.getId for x in self.CDLICatalog()]
+
+ return ret
+
+ def expandFile(self,fileId,fileTree):
+ """wildcard in fileID suche alle Treffer"""
+ founds=self.CDLICatalog({'title':fileId})
+ for found in founds:
+ fileTree.add(found.getId)
+ logging.debug("ADDD:"+found.getId)
+
+ def findObjectsFromList(self,enterList=None,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None,REQUEST=None,returnHash=False,hash=None):
"""findObjectsFromList (, TAB oder LINE separated)"""
+ logging.debug("start: findObjectsFromList")
+ #logging.debug("start: findObjectsFromList"+repr(list))
+
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")
@@ -1435,22 +517,83 @@ class CDLIFileFolder(versionedFileFolder
pt=getattr(self,'filelist.html')
return pt(basketName=basketName,numberOfObjects=numberOfObjects)
+
+ result =self.CDLICache.retrieve(hash)
+ if result:
+ logging.debug("give result from storage2")
+ return hash,result
+
if list is not None: # got already a list
+
+ logging.debug(" ----List version")
ret=[]
+ fileTree=Set()
+
for fileId in list:
- if len(fileId.split("."))==1:
+
+ if fileId.find("*")>-1: #check for wildcards
+ self.expandFile(fileId,fileTree)
+
+ elif len(fileId.split("."))==1:
fileId=fileId+".atf"
-
- ret+=self.CDLICatalog({'title':fileId})
+ fileTree.add(fileId)
+ #logging.debug(" -----:"+fileId)
+ #ret+=self.CDLICatalog({'title':fileId})
+ #x =self.getFileObject(fileId)
+ #if x is not None:
+ # ret.append(x)
+
+
+
+ ids = fileTree & self.v_file_ids
+ #self.REQUEST.SESSION['fileIds']=ids#store fieldIds in session for further usage
+ l=makelist(fileTree)[0:]
+ #logging.debug("l-list:"+repr(l))
+ self.REQUEST.SESSION['fileIds']=l#store fieldIds in session for further usage
+ self.REQUEST.SESSION['searchList']=l
+ #self.REQUEST.SESSION['searchList']=['P000001.atf']
+
+
+ hash = md5.new(repr(makelist(fileTree))).hexdigest() # erzeuge hash als identification
+ self.REQUEST.SESSION['hash']=hash
+ #TODO: do I need garbage collection for v_tmpStore ?
+
+ #logging.debug("Hash:"+repr(hash))
+#
+# if hasattr(self.cdliRoot,'v_tmpStore') and self.cdliRoot.v_tmpStore.has_key(hash):
+# logging.debug("asking for storage")
+# res=self.cdliRoot.v_tmpStore[hash]
+# if res:
+# if returnHash == True:
+# return hash,res
+# return res
+
#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
- self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds']
- return ret
+ #ids=[x.getObject().getId() for x in ret]
+ ret=[(self.getFileObject(x),self.getFileObjectLastVersion(x)) for x in ids]
+
+ #self.REQUEST.SESSION['fileIds']=ids#store fieldIds in session for further usage
+ #self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds']
+
+ if display:
+ pt=getattr(self,'filelist.html')
+
+ return pt(search=ids)
+ else:
+ #self.REQUEST.SESSION['hash'] = ret # store in session
+
+ #logging.debug("HHHHHHNEU:"+repr(self.makelist(ids)))
+ #logging.debug("HHHHHHNEU:"+repr(hash))
+ self.CDLICache.store(hash,ret)
+
+ if returnHash == True:
+ return hash,ret
+ return ret
+
+
if start:
RESPONSE.redirect("filelist.html?start:int="+str(start))
-
-
security.declareProtected('Manage','createAllFilesAsSingleFile')
def createAllFilesAsSingleFile(self,RESPONSE=None):
@@ -1459,16 +602,26 @@ class CDLIFileFolder(versionedFileFolder
def sortF(x,y):
return cmp(x[0],y[0])
- catalog=getattr(self,self.default_catalog)
+ catalog=getattr(self,self.file_catalog)
#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
+ transaction.get().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()
@@ -1476,7 +629,11 @@ class CDLIFileFolder(versionedFileFolder
#os.write(tf,obj.getLastVersion().data)
if RESPONSE:
- RESPONSE.write(obj.getLastVersion().data[0:])
+ RESPONSE.write(obj.getData()[0:])
+ RESPONSE.write("\n")
+ self.temp_folder.downloadCounter-=1
+ self._p_changed=1
+ transaction.get().commit()
#os.close(tf)
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)
return True
@@ -1492,7 +649,7 @@ class CDLIFileFolder(versionedFileFolder
def hasParent(self):
"""returns true falls subfolder"""
- if self.aq_parent.meta_type in self.folderMetaType:
+ if self.aq_parent.meta_type in self.folder_meta_type:
return True
else:
return False
@@ -1500,26 +657,16 @@ class CDLIFileFolder(versionedFileFolder
def getFolders(self):
"""get all subfolders"""
ret=[]
- folders=self.ZopeFind(self,obj_metatypes=self.folderMetaType)
+ folders=self.ZopeFind(self,obj_metatypes=self.folder_meta_type)
for folder in folders:
ret.append((folder[1],
- len(self.ZopeFind(folder[1],obj_metatypes=self.folderMetaType)),
- len(self.ZopeFind(folder[1],obj_metatypes=self.filesMetaType))
+ len(self.ZopeFind(folder[1],obj_metatypes=self.folder_meta_type)),
+ len(self.ZopeFind(folder[1],obj_metatypes=self.file_meta_type))
))
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('manage','index_html')
def index_html(self):
"""main"""
ext=self.ZopeFind(self,obj_ids=["index.html"])
@@ -1529,53 +676,782 @@ class CDLIFileFolder(versionedFileFolder
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','CDLIFileFolderMain')).__of__(self)
return pt()
- def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/Documents/workspace/cdli/atf", files=None,ext=None):
- """import files"""
+
+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
+
+ file_catalog = 'CDLICatalog'
+
+ # word splitter for search
+ splitter = {'words':cdliSplitter.wordSplitter(),
+ 'graphemes':cdliSplitter.graphemeSplitter()}
+
+ def redirect(self,RESPONSE,url):
+ """mache ein redirect mit einem angehaengten time stamp um ein reload zu erzwingen"""
+
+ timeStamp=time.time()
+
+ if url.find("?")>-1: #giebt es schon parameter
+ addStr="&time=%s"
+ else:
+ addStr="?time=%s"
+
+ RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT')
+ logging.error(email.Utils.formatdate()+' GMT')
+ RESPONSE.redirect(url+addStr%timeStamp)
+
+ def unicodify(self,txt):
+ return unicodify(txt)
+ def invalidateOldCacheVersion(self):
+ """loescht die alte Version des Cache"""
+ del self.v_tmpStore
+ return "done"
+
+ def viewATF(self,id,RESPONSE):
+ """view an Object"""
+ ob = self.CDLICatalog({'title':id})
+ logging.debug(ob[0].getObject().getLastVersion().absolute_url()+"/view")
+ if len(ob)>0:
+ RESPONSE.redirect(ob[0].getObject().getLastVersion().absolute_url()+"/view")
+ return "not found"
+
+ def history(self,id,RESPONSE):
+ """view an Object"""
+ ob = self.CDLICatalog({'title':id})
+ if len(ob)>0:
+ RESPONSE.redirect(ob[0].absolute_url+"/history")
+ return "not found"
+
+
+ def downloadLocked(self,id,RESPONSE):
+ """view an Object"""
+ ob = self.CDLICatalog({'title':id})
+ if len(ob)>0:
+ RESPONSE.redirect(ob[0].absolute_url+"/downloadLocked")
+ return "not found"
+
+ def download(self,id,RESPONSE):
+ """view an Object"""
+ ob = self.CDLICatalog({'title':id})
+ if len(ob)>0:
+ logging.info("objekt:"+repr(ob[0]))
+ #RESPONSE.redirect(ob[0].getLastVersion().absolute_url())
+ RESPONSE.redirect(ob[0].absolute_url+"/download")
+ return "not found"
+ def addCDLIFileObjectForm(self,id,RESPONSE):
+ """view an Object"""
+ ob = self.CDLICatalog({'title':id})
+ if len(ob)>0:
+ RESPONSE.redirect(ob[0].absolute_url+"/addCDLIFileObjectForm")
+ return "not found"
+
+ def addVersionedFileObjectForm(self,id,RESPONSE):
+ """view an Object"""
+ ob = self.CDLICatalog({'title':id})
+ if len(ob)>0:
+ RESPONSE.redirect(ob[0].absolute_url+"/addVersionedFileObjectForm")
+ return "not found"
+
+ def unlock(self,id,RESPONSE):
+ """view an Object"""
+ ob = self.CDLICatalog({'title':id})
+ if len(ob)>0:
+ RESPONSE.redirect(ob[0].absolute_url+"/unlock")
+ return "not found"
+
+
+ def getFileObject(self,fileId):
+ """get an object"""
+ logging.debug("getFileObj:"+repr(fileId))
+ if isinstance(fileId,CDLIFileObject): # support for old baskets
+ return fileId
+ x=self.v_files.get(fileId)
+ logging.debug("obj: "+repr(x))
+ if x==None:
+ folder=fileId[0:3]
+ f2=fileId[0:5]
+ fObj = getattr(self.cdliRoot.cdli_main,folder);
+ f2Obj = getattr(fObj,f2)
+
+ o = getattr(f2Obj,fileId)
+ logging.debug(o);
+ self.updateOrAddToFileBTree(o)
+ return o
+ return x
+
+ def getFileObjectLastVersion(self,fileId):
+ """get an object"""
+ x=self.v_files_lastVersion.get(fileId)
+ logging.debug("lastVersion: "+repr(x))
+ if x==None:
+ folder=fileId[0:3]
+ f2=fileId[0:5]
+ fObj = getattr(self.cdliRoot.cdli_main,folder);
+ f2Obj = getattr(fObj,f2)
+
+ o =getattr(f2Obj,fileId)
+ logging.debug(o);
+ return o.getLastVersion()
+
+
+ return x
+
+ def showFileIds(self):
+ """showIds"""
+ return self.v_file_ids
+
+ def generateFileBTree(self):
+ """erzeuge einen Btree aus allen Files"""
+ self.v_files = OOBTree()
+ self.v_files_lastVersion = OOBTree()
+ self.v_file_ids = Set()
+
+ for x in self.CDLICatalog.searchResults():
+
+ self.v_files.update({x.getId:x.getObject()})
+ self.v_files_lastVersion.update({x.getId:x.getObject().getLastVersion()})
+ self.v_file_ids.add(x.getId)
+ logging.debug("add:"+x.getId+"XXX"+repr(x.getObject()))
+
+ return True
+
+
+ def updateOrAddToFileBTree(self,obj):
+ """update a BTree"""
+ self.v_files.update({obj.getId():obj})
+ self.v_files_lastVersion.update({obj.getId():obj.getLastVersion()})
+
+ self.v_file_ids.add(obj.getId())
+ #change everthing around to make it persistent...
+ tmp = self.v_files
+ self.v_files=tmp
+
+ tmp2=self.v_file_ids
+ self.v_file_ids=tmp2
+
+ self.CDLICache.cleanCache() #be sure that the cache is clean
+ logging.debug("update:"+obj.getId()+"XXX"+repr(obj))
+
+
+ def deleteFromBTree(self,objId):
+ """delete an obj"""
+ self.v_files.pop(objId)
+ self.v_files_lastVersion.pop(objId)
+ self.v_file_ids.remove(objId)
+
+
+
+ def deleteFiles(self,ids):
+ """delete files"""
+ for id in ids:
+ founds=self.CDLICatalog.search({'title':id.split(".")[0]})
+ if founds:
+ logging.debug("deleting %s"%founds)
+ folder=founds[0].getObject().aq_parent #get the parent folder of the object
+ logging.debug("deleting from %s"%folder)
+ cut=folder.delete([founds[0].getId]) #cut it out
+
+
+
+ def searchText(self, query, index='graphemes'):
+ """searches query in the fulltext index and returns a list of file ids/P-numbers"""
+ # see also: http://www.plope.com/Books/2_7Edition/SearchingZCatalog.stx#2-13
+ logging.debug("searchtext for '%s' in index %s"%(query,index))
+ #import Products.ZCTextIndex.QueryParser
+ #qp = QueryParser.QueryParser()
+ #logging.debug()
+ idxQuery = {index:{'query':query}}
+ idx = getattr(self, self.file_catalog)
+ # do search
+ resultset = idx.search(query_request=idxQuery,sort_index='textid')
+ # put only the P-Number in the result
+ results = [res.getId[:7] for res in resultset]
+ logging.debug("searchtext: found %d texts"%len(results))
+ return results
+
+
+ def getFile(self, pnum):
+ """get the translit file with the given pnum"""
+ f = getattr(self, self.file_catalog).search({'textid':pnum})
+ if not f:
+ return ""
+ return f[0].getObject().getData()
+
+
+ def showFile(self,fileId,wholePage=False):
+ """show a file
+ @param fileId: P-Number of the document to be displayed
+ """
+ f=getattr(self, self.file_catalog).search({'textid':fileId})
+ if not f:
+ return ""
+
+ if wholePage:
+ logging.debug("show whole page")
+ return f[0].getObject().getContentObject().view()
+ else:
+ return f[0].getObject().getLastVersionFormattedData()
+
+
+ def showWordInFile(self,fileId,word,indexName='graphemes',regExp=False,):
+ """get lines with word from FileId"""
+ logging.debug("showwordinfile word='%s' index=%s file=%s"%(word,indexName,fileId))
+
+ file = formatAtfFullLineNum(self.getFile(fileId))
+ ret=[]
+
+ # add whitespace before and whitespace and line-end to splitter bounds expressions
+ bounds = self.splitter[indexName].bounds
+ splitexp = "(%s|\s)(%%s)(%s|\s|\Z)"%(bounds,bounds)
+ # clean word expression
+ # TODO: this should use QueryParser itself
+ # take out double quotes
+ word = word.replace('"','')
+ # take out ignorable signs
+ ignorable = self.splitter[indexName].ignorex
+ word = ignorable.sub('', word)
+ # compile into regexp objects and escape parens
+ wordlist = [re.compile(splitexp%re.escape(w)) for w in word.split(' ')]
+
+ for line in file.splitlines():
+ for word in wordlist:
+ #logging.debug("showwordinfile: searching for %s in %s"%(word.pattern,ignoreable.sub('',line)))
+ if word.search(ignorable.sub('',line)):
+ line = formatAtfLineHtml(line)
+ ret.append(line)
+ break
+
+ return ret
+
+
+ def showWordInFiles(self,fileIds,word,indexName='graphemes',regExp=False):
+ """
+ get lines with word from all ids in list FileIds.
+ returns dict with id:lines pairs.
+ """
+ logging.debug("showwordinfiles word='%s' index=%s file=%s"%(word,indexName,fileIds))
+
+ return dict([(id,self.showWordInFile(id, word, indexName, regExp)) for id in fileIds])
+
+
+ def tagWordInFile(self,fileId,word,indexName='graphemes',regExp=False):
+ """get text with word highlighted from FileId"""
+ logging.debug("tagwordinfile word='%s' index=%s file=%s"%(word,indexName,fileId))
+
+ file=self.getFile(fileId)
+ tagStart=u''
+ tagEnd=u''
+ tagStr=tagStart + u'%%s' + tagEnd
+ ret=[]
+
+ # add whitespace to splitter bounds expressions and compile into regexp object
+ bounds = self.splitter[indexName].bounds
+ wordsplit = re.compile("(%s|\s)"%bounds)
+ # clean word expression
+ # TODO: this should use QueryParser itself
+ word = word.replace('"','') # take out double quotes
+ # take out ignoreable signs
+ ignorable = self.splitter[indexName].ignorex
+ word = ignorable.sub('', word)
+ # split search terms by blanks
+ words = word.split(' ')
+ # split search terms again (for grapheme search with words)
+ splitwords = dict(((w,self.splitter[indexName].process([w])) for w in words))
+
+ for line in file.splitlines():
+ line = unicodify(line)
+ # ignore lemma and other lines
+ if line.lstrip().startswith('#lem:'):
+ continue
+ # ignore p-num line
+ if line.startswith('&P'):
+ continue
+ # ignore version lines
+ if line.startswith('#version'):
+ continue
+ # ignore atf type lines
+ if line.startswith('#atf:'):
+ continue
+
+ # first scan
+ hitwords = []
+ for w in words:
+ if ignorable.sub('',line).find(w) > -1:
+ # word is in line
+ # append split word for grapheme search with words
+ hitwords.extend(splitwords[w])
+ #hitwords.extend(wordsplit.split(w))
+
+ # examine hits closer
+ if hitwords:
+ # split line into words
+ parts = wordsplit.split(line)
+ line = ""
+ for p in parts:
+ #logging.debug("tagwordinfile: searching for %s in %s"%(p,hitwords))
+ # reassemble line
+ if ignorable.sub('', p) in hitwords:
+ #logging.debug("tagwordinfile: found %s in %s"%(p,hitwords))
+ # this part was found
+ line += tagStart + formatAtfHtml(p) + tagEnd
+ else:
+ line += formatAtfHtml(p)
+
+ else:
+ # no hits
+ line = formatAtfHtml(line)
+
+ ret.append(line)
+
+ return u'
\n'.join(ret)
+
+
+
+ def tagWordInFiles(self,fileIds,word,indexName='graphemes',regExp=False):
+ """
+ get texts with highlighted word from all ids in list FileIds.
+ returns dict with id:text pairs.
+ """
+ logging.debug("tagwordinfiles word='%s' index=%s file=%s"%(word,indexName,fileIds))
+ return dict([(id,self.tagWordInFile(id, word, indexName, regExp)) for id in fileIds])
+
+
+ def getFileVersionList(self, pnum):
+ """get the version history as a list for the translit file with the given pnum"""
+ f = getattr(self, self.file_catalog).search({'textid':pnum})
+ if not f:
+ return []
+
+ return f[0].getObject().getVersionList()
+
+
+ def URLquote(self,str):
+ """quote url"""
+ return urllib.quote(str)
+
+ def URLunquote(self,str):
+ """unquote url"""
+ return urllib.unquote(str)
+
+ def URLquote_plus(self,str):
+ """quote url"""
+ return urllib.quote_plus(str)
+
+ def URLunquote_plus(self,str):
+ """unquote url"""
+ return urllib.unquote_plus(str)
+
+ def changeUserForPObjectFromFile(self,user,fname):
+ """aendere user fuer alle p in fiele"""
+ pns = file(os.path.join(package_home(globals()),'inputs',fname),"r")
+ for p in pns.readlines():
+ p=p.lstrip().rstrip()
+ logging.info(str(p+".atf"))
+ pObj=self.getFileObject(p+".atf")
+ if pObj is not None:
+ logging.info(pObj)
+ lv=pObj.getContentObject()
+ logging.info("author:"+lv.author)
+ lv.author=user
+ lv.versionComment="XXXXXXX"
+
+
+
+ gen
+ def forceunlock(self,REQUEST=None,user=None,fid=None):
+ "break all locks"
+ if fid is not None:
+ self.getFileObject(fid).forceunlock()
+ return fid
+ ret=[]
+
+ for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):
+ un=f[1].forceunlock(user=user)
+ logging.info("check:"+f[0])
+ if un and un !="":
+ ret.append((f[0],un))
+
+ if REQUEST is not None:
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','breakLockResponse.zpt')).__of__(self)
+
+ return pt(ret=ret)
+
+ return ret
+
+
+ def getLockedFiles(self,REQUEST=None,user=None):
+ """hole alle gesperrten files"""
+ ret={}
+
+ for nm,f in self.v_files.items():
+ lb = str(f.lockedBy)
+ add=False
+ if (lb is not None) and (lb!=""):
+
+ if user is None:
+ add=True
+ else:
+ if str(lb)==user:
+ add=True
+ if add==True:
+ if not ret.has_key(lb):
+ ret[lb]=[]
+ ret[lb].append(nm)
+
+
+ if REQUEST is not None:
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','showlockResponse.zpt')).__of__(self)
+
+ return pt(ret=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(),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 refreshTxtBasket(self,txt="",threadName=None):
+ """txt fuer refresh"""
+
+ return """ 2;url=%s?repeat=%s """%(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 uploadATFRPC(self,data,username):
+ """upload an atffile via xml-rpc"""
+ uploader=uploadATFThread()
+
+ #generate an random id for the upload object
+ from random import randint
+ if (not self.REQUEST.SESSION.get('idTmp',None)):
+
+ idTmp=str(randint(0,1000000000))
+ self.REQUEST.SESSION['idTmp']=idTmp
+ else:
+ idTmp=self.REQUEST.SESSION.get('idTmp',None)
+
+
+ uploader.set(data,0,username,idTmp)
+
+ stObj=uploader.run()
+
+ processor=uploadATFfinallyThread()
+
+ basketname=stObj.returnValue['basketNameFromFile']
+
+ processor.set("uploadchanged",basketname=basketname,SESSION=stObj.returnValue,username=username,serverport=self.REQUEST['SERVER_PORT'])
+
+ processor.run()
+
+
+ return generateXMLReturn(stObj.returnValue)
+
+ def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
+ """upload an atf file / basket file"""
+ #self._v_uploadATF.returnValue=None
+
+ #generate an random id for the upload thread
+ from random import randint
+ if (not self.REQUEST.SESSION.get('idTmp',None)):
+
+ idTmp=str(randint(0,1000000000))
+ self.REQUEST.SESSION['idTmp']=idTmp
+ else:
+ idTmp=self.REQUEST.SESSION.get('idTmp',None)
+
+
+ threadName=repeat
+ if not threadName or threadName=="":
+ #new thread not called from the waiting page
+ 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)
+ logging.info("set thread. extern")
+ self._v_uploadATF[threadName].set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],idTmp,serverport=self.REQUEST['SERVER_PORT'])
+ #thread.start()
+ logging.info("start thread. extern")
+ 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 self._v_uploadATF.get(threadName,None) and (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=getattr(self.temp_folder,idTmp).returnValue
+
+ 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 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
+
+ idTmp=self.REQUEST.SESSION['idTmp']
+ stObj=getattr(self.temp_folder,idTmp)
+ self._v_uploadATF[threadName].set(procedure,comment=comment,basketname=basketname,unlock=unlock,SESSION=stObj.returnValue,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:
+
+
+ idTmp=self.REQUEST.SESSION['idTmp']
+ stObj=getattr(self.temp_folder,idTmp)
+ self.REQUEST.SESSION['idTmp']=None
+
+ #update changed
+ logging.debug("dir:"+repr(stObj.returnValue['changed']))
+ for x in stObj.returnValue['changed']:
+ ob=self.CDLICatalog.search({'title':x[0]})
+ try:
+ self.cdliRoot.updateOrAddToFileBTree(ob[0].getObject())
+ except:
+
+ logging.error("uploadATFfinally - cannot update Object %s Error: %s %s"%(ob[1],sys.exc_info()[0],sys.exc_info()[1]))
+ for x in stObj.returnValue['newPs']:
+ obj=self.getFileObject(x) #updates the object in the cache
+ logging.debug("Got:"+repr(obj))
+ if RESPONSE is not None:
+ RESPONSE.redirect(self.absolute_url())
+
+ def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/atf", files=None,ext=None):
+ """import files"""
+ logging.debug("importFiles folderName=%s files=%s ext=%s"%(folderName,files,ext))
+ root=self.cdli_main
+ count=0
if not files:
files=os.listdir(folderName)
for f in files:
folder=f[0:3]
f2=f[0:5]
- obj=self.ZopeFind(self,obj_ids=[folder])
+
+ #check if main folder PXX already exists
+ obj=self.ZopeFind(root,obj_ids=[folder])
+ logging.debug("importFiles: folder=%s f2=%s obj=%s"%(folder,f2,obj))
if ext:
-
- ext.result+="Adding: %s
"%f
- if not obj:
- manage_addCDLIFileFolder(self,folder,folder)
- fobj=getattr(self,folder)
-
+ ext.result="adding: %s
"%f+ext.result
+
+
+ if not obj: # if not create it
+ manage_addCDLIFileFolder(root,folder,folder)
+ fobj=getattr(root,folder)
+ #transaction.get().commit()
+
else:
fobj=obj[0][1]
+ #check IF PYYYYY already exist
obj2=fobj.ZopeFind(fobj,obj_ids=[f2])
+ logging.debug("importFiles: fobj=%s obj2=%s"%(fobj,obj2))
- if not obj2:
+ if not obj2:# if not create it
manage_addCDLIFileFolder(fobj,f2,f2)
fobj2=getattr(fobj,f2)
else:
fobj2=obj2[0][1]
- file2=file(os.path.join(folderName,f))
+ # not add the file
+ file2=os.path.join(folderName,f)
id=f
- manage_addCDLIFile(fobj2,f,'','')
- id=f
- ob=fobj2._getOb(f)
- ob.title=id
-
- manage_addCDLIFileObject(ob,id,comment,author,file2,content_type='')
- self.CDLICatalog.catalog_object(ob)
- #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])
-
+ logging.debug("importFiles: addCDLIFile fobj2=%s, f=%s file2=%s"%(fobj2,repr(f),repr(file2)))
+ fobj2.addFile(vC='',file=file(file2),author=author,newName=f)
+ logging.debug("importfiles: fobj2.add")
+ count+=1
+
+ #now add the file to the storage
+ ob = getattr(fobj2,f)
+ logging.debug("importfiles: btree_start")
+ #self.cdliRoot.updateOrAddToFileBTree(ob)
+ logging.debug("importfiles: btree_end")
+ if count%100==0:
+ logging.debug("importfiles: committing")
+ transaction.get().commit()
+
+ logging.debug("importfiles: committing")
+ transaction.get().commit()
+ logging.debug("importfiles: committing done")
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,10 +1461,13 @@ 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)
+ try:
+ self._setObject(id, ob)
+ except:
+ pass
ob=self._getOb(id)
checkPermission=getSecurityManager().checkPermission
@@ -1602,5 +1481,39 @@ 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)
+
+
+import cdli_basket
+
+
+# Die folgenden Klassen sollte nicht mehr aus diesem Paket benutzt werden, sondern direkt aus
+# cdli_basket importiert werden.
+class uploadATFfinallyThread(cdli_basket.uploadATFfinallyThread):
+ """depricates"""
+ pass
+class tmpStore(cdli_basket.tmpStore):
+ """depricated"""
+ pass
+
+class uploadATFThread(cdli_basket.uploadATFThread):
+ """depricated"""
+ pass
+
+class CDLIBasketContainer(cdli_basket.CDLIBasketContainer):
+ """depricated"""
+ pass
+
+class CDLIBasket(cdli_basket.CDLIBasket):
+ """depricated"""
+ pass
+
+class CDLIBasketVersion(cdli_basket.CDLIBasketVersion):
+ """depricated"""
+ pass
+
+class BasketContent(cdli_basket.BasketContent):
+ """depricated"""
+ pass
+