version 1.76, 2007/04/23 13:07:10
|
version 1.104, 2008/11/06 15:00:44
|
Line 1
|
Line 1
|
"""CDLI extensions of the filearchive""" |
"""CDLI extensions of the filearchive""" |
from Products.versionedFile.extVersionedFile import * |
from Products.versionedFile.extVersionedFile import * |
from Products.ZCatalog.CatalogPathAwareness import CatalogAware |
from Products.ZCatalog.CatalogPathAwareness import CatalogAware |
from tempfile import mkstemp,mkdtemp |
|
import os.path |
import os.path |
import os |
import os |
from types import * |
|
import urlparse |
import urlparse |
import urllib |
import urllib |
import cgi |
import cgi |
Line 21 from ZPublisher.HTTPRequest import HTTPR
|
Line 19 from ZPublisher.HTTPRequest import HTTPR
|
from ZPublisher.HTTPResponse import HTTPResponse |
from ZPublisher.HTTPResponse import HTTPResponse |
from ZPublisher.BaseRequest import RequestContainer |
from ZPublisher.BaseRequest import RequestContainer |
import threading |
import threading |
from BTrees.OOBTree import OOBTree |
|
import logging |
import logging |
import transaction |
import transaction |
import copy |
import copy |
import codecs |
import codecs |
import sys |
import sys |
|
from BTrees.IOBTree import IOBTree |
|
import cdliSplitter |
|
from sets import Set |
|
import md5 |
|
from DownloadBasket import DownloadBasketFinallyThread |
|
from types import * |
|
import pickle |
|
import tempfile |
|
|
|
def makelist(mySet): |
|
x = list(mySet) |
|
x.sort() |
|
return x |
|
|
|
def unicodify(s): |
|
"""decode str (utf-8 or latin-1 representation) into unicode object""" |
|
if not s: |
|
return u"" |
|
if isinstance(s, str): |
|
try: |
|
return s.decode('utf-8') |
|
except: |
|
return s.decode('latin-1') |
|
else: |
|
return s |
|
|
|
def utf8ify(s): |
|
"""encode unicode object or string into byte string in utf-8 representation. |
|
assumes string objects to be utf-8""" |
|
if not s: |
|
return "" |
|
if isinstance(s, str): |
|
return s |
|
else: |
|
return s.encode('utf-8') |
|
|
|
def formatAtfHtml(l): |
|
"""escape special ATF characters for HTML""" |
|
if not l: |
|
return "" |
|
|
|
# replace & |
|
l = l.replace('&','&') |
|
# replace angular brackets |
|
l = l.replace('<','<') |
|
l = l.replace('>','>') |
|
return l |
|
|
|
def formatAtfLineHtml(l, nolemma=True): |
|
"""format ATF line for HTML""" |
|
if not l: |
|
return "" |
|
|
|
if nolemma: |
|
# ignore lemma lines |
|
if l.lstrip().startswith('#lem:'): |
|
return "" |
|
|
|
return formatAtfHtml(l) |
|
|
|
|
|
|
|
def formatAtfFullLineNum(txt, nolemma=True): |
|
"""format full line numbers in ATF text""" |
|
# surface codes |
|
surfaces = {'@obverse':'obv', |
|
'@reverse':'rev', |
|
'@surface':'surface', |
|
'@edge':'edge', |
|
'@left':'left', |
|
'@right':'right', |
|
'@top':'top', |
|
'@bottom':'bottom', |
|
'@face':'face', |
|
'@seal':'seal'} |
|
|
|
if not txt: |
|
return "" |
|
|
|
ret = [] |
|
surf = "" |
|
col = "" |
|
for line in txt.splitlines(): |
|
line = unicodify(line) |
|
if line and line[0] == '@': |
|
# surface or column |
|
words = line.split(' ') |
|
if words[0] in surfaces: |
|
surf = line.replace(words[0],surfaces[words[0]]).strip() |
|
|
|
elif words[0] == '@column': |
|
col = ' '.join(words[1:]) |
|
|
|
elif line and line[0] in '123456789': |
|
# ordinary line -> add line number |
|
line = "%s:%s:%s"%(surf,col,line) |
|
|
|
ret.append(line) |
|
|
|
return '\n'.join(ret) |
|
|
|
|
def generateXMLReturn(hash): |
def generateXMLReturn(hash): |
"""erzeugt das xml file als returnwert fuer uploadATFRPC""" |
"""erzeugt das xml file als returnwert fuer uploadATFRPC""" |
Line 53 def generateXMLReturn(hash):
|
Line 151 def generateXMLReturn(hash):
|
return ret |
return ret |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def unique(s): |
def unique(s): |
"""Return a list of the elements in s, but without duplicates. |
"""Return a list of the elements in s, but without duplicates. |
|
|
Line 134 def unique(s):
|
Line 224 def unique(s):
|
class BasketContent(SimpleItem): |
class BasketContent(SimpleItem): |
"""classe fuer den Inhalt eines Baskets""" |
"""classe fuer den Inhalt eines Baskets""" |
|
|
|
def getFileAndVersionFromId(self,pnum,versionNr): |
|
|
|
obj=self.cdliRoot.getFileObject(pnum) |
|
logging.debug("obj : %s"%obj) |
|
version=obj.getVersionNr(versionNr) |
|
logging.debug("-------vs: %s"%version.getFileName()) |
|
return version,obj |
|
|
def __init__(self,content=[]): |
def __init__(self,content=[]): |
"""content""" |
"""content""" |
self.contentList=content[0:] |
|
|
|
def getContent(self): |
self.setContent(content[0:]) |
"""get content""" |
|
|
|
|
def getContent(self,filtered=True): |
return self.contentList |
return self.contentList |
|
|
|
def getContentOld(self,filtered=True): |
|
"""get content""" |
|
logging.debug("content object: content List %s"%self.contentList) |
|
ret=[] |
|
|
|
return [self.getFileAndVersionFromId(x[0],x[1]) for x in self.contentList] |
|
# |
|
# if filtered: |
|
# for x in self.contentList: |
|
# if not((x[0] is None) or (x[1] is None)): |
|
# ret.append(x) |
|
# logging.debug("content object: content List -done filtered") |
|
# return ret |
|
# |
|
# else: |
|
# logging.debug("content object: content List -done not filtered") |
|
# return self.contentList |
|
|
|
def allContent(self): |
|
"""get all content""" |
|
return self.getContent(filtered=False) |
|
|
def setContent(self,content): |
def setContent(self,content): |
self.contentList=content[0:] |
contentList=[] |
|
for x in content: |
|
if not((x[0] is None) or (x[1] is None)): |
|
|
|
contentList.append((x[1].getId(),x[0].getVersionNumber())) |
|
logging.debug("cl: %s"%contentList) |
|
self.contentList=contentList[0:] |
|
|
def numberOfItems(self): |
def numberOfItems(self): |
"""number""" |
"""number""" |
Line 230 class uploadATFfinallyThread(Thread):
|
Line 355 class uploadATFfinallyThread(Thread):
|
self.result+="<h2>Start processing</h2>" |
self.result+="<h2>Start processing</h2>" |
|
|
#shall I only upload the changed files? |
#shall I only upload the changed files? |
logging.info("uploadATFfinally procedure: %s"%procedure) |
logging.debug("uploadATFfinally procedure: %s"%procedure) |
if procedure=="uploadchanged": |
if procedure=="uploadchanged": |
changed=[x[0] for x in SESSION.get('changed',[])] |
changed=[x[0] for x in SESSION.get('changed',[])] |
uploadFns=changed+SESSION.get('newPs',[]) |
uploadFns=changed+SESSION.get('newPs',[]) |
Line 251 class uploadATFfinallyThread(Thread):
|
Line 376 class uploadATFfinallyThread(Thread):
|
#do first the changed files |
#do first the changed files |
i=0 |
i=0 |
for fn in uploadFns: |
for fn in uploadFns: |
|
logging.debug("uploadATFfinally uploadFn=%s"%fn) |
i+=1 |
i+=1 |
founds=ctx2.CDLICatalog.search({'title':fn}) |
founds=ctx2.CDLICatalog.search({'title':fn}) |
if len(founds)>0: |
if len(founds)>0: |
SESSION['author']=str(username) |
SESSION['author']=str(username) |
self.result="<p>Changing : %s"%fn+self.result |
self.result="<p>Changing : %s"%fn+self.result |
|
logging.debug("uploadatffinallythread changing:%s"%fn+self.result) |
founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn),from_tmp=True) |
founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn),from_tmp=True) |
if i==200: |
if i%200==0: |
i=0 |
|
transaction.get().commit() |
transaction.get().commit() |
logging.info("changing: do commit") |
logging.debug("uploadatffinallythread changing: do commit") |
|
|
transaction.get().commit() |
transaction.get().commit() |
logging.info("changing: last commit") |
logging.debug("uploadatffinallythread changing: last commit") |
|
|
#now add the new files |
#now add the new files |
newPs=SESSION['newPs'] |
newPs=SESSION['newPs'] |
if len(newPs)>0: |
if len(newPs)>0: |
tmpDir=SESSION['tmpdir'] |
tmpDir=SESSION['tmpdir'] |
logging.info("adding start") |
logging.debug("uploadatffinallythread adding start") |
self.result="<p>Adding files</p>"+self.result |
self.result="<p>Adding files</p>"+self.result |
#TODO: make this configurable, at the moment base folder for the files has to be cdli_main |
#TODO: make this configurable, at the moment base folder for the files has to be cdli_main |
|
|
ctx2.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) |
logging.info("adding finished") |
logging.debug("uploadatffinallythread adding finished") |
|
|
|
|
#unlock locked files? |
#unlock locked files? |
if unlock: |
if unlock: |
logging.info("unlocking start") |
logging.debug("uploadatffinallythread unlocking start") |
self.result="<p>Unlock files</p>"+self.result |
self.result="<p>Unlock files</p>"+self.result |
unlockFns=[] |
unlockFns=[] |
for x in os.listdir(SESSION['tmpdir']): |
for x in os.listdir(SESSION['tmpdir']): |
if not x in SESSION['errors']: |
if not x in SESSION['errors']: |
unlockFns.append(x) |
unlockFns.append(x) |
logging.info("unlocking have now what to unlock") |
|
|
logging.debug("unlocking have now what to unlock") |
|
|
for fn in unlockFns: |
for fn in unlockFns: |
#logging.info("will unlock: %s"%fn) |
#logging.info("will unlock: %s"%fn) |
Line 294 class uploadATFfinallyThread(Thread):
|
Line 419 class uploadATFfinallyThread(Thread):
|
if len(founds)>0: |
if len(founds)>0: |
#logging.info("unlock: %s"%founds[0].getObject().getId()) |
#logging.info("unlock: %s"%founds[0].getObject().getId()) |
SESSION['author']=str(username) |
SESSION['author']=str(username) |
|
|
founds[0].getObject().lockedBy="" |
founds[0].getObject().lockedBy="" |
logging.info("unlocking done") |
|
|
logging.debug("uploadatffinallythread unlocking done") |
|
|
#if a basketname is given, add files to the basket |
#if a basketname is given, add files to the basket |
if not (basketname ==''): |
if not (basketname ==''): |
logging.info("add to basket %s"%basketname) |
logging.debug("uploadatffinallythread add to basket %s"%basketname) |
self.result="<p>Add to basket</p>"+self.result |
self.result="<p>Add to basket</p>"+self.result |
basketId=ctx2.basketContainer.getBasketIdfromName(basketname) |
basketId=ctx2.basketContainer.getBasketIdfromName(basketname) |
|
|
if not basketId: # create new basket |
if not basketId: # create new basket |
logging.info("create basket %s"%basketname) |
logging.debug("uploadatffinallythread create basket %s"%basketname) |
self.result="<p>Create a new basket</p>"+self.result |
self.result="<p>Create a new basket</p>"+self.result |
ob=ctx2.basketContainer.addBasket(basketname) |
ob=ctx2.basketContainer.addBasket(basketname) |
basketId=ob.getId() |
basketId=ob.getId() |
basket=getattr(ctx2.basketContainer,str(basketId)) |
basket=getattr(ctx2.basketContainer,str(basketId)) |
ids=os.listdir(SESSION['tmpdir']) |
ids=os.listdir(SESSION['tmpdir']) |
|
#logging.debug("should add:"+repr(ids)) |
basket.addObjects(ids,deleteOld=True,username=str(username)) |
basket.addObjects(ids,deleteOld=True,username=str(username)) |
|
|
|
logging.debug("uploadatffinallythread uploadfinally done") |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect(self.aq_parent.absolute_url()) |
RESPONSE.redirect(self.aq_parent.absolute_url()) |
|
|
|
|
logging.info("uploadfinally done") |
|
return True |
return True |
|
|
class tmpStore(SimpleItem): |
class tmpStore(SimpleItem): |
Line 413 class uploadATFThread(Thread):
|
Line 539 class uploadATFThread(Thread):
|
ctx2=ctx.cdliRoot |
ctx2=ctx.cdliRoot |
|
|
#get temporary file for staging the downloaded and splitted files |
#get temporary file for staging the downloaded and splitted files |
dir=mkdtemp() |
dir=tempfile.mkdtemp() |
|
|
|
|
changed=[] # changed files |
changed=[] # changed files |
Line 516 class CDLIBasketContainer(OrderedFolder)
|
Line 642 class CDLIBasketContainer(OrderedFolder)
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
meta_type="CDLIBasketContainer" |
meta_type="CDLIBasketContainer" |
|
|
|
def getResultHash(self): |
|
"""get the result hash for debug purposes""" |
|
return self.resultHash.keys() |
|
|
def getPNumbersOfBasket(self,basketName): |
def getPNumbersOfBasket(self,basketName): |
"""get all pnumbers of a basket as a list, returns an empty list if basket not found |
"""get all pnumbers of a basket as a list, returns an empty list if basket not found |
@param basketName: name of the basket |
@param basketName: name of the basket |
Line 525 class CDLIBasketContainer(OrderedFolder)
|
Line 655 class CDLIBasketContainer(OrderedFolder)
|
if not basketId: |
if not basketId: |
return [] |
return [] |
|
|
ob=getattr(self,basketId).getContent() |
ob=getattr(self,basketId).getContent() #get the content of a basket |
|
|
ret=[x[0].split(".")[0] for x in ob] |
ret=[x[0].split(".")[0] for x in ob] |
|
|
return ret |
return ret |
|
|
|
security.declareProtected('manage','getBasketAsOneFile') |
def getBasketAsOneFile(self,basketName,current="no"): |
def getBasketAsOneFile(self,basketName,current="no"): |
"""returns all files of the basket combined in one file |
"""returns all files of the basket combined in one file |
@param basketName: Name of the basket |
@param basketName: Name of the basket |
Line 543 class CDLIBasketContainer(OrderedFolder)
|
Line 674 class CDLIBasketContainer(OrderedFolder)
|
return "" |
return "" |
|
|
ob=getattr(self,basketId).getLastVersion() |
ob=getattr(self,basketId).getLastVersion() |
for object in ob.getContent(): |
for pnum,versionNr in ob.getContent(): |
|
obj=self.cdliRoot.getFileObject(pnum) |
|
# logging.debug("obj : %s"%obj) |
|
# version=obj.getVersionNr(versionNr) |
|
|
if current=="no": #version as they are in the basket |
if current=="no": #version as they are in the basket |
ret+=str(object[0].getData())+"\n" |
cur= obj.getVersionNr(versionNr) |
|
ret+=str(cur.getData())+"\n" |
elif current=="yes": |
elif current=="yes": |
#search current object |
#search current object |
logging.info("crrent: %s"%object[1].getId().split(".")[0]) |
#logging.debug("current: %s"%object[1].getId().split(".")[0]) |
founds=self.CDLICatalog.search({'title':object[1].getId().split(".")[0]}) |
obj.getData() |
if len(founds)>0: |
|
ret+=str(founds[0].getObject().getLastVersion().getData())+"\n" |
|
return ret |
return ret |
|
|
|
security.declareProtected('manage','upDateBaskets') |
def upDateBaskets(self): |
def upDateBaskets(self): |
"""update content in to objects""" |
"""update content in to objects""" |
|
|
Line 566 class CDLIBasketContainer(OrderedFolder)
|
Line 701 class CDLIBasketContainer(OrderedFolder)
|
def deleteBaskets(self,ids=None): |
def deleteBaskets(self,ids=None): |
"""delete baskets, i.e. move them into trash folder""" |
"""delete baskets, i.e. move them into trash folder""" |
|
|
|
if ids is None: |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','cdliError_html.zpt')).__of__(self) |
|
txt="Sorry, no basket selected!" |
|
return pt(txt=txt) |
|
|
found=self.ZopeFind(self,obj_ids=['trash']) |
found=self.ZopeFind(self,obj_ids=['trash']) |
|
|
Line 577 class CDLIBasketContainer(OrderedFolder)
|
Line 716 class CDLIBasketContainer(OrderedFolder)
|
|
|
if type(ids) is not ListType: |
if type(ids) is not ListType: |
ids=[ids] |
ids=[ids] |
|
logging.error("XERXON:"+repr(ids)) |
|
if len(ids)==0: |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','cdliError_html.zpt')).__of__(self) |
|
txt="Sorry, no basket selected!" |
|
return pt(txt=txt) |
|
|
cut=self.manage_cutObjects(ids) |
cut=self.manage_cutObjects(ids) |
trash.manage_pasteObjects(cut) |
trash.manage_pasteObjects(cut) |
|
return None |
security.declareProtected('manage','manageBaskets') |
security.declareProtected('manage','manageBaskets') |
def manageBaskets(self,submit,ids=None,basket1="",basket2="",joinBasket="",subtractBasket="",REQUEST=None,RESPONSE=None): |
def manageBaskets(self,submit,ids=None,basket1="",basket2="",joinBasket="",subtractBasket="",REQUEST=None,RESPONSE=None): |
"""manage baskets, delete or copy""" |
"""manage baskets, delete or copy""" |
if submit=="delete": |
if submit=="delete": |
self.deleteBaskets(ids) |
ret= self.deleteBaskets(ids) |
|
if ret: |
|
return ret |
elif submit=="join": |
elif submit=="join": |
flag,msg=self.joinBasket(joinBasket, ids) |
flag,msg=self.joinBasket(joinBasket, ids) |
logging.info("joining %s %s"%(flag,msg)) |
logging.info("joining %s %s"%(flag,msg)) |
|
if not flag: |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','cdliError_html.zpt')).__of__(self) |
|
|
|
return pt(txt=msg) |
|
|
elif submit=="subtract": |
elif submit=="subtract": |
logging.info("BBBb %s %s"%(basket1,basket2)) |
logging.info("BBBb %s %s"%(basket1,basket2)) |
Line 624 class CDLIBasketContainer(OrderedFolder)
|
Line 774 class CDLIBasketContainer(OrderedFolder)
|
return pt(basketId=basketId,basketName=basketName) |
return pt(basketId=basketId,basketName=basketName) |
|
|
|
|
security.declareProtected('View','index_html') |
security.declareProtected('manage','index_html') |
def index_html(self): |
def index_html(self): |
"""stanadard ansicht""" |
"""stanadard ansicht""" |
|
|
Line 728 class CDLIBasketContainer(OrderedFolder)
|
Line 878 class CDLIBasketContainer(OrderedFolder)
|
@param basket2: see above |
@param basket2: see above |
|
|
""" |
""" |
|
|
logging.info("CCCCC %s %s"%(basket1,basket2)) |
logging.info("CCCCC %s %s"%(basket1,basket2)) |
|
|
try: |
try: |
Line 768 class CDLIBasketContainer(OrderedFolder)
|
Line 919 class CDLIBasketContainer(OrderedFolder)
|
@param newbasket: name of the new basket |
@param newbasket: name of the new basket |
@param oldbaskets: list of baskets to be joined |
@param oldbaskets: list of baskets to be joined |
""" |
""" |
|
if oldBaskets is None: |
|
return False, "No Baskets selected!" |
|
|
try: |
try: |
newB=self.addBasket(newBasket) |
newB=self.addBasket(newBasket) |
except: |
except: |
return False, "cannot create the new basket" |
return False, "cannot create the new basket" |
|
|
newBasketContent={} |
newBasketContent={} |
|
|
for ob in oldBaskets: |
for ob in oldBaskets: |
x= getattr(self,ob,None) |
x= getattr(self,ob,None) |
if x is None: |
if x is None: |
Line 828 class CDLIBasketContainer(OrderedFolder)
|
Line 983 class CDLIBasketContainer(OrderedFolder)
|
"""get name of the actualuser""" |
"""get name of the actualuser""" |
return str(self.REQUEST['AUTHENTICATED_USER']) |
return str(self.REQUEST['AUTHENTICATED_USER']) |
|
|
|
security.declareProtected('manage','addBasket') |
def addBasket(self,newBasketName): |
def addBasket(self,newBasketName): |
"""add a new basket""" |
"""add a new basket""" |
|
|
Line 840 class CDLIBasketContainer(OrderedFolder)
|
Line 995 class CDLIBasketContainer(OrderedFolder)
|
if not ids: |
if not ids: |
ids=self.REQUEST.SESSION['fileIds'] |
ids=self.REQUEST.SESSION['fileIds'] |
|
|
if type(ids) is not ListType: |
if (type(ids) is not ListType) and (not isinstance(ids,Set)): |
ids=[ids] |
ids=[ids] |
|
|
|
if isinstance(ids,Set): |
|
ids=list(ids) |
|
|
if (submit.lower()=="store in new basket") or (submit.lower()=="new basket"): |
if (submit.lower()=="store in new basket") or (submit.lower()=="new basket"): |
basketRet=self.addBasket(newBasketName) |
basketRet=self.addBasket(newBasketName) |
self.setActiveBasket(basketRet.getId()) |
self.setActiveBasket(basketRet.getId()) |
Line 856 class CDLIBasketContainer(OrderedFolder)
|
Line 1014 class CDLIBasketContainer(OrderedFolder)
|
|
|
if fromFileList: |
if fromFileList: |
|
|
return self.cdli_main.findObjectsFromList(list=self.REQUEST.SESSION['fileIds'],basketName=basket.title,numberOfObjects=added) |
return self.cdli_main.findObjectsFromList(list=ids,basketName=basket.title,numberOfObjects=added) |
|
|
if RESPONSE: |
if RESPONSE: |
|
|
Line 887 class CDLIBasket(Folder,CatalogAware):
|
Line 1045 class CDLIBasket(Folder,CatalogAware):
|
def searchInBasket(self,indexName,searchStr,regExp=False): |
def searchInBasket(self,indexName,searchStr,regExp=False): |
"""searchInBasket""" |
"""searchInBasket""" |
|
|
lst=self.searchInLineIndexDocs(indexName,searchStr,uniq=True,regExp=regExp) |
lst=self.searchInLineIndexDocs(indexName,searchStr,uniq=True,regExp=regExp) #TODO: fix this |
ret={} |
ret={} |
|
|
lv=self.getLastVersion() |
lv=self.getLastVersion() |
Line 933 class CDLIBasket(Folder,CatalogAware):
|
Line 1091 class CDLIBasket(Folder,CatalogAware):
|
return [x[1].getId() for x in self.getLastVersion().getContent()] |
return [x[1].getId() for x in self.getLastVersion().getContent()] |
|
|
|
|
def isActual(self,obj): |
def isActual(self,obj,nummer): |
|
"""teste ob im basket die aktuelle version ist, obj kann entweder ein CDLIFile sein oder eine |
|
eine pnummer, die auf ein CDLIFile verweist""" |
|
try: |
|
#logging.debug("isActual:"+repr(obj)) |
|
if isinstance(obj, CDLIFile): |
|
actualNo=obj.getLastVersion().getVersionNumber() |
|
else: |
|
actualNo=self.cdliRoot.getFileObjectLastVersion(obj).getVersionNumber() |
|
|
|
if actualNo==nummer: |
|
return True , 0 |
|
else: |
|
return False, actualNo |
|
except: |
|
logging.error( """is actual: %s (%s %s)"""%(repr(obj),sys.exc_info()[0],sys.exc_info()[1])) |
|
logging.error(""" PARAMS: %s %s"""%(obj,nummer)) |
|
return False, -1 |
|
def isActualOld(self,obj): |
"""teste ob im basket die aktuelle version ist""" |
"""teste ob im basket die aktuelle version ist""" |
|
try: |
|
#logging.debug("isActual:"+repr(obj)) |
actualNo=obj[1].getLastVersion().getVersionNumber() |
actualNo=obj[1].getLastVersion().getVersionNumber() |
storedNo=obj[0].getVersionNumber() |
storedNo=obj[0].getVersionNumber() |
|
|
founds=self.CDLICatalog.search({'title':obj[0].getId()}) |
|
if len(founds)>0: |
|
actualNo=founds[0].getObject().getLastVersion().getVersionNumber() |
|
|
|
if len(founds)>0 and founds[0].getObject().aq_parent.getId()==".trash": |
#actualNo=self.getFileObjectLastVersion(obj.getId()).getVersionNumber() |
return False, -1 |
|
|
#if len(founds)>0 and founds[0].getObject().aq_parent.getId()==".trash": |
|
# return False, -1 |
|
|
if actualNo==storedNo: |
if actualNo==storedNo: |
return True , 0 |
return True , 0 |
else: |
else: |
return False, actualNo |
return False, actualNo |
|
except: |
|
logging.error( """is actual: %s (%s %s)"""%(repr(obj),sys.exc_info()[0],sys.exc_info()[1])) |
|
|
|
return False, -1 |
|
|
def history(self): |
def history(self): |
"""history""" |
"""history""" |
Line 1092 class CDLIBasket(Folder,CatalogAware):
|
Line 1273 class CDLIBasket(Folder,CatalogAware):
|
|
|
def addObjects(self,ids,deleteOld=None,username=None): |
def addObjects(self,ids,deleteOld=None,username=None): |
"""generate a new version of the basket with objects added""" |
"""generate a new version of the basket with objects added""" |
|
|
|
def swap(x): |
|
return (x[1],x[0]) |
|
|
|
logging.info("add to basket (%s)"%(repr(ids))) |
logging.info("add to basket (%s)"%(self.getId())) |
logging.info("add to basket (%s)"%(self.getId())) |
lastVersion=self.getLastVersion() |
lastVersion=self.getLastVersion() |
|
|
Line 1103 class CDLIBasket(Folder,CatalogAware):
|
Line 1289 class CDLIBasket(Folder,CatalogAware):
|
if deleteOld: |
if deleteOld: |
oldContent=[] |
oldContent=[] |
|
|
newContent=[] |
|
added=0 |
added=0 |
for id in ids: |
# for id in ids: |
try: |
# logging.debug("adding:"+id) |
founds=self.CDLICatalog.search({'title':id}) |
# try: |
except: |
# founds=self.CDLICatalog.search({'title':id}) |
founds=[] |
# except: |
|
# founds=[] |
|
# |
|
# for found in founds: |
|
# if found.getObject() not in oldContent: |
|
# #TODO: was passiert wenn, man eine Object dazufŸgt, das schon da ist aber eine neuere version |
|
# newContent.append((found.getObject().getLastVersion(),found.getObject())) |
|
# added+=1 |
|
|
|
hash = md5.new(repr(makelist(ids))).hexdigest() # erzeuge hash als identification |
|
#logging.debug("JJJJJJJ:"+repr(self.makelist(ids))) |
|
|
|
retrieved = self.CDLICache.retrieve(hash) |
|
if retrieved: |
|
newContent=Set(map(swap,retrieved)) |
|
else: |
|
newContent=Set([(self.getFileObjectLastVersion(x),self.getFileObject(x)) for x in ids]) |
|
|
for found in founds: |
|
if found.getObject() not in oldContent: |
|
#TODO: was passiert wenn, man eine Object dazufŸgt, das schon da ist aber eine neuere version |
|
newContent.append((found.getObject().getLastVersion(),found.getObject())) |
|
added+=1 |
|
|
|
content=oldContent+newContent |
|
|
#remove all Elements which are not stored |
|
if (None,None) in newContent: |
|
newContent.remove((None,None)) |
|
content=Set(oldContent).union(newContent) |
|
added = len(content)-len(oldContent) |
if not username: |
if not username: |
user=self.getActualUserName() |
user=self.getActualUserName() |
else: |
else: |
user = username |
user = username |
|
|
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content) |
#logging.debug("content:"+repr(list(content))) |
|
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=list(content)) |
logging.info("add to basket (%s) done"%(self.getId())) |
logging.info("add to basket (%s) done"%(self.getId())) |
return added |
return added |
|
|
Line 1134 class CDLIBasket(Folder,CatalogAware):
|
Line 1336 class CDLIBasket(Folder,CatalogAware):
|
ret=[] |
ret=[] |
|
|
lv=self.getLastVersion() |
lv=self.getLastVersion() |
for obj in lv.content.getContent(): |
#for obj in lv.content.getContent(): |
logging.info("XXXXXXXXXX %s"%repr(obj)) |
#logging.info("XXXXXXXXXX %s"%repr(obj)) |
ret.append((obj[1].getId(),obj[0].versionNumber)) |
# ret.append((obj[1].getId(),obj[0].versionNumber)) |
|
|
return ret |
return lv |
|
|
def getContentIds(self): |
def getContentIds(self): |
"""print basket content""" |
"""print basket content""" |
Line 1222 class CDLIBasketVersion(Implicit,Persist
|
Line 1424 class CDLIBasketVersion(Implicit,Persist
|
|
|
objs=self.getContent() |
objs=self.getContent() |
for obj in objs: |
for obj in objs: |
if not self.isActual(obj)[0]: |
if not self.isActual(obj[0],obj[1])[0]: |
return True |
return True |
return False |
return False |
|
|
Line 1241 class CDLIBasketVersion(Implicit,Persist
|
Line 1443 class CDLIBasketVersion(Implicit,Persist
|
self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
self.REQUEST.RESPONSE.write(ret) |
self.REQUEST.RESPONSE.write(ret) |
|
|
security.declareProtected('View','downloadObjectsAsOneFile') |
security.declareProtected('manage','downloadObjectsAsOneFile') |
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"): |
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"): |
"""download all selected files in one file""" |
"""download all selected files in one file""" |
|
|
Line 1249 class CDLIBasketVersion(Implicit,Persist
|
Line 1451 class CDLIBasketVersion(Implicit,Persist
|
return """I am sorry, currently the server has to many requests for downloads, please come back later!""" |
return """I am sorry, currently the server has to many requests for downloads, please come back later!""" |
|
|
|
|
if (check=="yes") and self.containsNonActualFiles(): |
#if (check=="yes") and self.containsNonActualFiles(): |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self) |
# pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self) |
|
# |
|
# return pt(lock=lock) |
|
|
|
# neue Version aus Performancegruenden, es wird nicht mehr getestet, ob es nicht aktuelle Objekte gibt |
|
# sondern lediglich gefragt. |
|
if (check=="yes"): |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_ask.zpt')).__of__(self) |
|
|
return pt(lock=lock) |
return pt(lock=lock) |
|
|
Line 1258 class CDLIBasketVersion(Implicit,Persist
|
Line 1467 class CDLIBasketVersion(Implicit,Persist
|
|
|
return self.downloadObjectsAsOneFileFinally(lock=lock,procedure=procedure,REQUEST=REQUEST,current="no") |
return self.downloadObjectsAsOneFileFinally(lock=lock,procedure=procedure,REQUEST=REQUEST,current="no") |
|
|
def downloadObjectsAsOneFileFinally(self,lock=None,procedure=None,REQUEST=None,current="no"): |
def downloadObjectsAsOneFileFinally(self,lock=None,procedure=None,REQUEST=None,current="no",repeat=None): |
"""print do the download""" |
"""print do the download""" |
|
|
|
|
ret="" |
ret="" |
lockedObjects={} |
lockedObjects={} |
|
|
self.temp_folder.downloadCounterBaskets+=1 |
|
self._p_changed=1 |
|
transaction.get().commit() |
|
|
|
if lock: |
|
|
|
|
if lock: |
|
logging.debug("------lock:"+repr(lock)) |
if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': |
if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': |
self.temp_folder.downloadCounterBaskets-=1 |
|
self._p_changed=1 |
|
transaction.get().commit() |
|
self.temp_folder.downloadCounterBaskets-=1 |
|
self._p_changed=1 |
|
transaction.get().commit() |
|
return "please login first" |
return "please login first" |
|
|
#check if a locked object exist in the basket. |
#check if a locked object exist in the basket. |
lockedObjects={} |
lockedObjects={} |
for object in self.content.getContent(): |
for object in self.content.getContent(): |
|
obj=self.getFileObject(object[0]) |
if (not str(object[1].lockedBy)=="") and (not (str(object[1].lockedBy)==str(self.REQUEST['AUTHENTICATED_USER']))): |
if (not str(obj.lockedBy)=="") and (not (str(obj.lockedBy)==str(self.REQUEST['AUTHENTICATED_USER']))): |
lockedObjects[object[1].title]=repr(object[1].lockedBy) |
lockedObjects[obj.title]=repr(obj.lockedBy) |
|
|
|
|
keys=lockedObjects.keys() |
keys=lockedObjects.keys() |
Line 1294 class CDLIBasketVersion(Implicit,Persist
|
Line 1497 class CDLIBasketVersion(Implicit,Persist
|
self.REQUEST.SESSION['lockedObjects']=lockedObjects |
self.REQUEST.SESSION['lockedObjects']=lockedObjects |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','lockedObjects.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','lockedObjects.zpt')).__of__(self) |
|
|
self.temp_folder.downloadCounterBaskets-=1 |
|
self._p_changed=1 |
|
transaction.get().commit() |
|
|
|
return pt() |
return pt() |
|
|
Line 1306 class CDLIBasketVersion(Implicit,Persist
|
Line 1506 class CDLIBasketVersion(Implicit,Persist
|
|
|
|
|
|
|
|
threadName=repeat |
|
if not threadName or threadName=="": |
|
thread=DownloadBasketFinallyThread() |
|
threadName=thread.getName()[0:] |
|
|
|
if (not hasattr(self,'_v_downloadBasket')): |
|
self._v_downloadBasket={} |
|
|
|
|
|
self._v_downloadBasket[threadName]=thread |
|
logging.debug("dwonloadfinally:"+repr(self)) |
|
|
|
if isinstance(self,CDLIBasketVersion): |
|
obj=self |
|
else: |
|
obj=self.aq_parent |
|
logging.debug("dwonloadfinally2:"+repr(obj)) |
|
logging.debug("dwonloadfinally2:"+repr(obj.aq_parent)) |
|
|
|
obj2=obj.aq_parent |
|
if not isinstance(obj2,CDLIBasket): |
|
obj2=obj2.aq_parent |
|
|
|
basketID=obj2.getId() |
|
versionNumber=obj.getId() |
|
logging.debug("dwonloadfinally2:"+repr(basketID)) |
|
logging.debug("dwonloadfinally2:"+repr(versionNumber)) |
|
|
|
|
|
if lock: |
|
logging.debug("-----start locking") |
for object in self.content.getContent(): |
for object in self.content.getContent(): |
|
obj=self.ctx.getFileObject(object[0]) |
|
if obj.lockedBy =='': |
|
obj.lockedBy=self.REQUEST['AUTHENTICATED_USER'] |
|
logging.debug("-----finished locking") |
|
|
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
#obj.lockedBy=user |
if current=="no": #version as they are in the basket |
self._v_downloadBasket[threadName].set(lock,procedure,self.REQUEST['AUTHENTICATED_USER'],current,basketID,versionNumber) |
ret+=str(object[0].getData())+"\n" |
|
elif current=="yes": |
self._v_downloadBasket[threadName].start() |
#search current object |
|
founds=self.CDLICatalog.search({'title':object[1].getId().split(".")[0]}) |
|
if len(founds)>0: |
|
ret+=str(founds[0].getObject().getLastVersion().getData())+"\n" |
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','downloadBasketWait.zpt')).__of__(self) |
|
|
if lock and object[1].lockedBy=='': |
return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName, |
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] |
counter=self._v_downloadBasket[threadName].getCounter(), |
|
number=self._v_downloadBasket[threadName].getNumberOfFiles()) |
|
#_v_xmltrans.run() |
|
|
|
else: |
|
#recover thread, if lost |
|
if not hasattr(self,'_v_downloadBasket'): |
|
self._v_downloadBasket={} |
|
if not self._v_downloadBasket.get(threadName,None): |
|
for thread in threading.enumerate(): |
|
if threadName == thread.getName(): |
|
self._v_downloadBasket[threadName]=thread |
|
|
|
if self._v_downloadBasket.get(threadName,None) and (self._v_downloadBasket[threadName] is not None) and (not self._v_downloadBasket[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','downloadBasketWait.zpt')).__of__(self) |
|
return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName, |
|
counter=self._v_downloadBasket[threadName].getCounter(), |
|
number=self._v_downloadBasket[threadName].getNumberOfFiles()) |
|
else: |
|
|
|
|
|
logging.debug("FINISHED") |
|
if not self._v_downloadBasket.get(threadName,None): |
|
for thread in threading.enumerate(): |
|
if threadName == thread.getName(): |
|
self._v_downloadBasket[threadName]=thread |
|
|
|
#files = self._v_downloadBasket[threadName].result |
|
# lade die files und die locked files, bei grossen Baskets muss u.U. gewartet werden |
|
# bis das Commit aus dem Thread alles geschrieben hat, in dem Falle existiert resultHash[threadName] |
|
# noch nicht. |
|
o1 = file("/tmp/"+threadName,'r') |
|
files=pickle.load(o1) |
|
os.remove("/tmp/"+threadName) |
|
o2 = file("/tmp/"+threadName+'_lockedFiles','r') |
|
|
|
lockedFiles=pickle.load(o2) |
|
os.remove("/tmp/"+threadName+'_lockedFiles') |
|
# try: |
|
# files=self.basketContainer.resultHash[threadName] |
|
# except: |
|
# i=0 |
|
# while (not self.basketContainer.resultHash.has_key(threadName)) and (i<100): |
|
# logging.debug(" downloadFinally: I am waiting for thread %s to write the resultHashfile: %s"%(threadName,i)) |
|
# time.sleep(5) |
|
# i+=1 |
|
# files=self.basketContainer.resultHash[threadName] |
|
# |
|
# try: |
|
# lockedFiles=self.basketContainer.resultLockedHash[threadName] |
|
# except: |
|
# i=0 |
|
# while (not self.basketContainer.resultLockedHash.has_key(threadName)) and (i<100): |
|
# logging.debug(" downloadFinally: I am waiting for thread %s to write the LockedHashfile: %s"%(threadName,i)) |
|
# time.sleep(5) |
|
# i+=1 |
|
# lockedFiles=self.basketContainer.resultLockedHash[threadName] |
|
|
|
# fh=file("/var/tmp/test") |
|
#ret =fh.read() |
|
|
|
if (not isinstance(self.aq_parent,CDLIBasket)): |
|
basket_name=self.aq_parent.aq_parent.title+"_V"+self.getId() |
|
else: |
basket_name=self.aq_parent.title+"_V"+self.getId() |
basket_name=self.aq_parent.title+"_V"+self.getId() |
|
|
|
|
|
|
#write basketname to header of atf file |
#write basketname to header of atf file |
ret="#basket: %s\n"%basket_name+ret |
|
|
|
self.temp_folder.downloadCounterBaskets-=1 |
|
self._p_changed=1 |
|
transaction.get().commit() |
|
|
|
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.atf" """%basket_name) |
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.atf" """%basket_name) |
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") |
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") |
length=len(ret) |
#length=len(ret) |
self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
#self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
|
|
|
ret="#basket: %s\n"%basket_name |
self.REQUEST.RESPONSE.write(ret) |
self.REQUEST.RESPONSE.write(ret) |
return True |
|
|
for fileName in files: |
|
logging.debug("download: %s"%fileName) |
|
try: |
|
self.REQUEST.RESPONSE.write(file(fileName).read()) |
|
except: |
|
logging.error("downloadasonefile: cannot read %s"%fileName) |
|
|
|
|
|
self.REQUEST.RESPONSE.write("\n# locked files\n") |
|
for fileName in lockedFiles: |
|
self.REQUEST.RESPONSE.write("# %s by %s\n"%fileName) |
|
|
|
self.REQUEST.RESPONSE.write("# locked files end\n") |
|
|
|
#del self.basketContainer.resultHash[threadName] |
|
#del self.basketContainer.resultLockedHash[threadName] |
|
|
def numberOfItems(self): |
def numberOfItems(self): |
"""return anzahl der elemente im basket""" |
"""return anzahl der elemente im basket""" |
Line 1353 class CDLIBasketVersion(Implicit,Persist
|
Line 1676 class CDLIBasketVersion(Implicit,Persist
|
|
|
def getContent(self): |
def getContent(self): |
"""get Basket Content""" |
"""get Basket Content""" |
return self.content.getContent() |
logging.debug("retrieving content A") |
|
cnt = self.content |
|
logging.debug("retrieving content: obj %s"%cnt) |
|
tmp = self.content.getContent() |
|
logging.debug("got content") |
|
return tmp |
|
|
|
|
def __init__(self,id,user,comment="",basketContent=[]): |
def __init__(self,id,user,comment="",basketContent=[]): |
Line 1373 class CDLIBasketVersion(Implicit,Persist
|
Line 1701 class CDLIBasketVersion(Implicit,Persist
|
"""get Comment""" |
"""get Comment""" |
return self.comment |
return self.comment |
|
|
security.declareProtected('View','index_html') |
security.declareProtected('manage','index_html') |
def index_html(self): |
def index_html(self): |
"""view the basket""" |
"""view the basket""" |
|
logging.debug("start index_html - Basket version") |
if self.REQUEST.get('change',False): |
if self.REQUEST.get('change',False): |
ob=self.aq_parent.updateObjects(self.REQUEST['change']) |
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 |
self.REQUEST.RESPONSE.redirect(ob.absolute_url())#go to new basket, because changing generates a new basket |
|
logging.debug("start index_html - Basket version:template") |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self) |
return pt() |
return pt() |
|
|
def getObjUrl(self,result): |
def getObjUrl(self,result): |
"""getUrl of the version of the object""" |
"""getUrl of the version of the object""" |
objId=result[1].getTitle() |
|
founds=self.CDLICatalog.search({'title':objId}) |
founds=self.CDLICatalog.search({'title':result}) |
if len(founds)>0: |
if len(founds)>0: |
return founds[0].getObject().getLastVersion().absolute_url() |
return founds[0].getObject().getLastVersion().absolute_url() |
|
|
else: #assume version number |
else: #assume version number |
splitted=objId.split("_") |
splitted=result.split("_") |
founds=self.CDLICatalog.search({'title':splitted[1]}) |
founds=self.CDLICatalog.search({'title':splitted[1]}) |
return founds[0].getObject().getLastVersion().absolute_url()+'/'+objId |
return founds[0].getObject().getLastVersion().absolute_url()+'/'+result |
|
|
def manage_addCDLIBasketVersion(self,user,comment="",basketContent=[],RESPONSE=None): |
def manage_addCDLIBasketVersion(self,user,comment="",basketContent=[],RESPONSE=None): |
"""add a version""" |
"""add a version""" |
Line 1425 class CDLIFileObject(CatalogAware,extVer
|
Line 1753 class CDLIFileObject(CatalogAware,extVer
|
|
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
|
|
|
security.declareProtected('manage','index_html') |
|
|
security.declarePublic('makeThisVersionCurrent') |
security.declarePublic('view') |
|
view = PageTemplateFile('zpt/viewCDLIFile.zpt', globals()) |
|
|
|
security.declarePublic('editATF') |
|
editATF = PageTemplateFile('zpt/editATFFile.zpt', globals()) |
|
|
def PrincipiaSearchSource(self): |
def PrincipiaSearchSource(self): |
"""Return cataloguable key for ourselves.""" |
"""Return cataloguable key for ourselves.""" |
return str(self) |
return str(self) |
|
|
|
def setAuthor(self, author): |
|
"""change the author""" |
|
self.author = author |
|
|
def makeThisVersionCurrent_html(self): |
def makeThisVersionCurrent_html(self): |
"""form for making this version current""" |
"""form for mthis version current""" |
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self) |
return pt() |
return pt() |
|
|
|
security.declarePublic('makeThisVersionCurrent') |
def makeThisVersionCurrent(self,comment,author,RESPONSE=None): |
def makeThisVersionCurrent(self,comment,author,RESPONSE=None): |
"""copy this version to current""" |
"""copy this version to current""" |
parent=self.aq_parent |
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: |
newversion=parent.manage_addCDLIFileObject('',comment,author) |
# RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') |
newversion.manage_upload(self.getData()) |
|
|
|
if RESPONSE is not None: |
|
RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') |
|
|
|
|
|
return True |
return True |
|
|
security.declarePublic('view') |
|
|
|
def getFormattedData(self): |
def getFormattedData(self): |
"""fromat text""" |
"""fromat text""" |
data=self.getData() |
data=self.getData() |
# return re.sub("\s\#lem"," #lem",data) #remove return vor #lem |
# return re.sub("\s\#lem"," #lem",data) #remove return vor #lem |
return re.sub("#lem"," #lem",data) #remove return vor #lem |
return re.sub("#lem"," #lem",data) #remove return vor #lem |
|
|
def view(self): |
|
"""view file""" |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) |
|
return pt() |
|
|
|
security.declarePublic('getPNumber') |
security.declarePublic('getPNumber') |
def getPNumber(self): |
def getPNumber(self): |
Line 1492 class CDLIFileObject(CatalogAware,extVer
|
Line 1823 class CDLIFileObject(CatalogAware,extVer
|
except: |
except: |
return "ERROR" |
return "ERROR" |
|
|
|
|
manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') |
manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') |
|
|
def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='', |
def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',versionNumber=0, |
|
precondition='', content_type='', |
from_tmp=False,REQUEST=None): |
from_tmp=False,REQUEST=None): |
"""Add a new File object. |
"""Add a new File object. |
|
|
Creates a new File object 'id' with the contents of 'file'""" |
Creates a new File object 'id' with the contents of 'file'""" |
|
|
id=str(id) |
id=str(id) |
Line 1510 def manage_addCDLIFileObject(self,id,vC=
|
Line 1842 def manage_addCDLIFileObject(self,id,vC=
|
self=self.this() |
self=self.this() |
|
|
# First, we create the file without data: |
# First, we create the file without data: |
self._setObject(id, CDLIFileObject(id,title,'',content_type, precondition)) |
self._setObject(id, CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=vC,time=time.localtime(),author=author)) |
self._getOb(id).versionComment=str(vC) |
fob = self._getOb(id) |
self._getOb(id).time=time.localtime() |
|
|
|
setattr(self._getOb(id),'author',author) |
|
|
|
|
|
# Now we "upload" the data. By doing this in two steps, we |
# Now we "upload" the data. By doing this in two steps, we |
# can use a database trick to make the upload more efficient. |
# can use a database trick to make the upload more efficient. |
|
|
if file and not from_tmp: |
if file and not from_tmp: |
self._getOb(id).manage_upload(file) |
fob.manage_upload(file) |
elif file and from_tmp: |
elif file and from_tmp: |
self._getOb(id).manage_upload_from_tmp(file) |
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: |
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() |
self.reindex_object() |
self._getOb(id).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: |
if REQUEST is not None: |
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') |
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') |
|
|
|
|
class CDLIFile(extVersionedFile,CatalogAware): |
class CDLIFile(extVersionedFile,CatalogAware): |
"""CDLI file""" |
"""CDLI file""" |
|
|
|
security=ClassSecurityInfo() |
meta_type="CDLI file" |
meta_type="CDLI file" |
|
content_meta_type = ["CDLI File Object"] |
|
|
default_catalog='CDLICatalog' |
default_catalog='CDLICatalog' |
|
|
#security.declarePublic('history') |
security.declareProtected('manage','index_html') |
|
|
def getLastVersionData(self): |
def getLastVersionData(self): |
"""get last version data""" |
"""get last version data""" |
return self.getLastVersion().getData() |
return self.getData() |
|
|
def getLastVersionFormattedData(self): |
def getLastVersionFormattedData(self): |
"""get last version data""" |
"""get last version data""" |
return self.getLastVersion().getFormattedData() |
return self.getContentObject().getFormattedData() |
|
|
#security.declarePublic('history') |
|
|
|
|
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): |
def history(self): |
"""history""" |
"""history""" |
|
|
Line 1595 class CDLIFile(extVersionedFile,CatalogA
|
Line 1937 class CDLIFile(extVersionedFile,CatalogA
|
#return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] |
#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): |
def addCDLIFileObjectForm(self): |
"""add a new version""" |
"""add a new version""" |
|
|
Line 1620 class CDLIFile(extVersionedFile,CatalogA
|
Line 1968 class CDLIFile(extVersionedFile,CatalogA
|
except: |
except: |
pass |
pass |
|
|
|
ob = self.addContentObject(id, vC, author, file, title, changeName=changeName, newName=newName, from_tmp=from_tmp, |
|
precondition=precondition, content_type=content_type) |
|
|
if changeName=="yes": |
|
filename=file.filename |
|
self.title=filename[max(filename.rfind('/'), |
|
filename.rfind('\\'), |
|
filename.rfind(':'), |
|
)+1:] |
|
|
|
|
|
if not newName=='': |
|
self.title=newName[0:] |
|
|
|
|
|
|
|
|
|
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,from_tmp=from_tmp) |
|
#objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) |
|
objs=getattr(self,id).setVersionNumber(int(self.getVersion())) |
|
try: |
try: |
#FIXME: wozu ist das gut? |
#FIXME: wozu ist das gut? |
self.REQUEST.SESSION['objID_parent']=self.getId() |
self.REQUEST.SESSION['objID_parent']=self.getId() |
except: |
except: |
pass |
pass |
|
|
if RESPONSE: |
#self.cdliRoot.updateOrAddToFileBTree(self)# now update the object in the cache |
|
|
|
|
obj=self.ZopeFind(self,obj_ids=[id])[0][1] |
if RESPONSE: |
if obj.getSize()==0: |
if ob.getSize()==0: |
self.REQUEST.SESSION['objID']=obj.getId() |
self.REQUEST.SESSION['objID']=ob.getId() |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
return pt() |
return pt() |
|
|
else: |
else: |
if come_from and (come_from!=""): |
if come_from and (come_from!=""): |
RESPONSE.redirect(come_from+"?change="+self.getId()) |
RESPONSE.redirect(come_from+"?change="+self.getId()) |
else: |
else: |
RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title) |
RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title) |
|
|
else: |
else: |
return self.ZopeFind(self,obj_ids=[id])[0][1] |
return ob |
|
|
|
|
def manage_addCDLIFileForm(self): |
def manage_addCDLIFileForm(self): |
Line 1686 def manage_addCDLIFile(self,id,title,loc
|
Line 2006 def manage_addCDLIFile(self,id,title,loc
|
tryToggle=True |
tryToggle=True |
tryCount=0 |
tryCount=0 |
|
|
|
|
|
|
self._setObject(id,newObj) |
self._setObject(id,newObj) |
getattr(self,id).reindex_object() |
getattr(self,id).reindex_object() |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
|
|
|
|
def checkUTF8(data): |
def checkUTF8(data): |
"""check utf 8""" |
"""check utf 8""" |
try: |
try: |
Line 1724 def splitatf(fh,dir=None,ext=None):
|
Line 2043 def splitatf(fh,dir=None,ext=None):
|
nf=None |
nf=None |
i=0 |
i=0 |
|
|
|
#ROC: why split \n first and then \r??? |
if (type(fh) is StringType) or (type(fh) is UnicodeType): |
if (type(fh) is StringType) or (type(fh) is UnicodeType): |
iter=fh.split("\n") |
iter=fh.split("\n") |
else: |
else: |
Line 1777 class CDLIFileFolder(extVersionedFileFol
|
Line 2097 class CDLIFileFolder(extVersionedFileFol
|
|
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
meta_type="CDLI Folder" |
meta_type="CDLI Folder" |
filesMetaType=['CDLI file'] |
file_meta_type=['CDLI file'] |
folderMetaType=['CDLI Folder'] |
folder_meta_type=['CDLI Folder'] |
default_catalog='CDLICatalog' |
|
defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzufŸgen einer neuen version eines files dieser catalog neuiniziert |
file_catalog='CDLICatalog' |
|
|
#downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert. |
#downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert. |
tmpStore2={} |
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): |
def setTemp(self,name,value): |
"""set tmp""" |
"""set tmp""" |
|
|
setattr(self,name,value) |
setattr(self,name,value) |
|
|
|
deleteFileForm = PageTemplateFile("zpt/doDeleteFile", globals()) |
|
|
def delete(self,ids): |
def delete(self,ids,REQUEST=None): |
"""delete this file, i.e. move into a trash folder""" |
"""delete these files""" |
|
if type(ids) is not ListType: |
|
ids=[ids] |
|
|
found=self.ZopeFind(self,obj_ids=['.trash']) |
self.manage_delObjects(ids) |
|
|
if len(found)<1: |
if REQUEST is not None: |
manage_addCDLIFileFolder(self, '.trash',title="Trash") |
return self.index_html() |
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 getVersionNumbersFromIds(self,ids): |
def getVersionNumbersFromIds(self,ids): |
"""get the numbers of the current versions of documents described by their ids""" |
"""get the numbers of the current versions of documents described by their ids""" |
Line 1814 class CDLIFileFolder(extVersionedFileFol
|
Line 2137 class CDLIFileFolder(extVersionedFileFol
|
founds=self.CDLICatalog.search({'title':searchStr}) |
founds=self.CDLICatalog.search({'title':searchStr}) |
|
|
for found in founds: |
for found in founds: |
lastVersion=found.getObject().getLastVersion() |
lastVersion=found.getObject().getContentObject() |
ret.append((found.getId,lastVersion)) |
ret.append((found.getId,lastVersion)) |
|
|
return ret |
return ret |
|
|
def getFile(self,fn): |
def getFile(self,fn): |
"""get the content of the file fn""" |
"""get the content of the file fn""" |
founds=self.CDLICatalog.search({'title':fn}) |
logging.debug("getFile: %s"%repr(fn)) |
if not founds: |
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 "" |
return "" |
else: |
else: |
obj=founds[0].getObject().getLastVersion() |
obj = self[fn].getContentObject() |
|
|
return obj.getData()[0:] |
return obj.getData()[0:] |
|
|
|
|
def checkCatalog(self,fn): |
def checkCatalog(self,fn): |
"""check if fn is in the catalog""" |
"""check if fn is in the catalog""" |
#TODO add checkCatalog |
#TODO add checkCatalog |
|
|
|
|
|
|
def findObjectsFromListWithVersion(self,list,author=None): |
def findObjectsFromListWithVersion(self,list,author=None): |
"""find objects from a list with versions |
"""find objects from a list with versions |
@param list: list of tuples (cdliFile,version) |
@param list: list of tuples (cdliFile,version) |
""" |
""" |
|
|
|
|
|
|
#self.REQUEST.SESSION['fileIds']=list#store fieldIds in session for further usage |
#self.REQUEST.SESSION['fileIds']=list#store fieldIds in session for further usage |
#self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] |
#self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] |
|
|
|
|
pt=getattr(self,'filelistVersioned.html') |
pt=getattr(self,'filelistVersioned.html') |
|
|
return pt(search=list,author=author) |
return pt(search=list,author=author) |
Line 1858 class CDLIFileFolder(extVersionedFileFol
|
Line 2182 class CDLIFileFolder(extVersionedFileFol
|
|
|
return ret |
return ret |
|
|
def findObjectsFromList(self,enterList=None,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): |
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)""" |
"""findObjectsFromList (, TAB oder LINE separated)""" |
|
|
|
logging.debug("start: findObjectsFromList") |
|
#logging.debug("start: findObjectsFromList"+repr(list)) |
|
|
|
|
if upload: # list from file upload |
if upload: # list from file upload |
txt=upload.read() |
txt=upload.read() |
Line 1892 class CDLIFileFolder(extVersionedFileFol
|
Line 2226 class CDLIFileFolder(extVersionedFileFol
|
pt=getattr(self,'filelist.html') |
pt=getattr(self,'filelist.html') |
return pt(basketName=basketName,numberOfObjects=numberOfObjects) |
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 |
if list is not None: # got already a list |
|
|
|
logging.debug(" ----List version") |
ret=[] |
ret=[] |
|
fileTree=Set() |
|
|
for fileId in list: |
for fileId in list: |
if fileId.find("*"): #check for wildcards |
|
fileId=fileId |
if fileId.find("*")>-1: #check for wildcards |
|
self.expandFile(fileId,fileTree) |
|
|
elif len(fileId.split("."))==1: |
elif len(fileId.split("."))==1: |
fileId=fileId+".atf" |
fileId=fileId+".atf" |
|
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 |
|
|
ret+=self.CDLICatalog({'title':fileId}) |
|
#TODO: get rid of one of these.. |
#TODO: get rid of one of these.. |
ids=[x.getObject().getId() for x in ret] |
#ids=[x.getObject().getId() for x in ret] |
self.REQUEST.SESSION['fileIds']=ids#store fieldIds in session for further usage |
ret=[(self.getFileObject(x),self.getFileObjectLastVersion(x)) for x in ids] |
self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] |
|
|
#self.REQUEST.SESSION['fileIds']=ids#store fieldIds in session for further usage |
|
#self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] |
|
|
if display: |
if display: |
pt=getattr(self,'filelist.html') |
pt=getattr(self,'filelist.html') |
|
|
return pt(search=ids) |
return pt(search=ids) |
else: |
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 |
return ret |
|
|
|
|
Line 1918 class CDLIFileFolder(extVersionedFileFol
|
Line 2304 class CDLIFileFolder(extVersionedFileFol
|
if start: |
if start: |
RESPONSE.redirect("filelist.html?start:int="+str(start)) |
RESPONSE.redirect("filelist.html?start:int="+str(start)) |
|
|
|
|
security.declareProtected('Manage','createAllFilesAsSingleFile') |
security.declareProtected('Manage','createAllFilesAsSingleFile') |
def createAllFilesAsSingleFile(self,RESPONSE=None): |
def createAllFilesAsSingleFile(self,RESPONSE=None): |
"""download all files""" |
"""download all files""" |
Line 1926 class CDLIFileFolder(extVersionedFileFol
|
Line 2311 class CDLIFileFolder(extVersionedFileFol
|
def sortF(x,y): |
def sortF(x,y): |
return cmp(x[0],y[0]) |
return cmp(x[0],y[0]) |
|
|
catalog=getattr(self,self.default_catalog) |
catalog=getattr(self,self.file_catalog) |
#tf,tfilename=mkstemp() |
#tf,tfilename=mkstemp() |
if not hasattr(self.temp_folder,'downloadCounter'): |
if not hasattr(self.temp_folder,'downloadCounter'): |
self.temp_folder.downloadCounter=0 |
self.temp_folder.downloadCounter=0 |
Line 1953 class CDLIFileFolder(extVersionedFileFol
|
Line 2338 class CDLIFileFolder(extVersionedFileFol
|
|
|
#os.write(tf,obj.getLastVersion().data) |
#os.write(tf,obj.getLastVersion().data) |
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(obj.getLastVersion().getData()[0:]) |
RESPONSE.write(obj.getData()[0:]) |
RESPONSE.write("\n") |
RESPONSE.write("\n") |
self.temp_folder.downloadCounter-=1 |
self.temp_folder.downloadCounter-=1 |
self._p_changed=1 |
self._p_changed=1 |
Line 1973 class CDLIFileFolder(extVersionedFileFol
|
Line 2358 class CDLIFileFolder(extVersionedFileFol
|
def hasParent(self): |
def hasParent(self): |
"""returns true falls subfolder""" |
"""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 |
return True |
else: |
else: |
return False |
return False |
Line 1981 class CDLIFileFolder(extVersionedFileFol
|
Line 2366 class CDLIFileFolder(extVersionedFileFol
|
def getFolders(self): |
def getFolders(self): |
"""get all subfolders""" |
"""get all subfolders""" |
ret=[] |
ret=[] |
folders=self.ZopeFind(self,obj_metatypes=self.folderMetaType) |
folders=self.ZopeFind(self,obj_metatypes=self.folder_meta_type) |
for folder in folders: |
for folder in folders: |
ret.append((folder[1], |
ret.append((folder[1], |
len(self.ZopeFind(folder[1],obj_metatypes=self.folderMetaType)), |
len(self.ZopeFind(folder[1],obj_metatypes=self.folder_meta_type)), |
len(self.ZopeFind(folder[1],obj_metatypes=self.filesMetaType)) |
len(self.ZopeFind(folder[1],obj_metatypes=self.file_meta_type)) |
)) |
)) |
return ret |
return ret |
|
|
|
|
security.declareProtected('View','index_html') |
security.declareProtected('manage','index_html') |
def index_html(self): |
def index_html(self): |
"""main""" |
"""main""" |
ext=self.ZopeFind(self,obj_ids=["index.html"]) |
ext=self.ZopeFind(self,obj_ids=["index.html"]) |
Line 2039 class CDLIRoot(Folder):
|
Line 2424 class CDLIRoot(Folder):
|
meta_type="CDLIRoot" |
meta_type="CDLIRoot" |
downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible |
downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible |
|
|
def deleteFiles(self,ids): |
file_catalog = 'CDLICatalog' |
"""delete files (resp. move into .trash folder)""" |
|
# find or generete trash folder |
|
|
|
found=self.ZopeFind(self,obj_ids=['.trash']) |
|
|
|
if len(found)<1: |
|
manage_addCDLIFileFolder(self, '.trash',title="Trash") |
|
trash=self._getOb('.trash') |
|
else: |
|
logging.info(found) |
|
trash=found[0][1] |
|
|
|
|
|
for id in ids: |
|
founds=self.CDLICatalog.search({'title':id.split(".")[0]}) |
|
if founds: |
|
logging.info(founds) |
|
folder=founds[0].getObject().aq_parent #get the parent folder of the object |
|
logging.info(folder) |
|
cut=folder.manage_cutObjects([founds[0].getId]) #cut it out |
|
trash.manage_pasteObjects(cut) #paste it in the trash |
|
|
|
|
|
def findWordRegExp(self,indexName,searchTerm): |
|
"""find all words in index which match regexp in SearchTerm |
|
@param indexName: name of the index to be searched in |
|
@param searchTerm: word to be searched""" |
|
|
|
ret=[] |
|
for x in self.lineIndexes[indexName].iterkeys(): |
|
if re.match(searchTerm,x): |
|
ret.append(x) |
|
return ret |
|
|
|
def searchRegExpInLineIndexDocs(self,indexName,searchTerm): |
# word splitter for search |
"""search in inLineIndex with regexp |
splitter = {'words':cdliSplitter.wordSplitter(), |
@param indexName: name of the index to be searched in |
'graphemes':cdliSplitter.graphemeSplitter()} |
@param searchTerm: term to be searched |
|
""" |
|
if not searchTerm: |
def unicodify(self,txt): |
return [] |
return unicodify(txt) |
ret=[] |
def invalidateOldCacheVersion(self): |
words=self.findWordRegExp(indexName,searchTerm) # suche nach allen Treffern |
"""loescht die alte Version des Cache""" |
logging.info("wd:%s"%words) |
del self.v_tmpStore |
for word in words: |
return "done" |
|
|
ret+=self.searchInLineIndexDocs(indexName,word) |
def viewATF(self,id,RESPONSE): |
|
"""view an Object""" |
|
ob = self.CDLICatalog({'title':id}) |
x= unique(ret) |
logging.debug(ob[0].getObject().getLastVersion().absolute_url()+"/view") |
logging.info("words_done") |
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: |
|
RESPONSE.redirect(ob[0].getLastVersion().absolute_url()) |
|
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""" |
|
x=self.v_files.get(fileId) |
|
#logging.debug(x) |
return x |
return x |
|
|
def showInLineIndex(self): |
def getFileObjectLastVersion(self,fileId): |
"""get the index for debug purposes""" |
"""get an object""" |
print "show" |
x=self.v_files_lastVersion.get(fileId) |
for key in self.lineIndexes.keys(): |
#logging.debug("lastVersion: "+repr(x)) |
logging.info("index:%s"%key) |
return x |
for x in self.lineIndexes[key].iterkeys(): |
|
logging.info("word:%s"%repr(x)) |
|
#for y in self.lineIndex[x].iterkeys(): |
|
# print "doc",repr(y),repr(self.lineIndex[x][y]) |
|
|
|
return self.lineIndexes |
|
|
|
def searchInLineIndexDocs(self,indexName,word,uniq=True,regExp=False): |
|
"""search occurences in an index |
|
@param indexName: name of the index to be searched in |
|
@param word: word to be searched |
|
@param unique: (optional) unify the list of results |
|
@param regExp: (optional) use regular expressions |
|
""" |
|
|
|
if regExp: |
|
return self.searchRegExpInLineIndexDocs(indexName,word) |
|
|
|
try: |
|
|
|
lst=list(self.lineIndexes[indexName].get(word).keys()) |
|
except: |
|
logging.error("error: searchInLineIndexDocs (%s %s)"%(sys.exc_info()[0:2])) |
|
lst=[] |
|
if uniq: |
|
return unique(lst) |
|
else: |
|
return lst |
|
|
|
def getLinesFromIndex(self,indexName,word,doc,regExp=False): |
|
"""return all lines from a document where word is found |
|
@param indexName: Name of the index |
|
@param word: word to be searched |
|
@param doc: name of the document (usuallay the p-number) |
|
@param regExp: (optional) use regExp |
|
""" |
|
|
|
if not regExp: |
|
return self.lineIndexes[indexName].get(word)[doc] |
|
else: # wenn regexp, suche welches word |
|
for w in self.findWordRegExp(indexName,word): |
|
if self.lineIndexes[indexName].get(w): # ein word in im dex gefunden |
|
try: |
|
dc=self.lineIndex[indexName].get(word)[doc] |
|
return dc # und ein document dann gib es zurueck |
|
except: |
|
pass #andernfalls weiter |
|
|
|
def cleanInLineIndex(self,indexName): |
|
"""empty an InlineIndex |
|
@param indexName: name of the index |
|
""" |
|
for x in list(self.lineIndexes[indexName].keys()): |
|
del(self.lineIndexes[indexName][x]) |
|
print [x for x in self.lineIndexes[indexName].keys()] |
|
|
|
return "ok" |
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())) |
|
|
def storeInLineIndex(self,indexName,key,value): |
return True |
"""store in index, key is normally a word or grapheme |
|
and value is a tuple (documentname, line) where the word can be found |
|
@param indexName: name of the index |
|
@param key: key in index |
|
@param value: value in index, value is a tuple (document name, line) |
|
""" |
|
logging.error("indexing: %s %s"%(indexName,key)) |
|
if (not hasattr(self,'lineIndexes')): |
|
|
|
self.lineIndexes={} |
|
|
|
if self.lineIndexes.get(indexName,None) is None: |
|
#index exisitiert noch nicht dann anlegen |
|
|
|
self.lineIndexes[indexName]=OOBTree() |
def updateOrAddToFileBTree(self,obj): |
lis=self.lineIndexes |
"""update a BTree""" |
li=lis[indexName] |
self.v_files.update({obj.getId():obj}) |
|
self.v_files_lastVersion.update({obj.getId():obj.getLastVersion()}) |
|
|
|
self.v_file_ids.add(obj.getId()) |
|
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) |
|
|
if li.has_key(key): |
|
|
|
# if li[key].has_key(value[0]) and (not (value[1] in li[key][value[0]])): |
|
if li[key].has_key(value[0]): |
|
tmp=li[key][value[0]] |
|
tmp.append(value[1]) # add it if now in the array |
|
li[key][value[0]]=tmp[0:] |
|
else: |
|
li[key][value[0]]=[value[1]] # new array for lines |
|
|
|
else: |
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 |
|
|
li[key]=OOBTree()# new btree for lines |
|
li[key][value[0]]=[value[1]] |
|
|
|
|
|
self.lineIndexes=lis |
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 "" |
|
|
transaction.get().commit() |
return f[0].getObject().getData() |
|
|
|
|
def showFile(self,fileId,wholePage=False): |
def showFile(self,fileId,wholePage=False): |
"""show a file |
"""show a file |
@param fileId: P-Number of the document to be displayed |
@param fileId: P-Number of the document to be displayed |
""" |
""" |
f=self.CDLICatalog({'title':fileId}) |
f=getattr(self, self.file_catalog).search({'textid':fileId}) |
if not f: |
if not f: |
return "" |
return "" |
|
|
if wholePage: |
if wholePage: |
logging.info("whole") |
logging.debug("show whole page") |
return f[0].getObject().getLastVersion().view() |
return f[0].getObject().getContentObject().view() |
else: |
else: |
return f[0].getObject().getLastVersionFormattedData() |
return f[0].getObject().getLastVersionFormattedData() |
|
|
|
|
def showWordInFile(self,fileId,word,lineList=None,regExp=True,indexName=""): |
def showWordInFile(self,fileId,word,indexName='graphemes',regExp=False,): |
"""get lines with word fromFileId""" |
"""get lines with word fromFileId""" |
|
logging.debug("showwordinfile word='%s' index=%s file=%s"%(word,indexName,fileId)) |
|
|
file=self.showFile(fileId) |
file = formatAtfFullLineNum(self.getFile(fileId)) |
logging.info("regEXP %s"%regExp) |
|
ret=[] |
ret=[] |
if regExp: # wenn regexp dann generiere alle worte aus der list die der regexp entsprechen |
|
wordlist=self.findWordRegExp(indexName,word) |
|
else: |
|
wordlist=[word] |
|
|
|
for line in file.split("\n"): |
# add whitespace before and whitespace and line-end to splitter bounds expressions |
found=False |
bounds = self.splitter[indexName].bounds |
for word in wordlist: |
splitexp = "(%s|\s)(%%s)(%s|\s|\Z)"%(bounds,bounds) |
try: # just a hack because of possible unicode errors in line |
# clean word expression |
if line.find(word)>-1: |
# TODO: this should use QueryParser itself |
if lineList: #liste of moeglichen Zeilennummern |
# take out double quotes |
num=line.split(".")[0] #Zeilenummer ist alles vor dem . in der Zeile |
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(' ')] |
|
|
if num in lineList: |
for line in file.splitlines(): |
|
for word in wordlist: |
ret.append(line) |
#logging.debug("showwordinfile: searching for %s in %s"%(word.pattern,ignoreable.sub('',line))) |
else: # nimm alles ohne line check |
if word.search(ignorable.sub('',line)): |
|
line = formatAtfLineHtml(line) |
ret.append(line) |
ret.append(line) |
|
break |
|
|
break; |
|
except: |
|
pass |
|
return ret |
return ret |
|
|
def tagWordInFile(self,fileId,word,lineList=None,regExp=True,indexName=""): |
|
"""get lines with word fromFileId""" |
|
|
|
file=self.showFile(fileId) |
def showWordInFiles(self,fileIds,word,indexName='graphemes',regExp=False): |
tagStr="""<span class="found">%s</span>""" |
""" |
|
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'<span class="found">' |
|
tagEnd=u'</span>' |
|
tagStr=tagStart + u'%%s' + tagEnd |
ret=[] |
ret=[] |
|
|
if regExp: # wenn regexp dann generiere alle worte aus der list die der regexp entsprechen |
# add whitespace to splitter bounds expressions and compile into regexp object |
wordlist=self.findWordRegExp(indexName,word) |
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: |
else: |
wordlist=[word] |
line += formatAtfHtml(p) |
|
|
for line in file.split("\n"): |
else: |
found=False |
# no hits |
for word in wordlist: |
line = formatAtfHtml(line) |
if line.find(word)>-1: #word ist gefunden dann makiere und breche die Schleife ab |
|
if lineList: #liste of moeglichen Zeilennummern |
|
num=line.split(".")[0] #Zeilenummer ist alles vor dem . in der Zeile |
|
|
|
if num in lineList: |
ret.append(line) |
|
|
|
return u'<br>\n'.join(ret) |
|
|
ret.append(line.replace(word,tagStr%word)) |
|
|
|
else: # nimm alles ohne line check |
|
ret.append(line.replace(word,tagStr%word)) |
|
found=True |
|
break |
|
if not found: #word wurde nicht gefunden keine makierung |
|
ret.append(line) |
|
|
|
return "<br>\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): |
def URLquote(self,str): |
"""quote url""" |
"""quote url""" |
Line 2345 class CDLIRoot(Folder):
|
Line 2793 class CDLIRoot(Folder):
|
|
|
return """ 2;url=%s?repeat=%s """%(self.absolute_url()+txt,threadName) |
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): |
def getResult(self,threadName=None): |
"""result of thread""" |
"""result of thread""" |
Line 2521 class CDLIRoot(Folder):
|
Line 2974 class CDLIRoot(Folder):
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self) |
return pt(txt='/uploadATFfinally',threadName=threadName) |
return pt(txt='/uploadATFfinally',threadName=threadName) |
else: |
else: |
|
|
|
|
|
idTmp=self.REQUEST.SESSION['idTmp'] |
|
stObj=getattr(self.temp_folder,idTmp) |
self.REQUEST.SESSION['idTmp']=None |
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])) |
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect(self.absolute_url()) |
RESPONSE.redirect(self.absolute_url()) |
|
|
def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/atf", files=None,ext=None): |
def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/atf", files=None,ext=None): |
"""import files""" |
"""import files""" |
|
logging.debug("importFiles folderName=%s files=%s ext=%s"%(folderName,files,ext)) |
root=self.cdli_main |
root=self.cdli_main |
count=0 |
count=0 |
if not files: |
if not files: |
Line 2535 class CDLIRoot(Folder):
|
Line 3002 class CDLIRoot(Folder):
|
for f in files: |
for f in files: |
folder=f[0:3] |
folder=f[0:3] |
f2=f[0:5] |
f2=f[0:5] |
|
|
|
#check if main folder PXX already exists |
obj=self.ZopeFind(root,obj_ids=[folder]) |
obj=self.ZopeFind(root,obj_ids=[folder]) |
|
logging.debug("importFiles: folder=%s f2=%s obj=%s"%(folder,f2,obj)) |
if ext: |
if ext: |
|
|
ext.result="<p>adding: %s </p>"%f+ext.result |
ext.result="<p>adding: %s </p>"%f+ext.result |
if not obj: |
|
|
|
|
if not obj: # if not create it |
manage_addCDLIFileFolder(root,folder,folder) |
manage_addCDLIFileFolder(root,folder,folder) |
fobj=getattr(root,folder) |
fobj=getattr(root,folder) |
#transaction.get().commit() |
#transaction.get().commit() |
|
|
else: |
else: |
fobj=obj[0][1] |
fobj=obj[0][1] |
|
|
|
#check IF PYYYYY already exist |
obj2=fobj.ZopeFind(fobj,obj_ids=[f2]) |
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) |
manage_addCDLIFileFolder(fobj,f2,f2) |
fobj2=getattr(fobj,f2) |
fobj2=getattr(fobj,f2) |
|
|
else: |
else: |
fobj2=obj2[0][1] |
fobj2=obj2[0][1] |
|
|
|
# not add the file |
file2=os.path.join(folderName,f) |
file2=os.path.join(folderName,f) |
id=f |
id=f |
manage_addCDLIFile(fobj2,f,'','') |
logging.debug("importFiles: addCDLIFile fobj2=%s, f=%s file2=%s"%(fobj2,repr(f),repr(file2))) |
id=f |
fobj2.addFile(vC='',file=file(file2),author=author,newName=f) |
ob=fobj2._getOb(f) |
|
ob.title=id |
|
|
|
manage_addCDLIFileObject(ob,id,comment,author,file2,content_type='',from_tmp=True) |
|
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]) |
|
count+=1 |
count+=1 |
|
|
if count > 1000: |
#now add the file to the storage |
print "committing" |
ob = getattr(fobj2,f) |
|
self.cdliRoot.updateOrAddToFileBTree(ob) |
|
|
|
if count%100==0: |
|
logging.debug("importfiles: committing") |
transaction.get().commit() |
transaction.get().commit() |
count=0 |
|
transaction.get().commit() |
transaction.get().commit() |
return "ok" |
return "ok" |
|
|