version 1.57, 2007/01/09 16:06:09
|
version 1.80.2.6, 2007/11/02 15:37:46
|
Line 23 from ZPublisher.BaseRequest import Reque
|
Line 23 from ZPublisher.BaseRequest import Reque
|
import threading |
import threading |
from BTrees.OOBTree import OOBTree |
from BTrees.OOBTree import OOBTree |
import logging |
import logging |
|
import transaction |
|
import copy |
|
import codecs |
|
import sys |
|
|
|
import cdliSplitter |
|
|
|
|
|
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.split("\n"): |
|
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 = 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): |
|
"""erzeugt das xml file als returnwert fuer uploadATFRPC""" |
|
|
|
ret="<return>" |
|
|
|
ret+="<errors>" |
|
for error in hash['errors']: |
|
ret+="""<error atf="%s">%s</error>"""%error |
|
|
|
ret+="</errors>" |
|
|
|
ret+="<changes>" |
|
for changed in hash['changed']: |
|
ret+="""<change atf="%s">%s</change>"""%changed |
|
ret+="</changes>" |
|
|
|
ret+="<newPs>" |
|
for new in hash['newPs']: |
|
ret+="""<new atf="%s"/>"""%new |
|
ret+="</newPs>" |
|
|
|
ret+="</return>" |
|
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 135 class uploadATFfinallyThread(Thread):
|
Line 263 class uploadATFfinallyThread(Thread):
|
self.username=username |
self.username=username |
self.serverport=serverport |
self.serverport=serverport |
|
|
|
|
def __call__(self): |
def __call__(self): |
"""call of the thread (equals run)""" |
"""call of the thread (equals run)""" |
self.run() |
self.run() |
Line 167 class uploadATFfinallyThread(Thread):
|
Line 296 class uploadATFfinallyThread(Thread):
|
#add the files |
#add the files |
self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username) |
self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username) |
#commit the transactions |
#commit the transactions |
get_transaction().commit() |
transaction.get().commit() |
conn.close() |
conn.close() |
#set flag for end of this method |
#set flag for end of this method |
self.end=True |
self.end=True |
print "ended" |
logging.info("ended") |
return True |
return True |
|
|
def __del__(self): |
def __del__(self): |
Line 192 class uploadATFfinallyThread(Thread):
|
Line 321 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) |
if procedure=="uploadchanged": |
if procedure=="uploadchanged": |
|
changed=[x[0] for x in SESSION.get('changed',[])] |
uploadFns=SESSION.get('changed',[])+SESSION.get('newPs',[]) |
uploadFns=changed+SESSION.get('newPs',[]) |
|
|
#or all |
#or all |
elif procedure=="uploadAll": |
elif procedure=="uploadAll": |
Line 210 class uploadATFfinallyThread(Thread):
|
Line 340 class uploadATFfinallyThread(Thread):
|
uploadFns=[] |
uploadFns=[] |
|
|
#do first the changed files |
#do first the changed files |
|
i=0 |
for fn in uploadFns: |
for fn in uploadFns: |
|
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="<p>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: |
|
i=0 |
|
transaction.get().commit() |
|
logging.info("changing: do commit") |
|
|
|
transaction.get().commit() |
|
logging.info("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'] |
self.result+="<p>Adding files</p>" |
logging.info("adding start") |
|
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") |
|
|
|
|
#unlock locked files? |
#unlock locked files? |
if unlock: |
if unlock: |
self.result+="<p>Unlock files</p>" |
logging.info("unlocking start") |
|
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") |
|
|
for fn in unlockFns: |
for fn in unlockFns: |
|
#logging.info("will unlock: %s"%fn) |
founds=ctx2.CDLICatalog.search({'title':fn}) |
founds=ctx2.CDLICatalog.search({'title':fn}) |
|
#logging.info("found it: %s"%repr(founds)) |
if len(founds)>0: |
if len(founds)>0: |
|
#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") |
|
|
#if a basketname is give, add files to the basket |
#if a basketname is given, add files to the basket |
if not (basketname ==''): |
if not (basketname ==''): |
self.result+="<p>Add basket</p>" |
logging.info("add to basket %s"%basketname) |
|
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) |
|
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)) |
Line 260 class uploadATFfinallyThread(Thread):
|
Line 408 class uploadATFfinallyThread(Thread):
|
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): |
|
"""simple item""" |
|
meta_type="cdli_upload" |
|
|
|
def __init__(self,id): |
|
"""init tmp""" |
|
self.id=id |
|
|
class uploadATFThread(Thread): |
class uploadATFThread(Thread): |
"""class for checking the files befor uploading""" |
"""class for checking the files befor uploading""" |
|
|
Line 275 class uploadATFThread(Thread):
|
Line 431 class uploadATFThread(Thread):
|
Thread.__init__(self) |
Thread.__init__(self) |
|
|
|
|
def set(self,upload,basketId,username,serverport="8080"): |
def set(self,upload,basketId,username,idTmp,serverport="8080"): |
"""set start values for the thread""" |
"""set start values for the thread""" |
self.result="" |
self.result="" |
self.upload=upload |
self.upload=upload |
self.basketId=basketId |
self.basketId=basketId |
self.username=username |
self.username=username |
self.serverport=serverport |
self.serverport=serverport |
|
self.idTmp=idTmp |
|
|
def __call__(self): |
def __call__(self): |
"""call method """ |
"""call method """ |
Line 300 class uploadATFThread(Thread):
|
Line 457 class uploadATFThread(Thread):
|
return app.__of__(RequestContainer(REQUEST = req)) |
return app.__of__(RequestContainer(REQUEST = req)) |
|
|
def run(self): |
def run(self): |
|
idTmp=self.idTmp |
self.result="" |
self.result="" |
#find context within ZODB |
#find context within ZODB |
from Zope import DB |
from Zope import DB |
Line 308 class uploadATFThread(Thread):
|
Line 465 class uploadATFThread(Thread):
|
root = conn.root() |
root = conn.root() |
app = root['Application'] |
app = root['Application'] |
ctx = self.getContext(app,serverport=self.serverport) |
ctx = self.getContext(app,serverport=self.serverport) |
self.uploadATFThread(ctx,self.upload,self.basketId) |
logging.info("run intern") |
|
try: |
|
logging.info("created: %s"%idTmp) |
|
ctx.temp_folder._setObject(idTmp,tmpStore(idTmp)) |
|
except: |
|
logging.error("thread upload: %s %s"%sys.exc_info()[0:2]) |
|
|
|
logging.info("call thread intern") |
|
self.uploadATFThread(ctx,self.upload,idTmp,self.basketId) |
|
|
#ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue |
#ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue |
|
|
get_transaction().commit() |
|
|
|
while self.continueVar: |
transaction.get().commit() |
pass |
|
|
|
conn.close() |
conn.close() |
|
|
|
return getattr(ctx.temp_folder,idTmp) |
|
|
def getResult(self): |
def getResult(self): |
"""method for accessing result""" |
"""method for accessing result""" |
return self.result |
return self.result |
|
|
def uploadATFThread(self,ctx,upload,basketId=0): |
def uploadATFThread(self,ctx,upload,idTmp,basketId=0): |
"""upload an atf file""" |
"""upload an atf file""" |
#TODO: add comments |
#TODO: add comments |
#TODO: finish uploadATF |
#TODO: finish uploadATF |
|
|
|
stObj=getattr(ctx.temp_folder,idTmp) |
|
logging.info("start, upload thread") |
self.result="<html><body><h2>I got your file, start now to split it into single atf-files!</h2><p>" |
self.result="<html><body><h2>I got your file, start now to split it into single atf-files!</h2><p>" |
|
|
#make sure that id is a string and not an integer |
#make sure that id is a string and not an integer |
Line 366 class uploadATFThread(Thread):
|
Line 533 class uploadATFThread(Thread):
|
basketNameFromId=getattr(ctx2.basketContainer,basketId).title |
basketNameFromId=getattr(ctx2.basketContainer,basketId).title |
basketLen=getattr(ctx2.basketContainer,basketId).getLastVersion().numberOfItems() |
basketLen=getattr(ctx2.basketContainer,basketId).getLastVersion().numberOfItems() |
|
|
|
logging.info("got the file, upload thread") |
self.result+="""<html><body><h2>I got the files</h2>< |
self.result+="""<html><body><h2>I got the files</h2>< |
p>I am computing the differences to the exisiting files</p>""" |
p>I am computing the differences to the exisiting files</p>""" |
|
|
#start to check the files |
#start to check the files |
for fn in os.listdir(dir): |
for fn in os.listdir(dir): |
|
|
self.result+="<p>process:%s</p>"%fn |
self.result="<p>process:%s</p>"%fn+self.result |
|
|
# check if file is in the catalog |
# check if file is in the catalog |
#TODO: checkCatalog is not implemented yet |
#TODO: checkCatalog is not implemented yet |
Line 386 class uploadATFThread(Thread):
|
Line 553 class uploadATFThread(Thread):
|
#if not than add filename to the list of newfiles |
#if not than add filename to the list of newfiles |
|
|
data=file(os.path.join(dir,fn)).read() |
data=file(os.path.join(dir,fn)).read() |
#status,msg=checkFile(fn,data,dir) |
status,msg=checkFile(fn,data,dir) |
status=True |
#status=True |
msg="" |
|
|
|
if not status: # error |
if not status: # error |
errors.append((fn,msg)) |
errors.append((fn,msg)) |
|
|
else: |
else: |
if len(founds)==0: |
if len(founds)==0: |
newPs.append(fn) |
newPs.append(fn) |
Line 401 class uploadATFThread(Thread):
|
Line 570 class uploadATFThread(Thread):
|
obj=found.getObject() |
obj=found.getObject() |
|
|
if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))): |
if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))): |
lockerrors.append(fn) |
lockerrors.append((fn,str(obj.lockedBy))) |
else: |
else: |
|
|
diffs=obj.diff(data) |
diffs=obj.diff(data) |
Line 411 class uploadATFThread(Thread):
|
Line 580 class uploadATFThread(Thread):
|
#ready, set the returnValues |
#ready, set the returnValues |
self.result+="<h3>Done</h3></body></html>" |
self.result+="<h3>Done</h3></body></html>" |
|
|
self.returnValue={} |
stObj.returnValue={} |
self.returnValue['changed']=changed |
|
self.returnValue['errors']=errors |
|
self.returnValue['lockerrors']=lockerrors |
|
self.returnValue['newPs']=newPs |
|
self.returnValue['tmpdir']=dir |
|
self.returnValue['basketLen']=basketLen |
|
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: |
stObj.returnValue['errors']=errors |
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: |
stObj.returnValue['newPs']=newPs |
RESPONSE.redirect('manage_main') |
stObj.returnValue['tmpdir']=dir |
|
stObj.returnValue['basketLen']=basketLen |
|
stObj.returnValue['numberOfFiles']=numberOfFiles |
class BasketObject_old(Folder): |
stObj.returnValue['basketNameFromId']=basketNameFromId |
"""Basket Object - alte fassung""" |
stObj.returnValue['basketNameFromFile']=basketNameFromFile |
|
stObj.returnValue['basketId']=basketId |
meta_type="basketObject" |
stObj.returnValue['dir']=dir |
def __init__(self): |
#stObj.returnValue['changed']=copy.copy(changed) |
"""init basket object""" |
stObj.returnValue['changed']=[(x[0].getId(),x[1][0]) for x in changed] |
self.contents=[] |
#stObj.returnValue['lockerrors']=[x[0].getId() for x in lockerrors] |
|
stObj.returnValue['lockerrors']=[x for x in lockerrors] |
def numberOfItems(self): |
self.returnValue=True |
"""return anzahl der elemente im basket""" |
#ctx2.cdli_main.setTemp('v_uploadATF_returnValue',True) |
num=len(self.contents) |
|
|
|
return num |
|
|
|
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: |
class CDLIBasketContainer(OrderedFolder): |
self.contents.remove(content) |
"""contains the baskets""" |
|
|
|
|
if RESPONSE: |
security=ClassSecurityInfo() |
RESPONSE.redirect(self.absolute_url()) |
meta_type="CDLIBasketContainer" |
|
|
|
def getPNumbersOfBasket(self,basketName): |
|
"""get all pnumbers of a basket as a list, returns an empty list if basket not found |
|
@param basketName: name of the basket |
|
""" |
|
ret=[] |
|
basketId=self.getBasketIdfromName(basketName) |
|
if not basketId: |
|
return [] |
|
|
def unlockTest(self): |
ob=getattr(self,basketId).getContent() |
"""unlock all files of the testuser for debuggin""" |
|
for object in self.contents: |
|
|
|
if str(object.lockedBy)=="test": |
ret=[x[0].split(".")[0] for x in ob] |
object.lockedBy="" |
|
|
|
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None): |
return ret |
"""download all selected files in one file""" |
|
|
|
|
security.declareProtected('manage','getBasketAsOneFile') |
|
def getBasketAsOneFile(self,basketName,current="no"): |
|
"""returns all files of the basket combined in one file |
|
@param basketName: Name of the basket |
|
@param current: (optional) if current is set to "yes" then the most current version of |
|
all files are downloaded and not the versions of the files as stored in the basket |
|
""" |
ret="" |
ret="" |
lockedObjects={} |
basketId=self.getBasketIdfromName(basketName) |
|
if not basketId: |
if self.temp_folder.downloadCounter > 10: |
return "" |
return """I am sorry, currently the server has to many requests for downloads, please come back later!""" |
|
|
|
|
|
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" |
|
|
|
self.temp_folder.downloadCounter+=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
|
|
|
|
|
for object in self.contents: |
|
|
|
if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
|
ret+=object.getLastVersion().getData() |
|
|
|
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) |
|
self.temp_folder.downloadCounter-=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
|
|
|
|
|
def manage_addBasket_oldObjectForm(self): |
|
"""add form""" |
|
pass |
|
|
|
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) |
|
|
|
if RESPONSE is not None: |
|
RESPONSE.redirect('manage_main') |
|
|
|
|
|
class CDLIBasketContainer(OrderedFolder): |
|
"""contains the baskets""" |
|
|
|
|
|
security=ClassSecurityInfo() |
ob=getattr(self,basketId).getLastVersion() |
meta_type="CDLIBasketContainer" |
for object in ob.getContent(): |
|
if current=="no": #version as they are in the basket |
|
ret+=str(object[0].getData())+"\n" |
|
elif current=="yes": |
|
#search current object |
|
logging.info("crrent: %s"%object[1].getId().split(".")[0]) |
|
founds=self.CDLICatalog.search({'title':object[1].getId().split(".")[0]}) |
|
if len(founds)>0: |
|
ret+=str(founds[0].getObject().getLastVersion().getData())+"\n" |
|
return ret |
|
|
|
security.declareProtected('manage','upDateBaskets') |
def upDateBaskets(self): |
def upDateBaskets(self): |
"""update content in to objects""" |
"""update content in to objects""" |
|
|
Line 704 class CDLIBasketContainer(OrderedFolder)
|
Line 674 class CDLIBasketContainer(OrderedFolder)
|
trash.manage_pasteObjects(cut) |
trash.manage_pasteObjects(cut) |
|
|
security.declareProtected('manage','manageBaskets') |
security.declareProtected('manage','manageBaskets') |
def manageBaskets(self,ids,submit,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) |
self.deleteBaskets(ids) |
|
|
|
elif submit=="join": |
|
flag,msg=self.joinBasket(joinBasket, ids) |
|
logging.info("joining %s %s"%(flag,msg)) |
|
|
|
elif submit=="subtract": |
|
logging.info("BBBb %s %s"%(basket1,basket2)) |
|
flag,msg=self.subtractBasket(subtractBasket, basket1,basket2) |
|
logging.info("subtract %s %s"%(flag,msg)) |
|
|
if RESPONSE: |
if RESPONSE: |
RESPONSE.redirect(self.absolute_url()) |
RESPONSE.redirect(self.absolute_url()) |
Line 740 class CDLIBasketContainer(OrderedFolder)
|
Line 717 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 834 class CDLIBasketContainer(OrderedFolder)
|
Line 811 class CDLIBasketContainer(OrderedFolder)
|
return baskets |
return baskets |
|
|
|
|
|
def subtractBasket(self,newBasket,basket1,basket2): |
|
"""subtract basket2 from basket1 |
|
(i.e. newbasket will contain alle elements of basket1 which are not in basket2), |
|
if basket2 contains files which are not in basket1, then theses files fill be ignored |
|
|
|
@param newbasket: name of the new basket |
|
@param basket1: basket where basket2 will be subtracted from |
|
@param basket2: see above |
|
|
|
""" |
|
logging.info("CCCCC %s %s"%(basket1,basket2)) |
|
|
|
try: |
|
newB=self.addBasket(newBasket) |
|
except: |
|
return False, "cannot create the new basket" |
|
|
|
|
|
|
|
|
|
|
|
bas2= getattr(self,basket2) |
|
bas2content=bas2.getContent() |
|
bas2ids=[x[0] for x in bas2content] |
|
|
|
|
|
|
|
bas1= getattr(self,basket1) |
|
bas1content=bas1.getContent() |
|
|
|
|
|
newBasketContent={} |
|
|
|
for id,version in bas1content: |
|
if not (id in bas2ids): |
|
newBasketContent[id]=version |
|
|
|
username=self.getActualUserName() |
|
|
|
logging.info("sbc %s"%newBasketContent) |
|
newB.addObjectsWithVersion(newBasketContent,username=username,catalog=self.CDLICatalog) |
|
|
|
return True, "" |
|
|
|
|
|
def joinBasket(self,newBasket,oldBaskets): |
|
"""join two baskets |
|
@param newbasket: name of the new basket |
|
@param oldbaskets: list of baskets to be joined |
|
""" |
|
try: |
|
newB=self.addBasket(newBasket) |
|
except: |
|
return False, "cannot create the new basket" |
|
|
|
newBasketContent={} |
|
for ob in oldBaskets: |
|
x= getattr(self,ob,None) |
|
if x is None: |
|
return False, "cannot find basket: %s"%ob |
|
|
|
ids=x.getContent() # hole den Inhalt |
|
|
|
for id,version in ids: |
|
if newBasketContent.has_key(id): # p number gibt's schon |
|
newBasketContent[id]=max(newBasketContent[id],version) # speichere die groessere Versionsnumber |
|
else: |
|
newBasketContent[id]=version |
|
username=self.getActualUserName() |
|
|
|
logging.info("nbc %s"%newBasketContent) |
|
newB.addObjectsWithVersion(newBasketContent,username=username,catalog=self.CDLICatalog) |
|
|
|
return True, "" |
|
|
def getNewId(self): |
def getNewId(self): |
"""createIds""" |
"""createIds""" |
Line 870 class CDLIBasketContainer(OrderedFolder)
|
Line 921 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 926 class CDLIBasket(Folder,CatalogAware):
|
Line 977 class CDLIBasket(Folder,CatalogAware):
|
meta_type="CDLIBasket" |
meta_type="CDLIBasket" |
default_catalog="CDLIBasketCatalog" |
default_catalog="CDLIBasketCatalog" |
|
|
|
def searchInBasket(self,indexName,searchStr,regExp=False): |
|
"""searchInBasket""" |
|
|
|
lst=self.searchInLineIndexDocs(indexName,searchStr,uniq=True,regExp=regExp) #TODO: fix this |
|
ret={} |
|
|
|
lv=self.getLastVersion() |
|
|
|
|
|
for obj in lv.content.getContent(): |
|
id=obj[1].getId().split(".")[0] |
|
if id in lst: |
|
|
|
ret[id]=self.showWordInFile(id,searchStr,lineList=self.getLinesFromIndex(indexName,searchStr,id,regExp=regExp),regExp=regExp,indexName=indexName) |
|
|
|
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','searchResultsInBasket')).__of__(self) |
|
return pt(result=ret,indexName=indexName,regExp=regExp,word=searchStr) |
|
|
|
|
|
|
|
|
|
def searchInBasket_v1(self,searchStr): |
|
"""search occurences of searchStr in files im basket""" |
|
ret=[] |
|
lv=self.getLastVersion() |
|
logging.info("searching") |
|
for obj in lv.content.getContent(): |
|
txt=obj[0].getData() |
|
for x in txt.split("\n"): |
|
logging.info("search %s"%x) |
|
if re.match(searchStr,x): |
|
ret.append(x) |
|
|
|
return "\n".join(ret) |
|
|
|
|
def getFile(self,obj): |
def getFile(self,obj): |
return obj[1] |
return obj[1] |
Line 978 class CDLIBasket(Folder,CatalogAware):
|
Line 1065 class CDLIBasket(Folder,CatalogAware):
|
self.shortDescription=shortDescription |
self.shortDescription=shortDescription |
self.comment=comment |
self.comment=comment |
|
|
|
def getActualUserName(self): |
|
"""get name of the actualuser""" |
|
|
|
return str(self.REQUEST['AUTHENTICATED_USER']) |
|
|
|
|
def getLastVersion(self): |
def getLastVersion(self): |
Line 1042 class CDLIBasket(Folder,CatalogAware):
|
Line 1133 class CDLIBasket(Folder,CatalogAware):
|
|
|
return obj |
return obj |
|
|
|
def addObjectsWithVersion(self,ids,deleteOld=None,username=None,catalog=None): |
|
"""generate a new version of the basket with objects added, |
|
hier wird jedoch nicht die letzte Version jedes Files hinzugefuegt, s |
|
ondern ids is ein Tupel mit der Id (d.h. der p-number) und der Versionsnummer. |
|
""" |
|
logging.info("add to basket (%s)"%(self.getId())) |
|
lastVersion=self.getLastVersion() |
|
|
|
if not catalog: |
|
catalog=self.CDLICatalog |
|
|
|
if lastVersion is None: |
|
oldContent=[] |
|
else: |
|
oldContent=lastVersion.content.getContent() |
|
|
|
if deleteOld: |
|
oldContent=[] |
|
|
|
newContent=[] |
|
added=0 |
|
|
|
for id,version in ids.iteritems(): |
|
logging.info("adding %s %s"%(id,version)) |
|
id=id.split(".")[0] # title nur die pnumber ohne atf |
|
|
|
try: |
|
founds=catalog.search({'title':id}) |
|
except: |
|
founds=[] |
|
logging.info(" found %s "%(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().getVersions()[version-1][1],found.getObject())) |
|
added+=1 |
|
|
|
content=oldContent+newContent |
|
if not username: |
|
logging.error("XXXXXXXXXXX %s"%repr(self)) |
|
user=self.getActualUserName() |
|
else: |
|
user = username |
|
|
|
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content) |
|
logging.info("add to basket (%s) done"%(self.getId())) |
|
return added |
|
|
|
|
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""" |
|
logging.info("add to basket (%s)"%(self.getId())) |
lastVersion=self.getLastVersion() |
lastVersion=self.getLastVersion() |
|
|
if lastVersion is None: |
if lastVersion is None: |
Line 1062 class CDLIBasket(Folder,CatalogAware):
|
Line 1203 class CDLIBasket(Folder,CatalogAware):
|
founds=self.CDLICatalog.search({'title':id}) |
founds=self.CDLICatalog.search({'title':id}) |
except: |
except: |
founds=[] |
founds=[] |
|
|
for found in founds: |
for found in founds: |
if found.getObject() not in oldContent: |
if found.getObject() not in oldContent: |
#TODO: was passiert wenn, man eine Object dazufŸgt, das schon da ist aber eine neuere version |
#TODO: was passiert wenn, man eine Object dazufŸgt, das schon da ist aber eine neuere version |
Line 1075 class CDLIBasket(Folder,CatalogAware):
|
Line 1217 class CDLIBasket(Folder,CatalogAware):
|
user = username |
user = username |
|
|
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content) |
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content) |
|
logging.info("add to basket (%s) done"%(self.getId())) |
return added |
return added |
|
|
|
|
|
|
|
def getContent(self): |
|
"""print content""" |
|
ret=[] |
|
|
|
lv=self.getLastVersion() |
|
for obj in lv.content.getContent(): |
|
logging.info("XXXXXXXXXX %s"%repr(obj)) |
|
ret.append((obj[1].getId(),obj[0].versionNumber)) |
|
|
|
return ret |
|
|
def getContentIds(self): |
def getContentIds(self): |
"""print basket content""" |
"""print basket content""" |
Line 1167 class CDLIBasketVersion(Implicit,Persist
|
Line 1319 class CDLIBasketVersion(Implicit,Persist
|
return True |
return True |
return False |
return False |
|
|
security.declareProtected('View','downloadObjectsAsOneFile') |
def downloadListOfPnumbers(self): |
|
"""download pnumbers of the basket as list""" |
|
|
|
basket_name=self.aq_parent.title |
|
|
|
ids=self.getContent() # get the list of objects |
|
logging.error(ids) |
|
ret="\n".join([x[1].getId().split(".")[0] for x in ids]) |
|
|
|
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.txt" """%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) |
|
|
|
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 1192 class CDLIBasketVersion(Implicit,Persist
|
Line 1359 class CDLIBasketVersion(Implicit,Persist
|
|
|
self.temp_folder.downloadCounterBaskets+=1 |
self.temp_folder.downloadCounterBaskets+=1 |
self._p_changed=1 |
self._p_changed=1 |
get_transaction().commit() |
transaction.get().commit() |
|
|
if lock: |
if lock: |
|
|
if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': |
if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': |
self.temp_folder.downloadCounterBaskets-=1 |
self.temp_folder.downloadCounterBaskets-=1 |
self._p_changed=1 |
self._p_changed=1 |
get_transaction().commit() |
transaction.get().commit() |
self.temp_folder.downloadCounterBaskets-=1 |
self.temp_folder.downloadCounterBaskets-=1 |
self._p_changed=1 |
self._p_changed=1 |
get_transaction().commit() |
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(): |
|
|
if not object[1].lockedBy=="": |
if (not str(object[1].lockedBy)=="") and (not (str(object[1].lockedBy)==str(self.REQUEST['AUTHENTICATED_USER']))): |
lockedObjects[object[1].title]=repr(object[1].lockedBy) |
lockedObjects[object[1].title]=repr(object[1].lockedBy) |
|
|
|
|
Line 1222 class CDLIBasketVersion(Implicit,Persist
|
Line 1389 class CDLIBasketVersion(Implicit,Persist
|
|
|
self.temp_folder.downloadCounterBaskets-=1 |
self.temp_folder.downloadCounterBaskets-=1 |
self._p_changed=1 |
self._p_changed=1 |
get_transaction().commit() |
transaction.get().commit() |
|
|
return pt() |
return pt() |
|
|
Line 1239 class CDLIBasketVersion(Implicit,Persist
|
Line 1406 class CDLIBasketVersion(Implicit,Persist
|
ret+=str(object[0].getData())+"\n" |
ret+=str(object[0].getData())+"\n" |
elif current=="yes": |
elif current=="yes": |
#search current object |
#search current object |
founds=self.CDLICatalog.search({'title':object[0].getId()}) |
founds=self.CDLICatalog.search({'title':object[1].getId().split(".")[0]}) |
if len(founds)>0: |
if len(founds)>0: |
ret+=str(founds[0].getObject().getLastVersion().getData())+"\n" |
ret+=str(founds[0].getObject().getLastVersion().getData())+"\n" |
|
|
Line 1252 class CDLIBasketVersion(Implicit,Persist
|
Line 1419 class CDLIBasketVersion(Implicit,Persist
|
|
|
self.temp_folder.downloadCounterBaskets-=1 |
self.temp_folder.downloadCounterBaskets-=1 |
self._p_changed=1 |
self._p_changed=1 |
get_transaction().commit() |
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") |
Line 1285 class CDLIBasketVersion(Implicit,Persist
|
Line 1452 class CDLIBasketVersion(Implicit,Persist
|
def __init__(self,id,user,comment="",basketContent=[]): |
def __init__(self,id,user,comment="",basketContent=[]): |
""" init a basket version""" |
""" init a basket version""" |
self.id=id |
self.id=id |
self.coment=comment |
self.comment=comment |
self._setObject('content',BasketContent(basketContent)) |
self._setObject('content',BasketContent(basketContent)) |
#self.basketContent=basketContent[0:]a |
#self.basketContent=basketContent[0:]a |
self.user=user |
self.user=user |
Line 1299 class CDLIBasketVersion(Implicit,Persist
|
Line 1466 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""" |
|
|
Line 1351 class CDLIFileObject(CatalogAware,extVer
|
Line 1518 class CDLIFileObject(CatalogAware,extVer
|
|
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
|
|
|
security.declareProtected('manage','index_html') |
security.declarePublic('makeThisVersionCurrent') |
|
|
|
def PrincipiaSearchSource(self): |
def PrincipiaSearchSource(self): |
"""Return cataloguable key for ourselves.""" |
"""Return cataloguable key for ourselves.""" |
Line 1363 class CDLIFileObject(CatalogAware,extVer
|
Line 1529 class CDLIFileObject(CatalogAware,extVer
|
|
|
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 |
|
|
|
|
newversion=parent.manage_addCDLIFileObject('',comment,author) |
newversion=parent.manage_addCDLIFileObject('',comment,author) |
newversion.data=self.data[0:] |
newversion.manage_upload(self.getData()) |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') |
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 |
|
|
|
security.declarePublic('view') |
def view(self): |
def view(self): |
"""view file""" |
"""view file""" |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) |
Line 1419 class CDLIFileObject(CatalogAware,extVer
|
Line 1584 class CDLIFileObject(CatalogAware,extVer
|
|
|
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 1435 def manage_addCDLIFileObject(self,id,vC=
|
Line 1600 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() |
|
|
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 1520 class CDLIFile(extVersionedFile,CatalogA
|
Line 1694 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.""" |
|
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 1545 class CDLIFile(extVersionedFile,CatalogA
|
Line 1724 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() |
Line 1582 class CDLIFile(extVersionedFile,CatalogA
|
Line 1734 class CDLIFile(extVersionedFile,CatalogA
|
pass |
pass |
|
|
if RESPONSE: |
if RESPONSE: |
|
if ob.getSize()==0: |
obj=self.ZopeFind(self,obj_ids=[id])[0][1] |
self.REQUEST.SESSION['objID']=ob.getId() |
if obj.getSize()==0: |
|
self.REQUEST.SESSION['objID']=obj.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 1611 def manage_addCDLIFile(self,id,title,loc
|
Line 1759 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): |
|
"""check utf 8""" |
|
try: |
|
data.encode('utf-8') |
|
return True |
|
except: |
|
return False |
|
|
|
|
def checkFile(filename,data,folder): |
def checkFile(filename,data,folder): |
Line 1630 def checkFile(filename,data,folder):
|
Line 1783 def checkFile(filename,data,folder):
|
return False,"P missing in the filename" |
return False,"P missing in the filename" |
elif len(fn[0])!=7: |
elif len(fn[0])!=7: |
return False,"P number has not the right length 6" |
return False,"P number has not the right length 6" |
else: |
elif not checkUTF8(data): |
fn=os.path.join(folder,filename) |
return False,"not utf-8" |
stin,out=os.popen4("/usr/bin/atfcheck.plx %s"%fn) |
|
value=out.read() |
|
ret= out.close() |
|
|
|
if value: |
|
|
|
return False,"atf checker error: %s"%value |
|
else: |
else: |
return True,"" |
return True,"" |
|
|
|
|
def splitatf(fh,dir=None,ext=None): |
def splitatf(fh,dir=None,ext=None): |
"""split it""" |
"""split it""" |
ret=None |
ret=None |
nf=None |
nf=None |
i=0 |
i=0 |
|
|
for lineTmp in fh.readlines(): |
if (type(fh) is StringType) or (type(fh) is UnicodeType): |
|
iter=fh.split("\n") |
|
else: |
|
iter=fh.readlines() |
|
|
|
for lineTmp in iter: |
|
lineTmp=lineTmp.replace(codecs.BOM_UTF8,'') # make sure that all BOM are removed.. |
for line in lineTmp.split("\r"): |
for line in lineTmp.split("\r"): |
|
#logging.log("Deal with: %s"%line) |
if ext: |
if ext: |
i+=1 |
i+=1 |
if (i%100)==0: |
if (i%100)==0: |
Line 1675 def splitatf(fh,dir=None,ext=None):
|
Line 1829 def splitatf(fh,dir=None,ext=None):
|
if dir: |
if dir: |
filename=os.path.join(dir,filename) |
filename=os.path.join(dir,filename) |
nf=file(filename,"w") |
nf=file(filename,"w") |
|
logging.info("open %s"%filename) |
if nf: |
if nf: |
nf.write(line.replace("\n","")+"\n") |
nf.write(line.replace("\n","")+"\n") |
|
|
|
try: |
nf.close() |
nf.close() |
|
except: |
|
pass |
|
|
|
if not((type(fh) is StringType) or (type(fh) is UnicodeType)): |
fh.close() |
fh.close() |
return ret,len(os.listdir(dir)) |
return ret,len(os.listdir(dir)) |
|
|
Line 1688 class CDLIFileFolder(extVersionedFileFol
|
Line 1848 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 setTemp(self,name,value): |
def setTemp(self,name,value): |
"""set tmp""" |
"""set tmp""" |
|
|
Line 1701 class CDLIFileFolder(extVersionedFileFol
|
Line 1863 class CDLIFileFolder(extVersionedFileFol
|
|
|
|
|
def delete(self,ids): |
def delete(self,ids): |
"""delete this file, i.e. move into a trash folder""" |
"""delete these files""" |
|
|
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] |
|
|
|
if type(ids) is not ListType: |
if type(ids) is not ListType: |
ids=[ids] |
ids=[ids] |
cut=self.manage_cutObjects(ids) |
|
trash.manage_pasteObjects(cut) |
self.manage_delObjects(ids) |
|
|
|
|
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 1725 class CDLIFileFolder(extVersionedFileFol
|
Line 1879 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): |
|
"""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): |
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) |
|
|
|
|
|
def getAllPNumbers(self): |
|
"""get a list of all files (resp their p-numbers) stored""" |
|
|
|
ret=[x.getId for x in self.CDLICatalog()] |
|
|
|
return ret |
|
|
def findObjectsFromList(self,enterList=None,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): |
def findObjectsFromList(self,enterList=None,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): |
"""findObjectsFromList (, TAB oder LINE separated)""" |
"""findObjectsFromList (, TAB oder LINE separated)""" |
Line 1821 class CDLIFileFolder(extVersionedFileFol
|
Line 1992 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 1831 class CDLIFileFolder(extVersionedFileFol
|
Line 2002 class CDLIFileFolder(extVersionedFileFol
|
|
|
self.temp_folder.downloadCounter+=1 |
self.temp_folder.downloadCounter+=1 |
self._p_changed=1 |
self._p_changed=1 |
get_transaction().commit() |
transaction.get().commit() |
|
|
list=[(x.getId,x) for x in catalog()] |
list=[(x.getId,x) for x in catalog()] |
list.sort(sortF) |
list.sort(sortF) |
Line 1848 class CDLIFileFolder(extVersionedFileFol
|
Line 2019 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") |
self.temp_folder.downloadCounter-=1 |
self.temp_folder.downloadCounter-=1 |
self._p_changed=1 |
self._p_changed=1 |
get_transaction().commit() |
transaction.get().commit() |
#os.close(tf) |
#os.close(tf) |
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename) |
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename) |
return True |
return True |
Line 1867 class CDLIFileFolder(extVersionedFileFol
|
Line 2039 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 1875 class CDLIFileFolder(extVersionedFileFol
|
Line 2047 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 1933 class CDLIRoot(Folder):
|
Line 2105 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 findWordRegExp(self,searchTerm): |
file_catalog = 'CDLICatalog' |
"""find all words in index which match regexp in SearchTerm""" |
|
ret=[] |
|
for x in self.lineIndex.iterkeys(): |
|
if re.match(searchTerm,x): |
|
ret.append(x) |
|
return ret |
|
|
|
def searchRegExpInLineIndexDocs(self,searchTerm): |
# word splitter for search |
"""search in inLineIndex with regexp""" |
splitter = {'words':cdliSplitter.wordSplitter(), |
if not searchTerm: |
'graphemes':cdliSplitter.graphemeSplitter()} |
return [] |
|
ret=[] |
|
words=self.findWordRegExp(searchTerm) # suche nach allen Treffern |
|
logging.info("wd:%s"%words) |
|
for word in words: |
|
ret+=self.searchInLineIndexDocs(word) |
|
|
|
return unique(ret) |
|
|
|
def showInLineIndex(self): |
|
"""get the index for debug purposes""" |
|
print "show" |
|
for x in self.lineIndex.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.lineIndex |
|
|
|
def searchInLineIndexDocs(self,word,uniq=True,regExp=False): |
|
"""search occurences""" |
|
|
|
if regExp: |
def deleteFiles(self,ids): |
return self.searchRegExpInLineIndexDocs(word) |
"""delete files""" |
|
for id in ids: |
try: |
founds=self.CDLICatalog.search({'title':id.split(".")[0]}) |
lst=list(self.lineIndex.get(word).keys()) |
if founds: |
except: |
logging.debug("deleting %s"%founds) |
lst=[] |
folder=founds[0].getObject().aq_parent #get the parent folder of the object |
if uniq: |
logging.debug("deleting from %s"%folder) |
return unique(lst) |
cut=folder.delete([founds[0].getId]) #cut it out |
else: |
|
return lst |
|
|
|
def getLinesFromIndex(self,word,doc,regExp=False): |
|
"""get lines""" |
|
if not regExp: |
|
return self.lineIndex.get(word)[doc] |
|
else: # wenn regexp, suche welches word |
|
for w in self.findWordRegExp(word): |
|
if self.lineIndex.get(w): # ein word in im dex gefunden |
|
try: |
|
dc=self.lineIndex.get(word)[doc] |
|
return dc # und ein document dann gib es zurueck |
|
except: |
|
pass #andernfalls weiter |
|
|
|
def cleanInLineIndex(self): |
|
"""delete InlineIndex""" |
|
for x in list(self.lineIndex.keys()): |
|
del(self.lineIndex[x]) |
|
print [x for x in self.lineIndex.keys()] |
|
|
|
return "ok" |
|
|
|
def storeInLineIndex(self,key,value): |
|
"""store in index""" |
|
|
|
if (not hasattr(self,'lineIndex')) or (type(self.lineIndex) is DictType): |
|
self.lineIndex=OOBTree() |
|
li=self.lineIndex |
|
|
|
if li.has_key(key): |
|
|
|
# if li[key].has_key(value[0]) and (not (value[1] in li[key][value[0]])): |
|
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: |
|
|
|
li[key]=OOBTree()# new btree for lines |
|
li[key][value[0]]=[value[1]] |
|
|
|
|
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 |
|
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] |
|
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 "" |
|
|
self.lineIndex=li |
return f[0].getObject().getData() |
|
|
get_transaction().commit() |
|
|
|
|
|
def showFile(self,fileId): |
def showFile(self,fileId,wholePage=False): |
"""show a file""" |
"""show a file |
f=self.CDLICatalog({'title':fileId}) |
@param fileId: P-Number of the document to be displayed |
|
""" |
|
f=getattr(self, self.file_catalog).search({'textid':fileId}) |
if not f: |
if not f: |
return "" |
return "" |
|
|
|
if wholePage: |
|
logging.debug("show whole page") |
|
return f[0].getObject().getContentObject().view() |
|
else: |
return f[0].getObject().getLastVersionFormattedData() |
return f[0].getObject().getLastVersionFormattedData() |
|
|
def showLineFromFile(self,fileId,lineNum,word): |
|
"""get line lineNum fromFileId""" |
|
|
|
file=self.showFile(fileId) |
def showWordInFile(self,fileId,word,indexName='graphemes',regExp=False,): |
#str="^%s\.[^%s\.]*%s[^\n]*\n"%(lineNum,lineNum,word) |
|
#str="^%s\..*?%s[^\n]*\n"%(lineNum,word) |
|
|
|
#print str |
|
#m=re.search(str,file,flags=re.M|re.DOTALL) |
|
#if m: |
|
# return m.group() |
|
#else: |
|
# return "" |
|
#ret=lineNum+"." |
|
#splitted=file.split(lineNum+".") |
|
#if len(splitted)>1: |
|
#for part in splitted[1:]: |
|
#if part.find(word)>-1: |
|
# for x in part.split("\n"): |
|
#ret+=x |
|
#if x.find(word)>-1: |
|
#break |
|
#break; |
|
#return ret |
|
|
|
def showWordInFile(self,fileId,word,lineList=None): |
|
"""get lines with word fromFileId""" |
"""get lines with word fromFileId""" |
|
|
file=self.showFile(fileId) |
file = formatAtfFullLineNum(self.getFile(fileId)) |
|
|
ret=[] |
ret=[] |
for line in file.split("\n"): |
|
if line.find(word)>-1: |
|
if lineList: #liste of moeglichen Zeilennummern |
|
num=line.split(".")[0] #Zeilenummer ist alles vor dem . in der Zeile |
|
|
|
if num in lineList: |
# 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) |
|
# compile into regexp objects |
|
wordlist = [re.compile(splitexp%w,re.IGNORECASE) for w in word.split(' ')] |
|
|
|
for line in file.split("\n"): |
|
for word in wordlist: |
|
#logging.debug("showwordinfile: searching for %s in %s"%(word.pattern,line)) |
|
if word.search(line): |
|
line = formatAtfLineHtml(line) |
ret.append(line) |
ret.append(line) |
else: # nimm alles ohne line check |
break |
ret.append(line) |
|
return ret |
return ret |
|
|
def tagWordInFile(self,fileId,word,lineList=None): |
|
"""get lines with word fromFileId""" |
|
|
|
file=self.showFile(fileId) |
def tagWordInFile(self,fileId,word,indexName='graphemes',regExp=False): |
tagStr="""<span class="found">%s</span>""" |
"""get text with word highlighted from FileId""" |
|
|
|
file=self.getFile(fileId) |
|
tagStart=u'<span class="found">' |
|
tagEnd=u'</span>' |
|
tagStr=tagStart + u'%%s' + tagEnd |
ret=[] |
ret=[] |
|
|
|
# add whitespace to splitter bounds expressions and compile into regexp object |
|
bounds = self.splitter[indexName].bounds |
|
wordsplit = re.compile("(%s|\s)"%bounds) |
|
# split search terms by blanks |
|
words = word.split(' ') |
|
|
for line in file.split("\n"): |
for line in file.split("\n"): |
if line.find(word)>-1: |
line = unicodify(line) |
if lineList: #liste of moeglichen Zeilennummern |
# ignore lemma lines |
num=line.split(".")[0] #Zeilenummer ist alles vor dem . in der Zeile |
if line.lstrip().startswith('#lem:'): |
|
continue |
if num in lineList: |
|
|
# first scan |
ret.append(line.replace(word,tagStr%word)) |
hitwords = [] |
else: # nimm alles ohne line check |
for w in words: |
ret.append(line.replace(word,tagStr%word)) |
if line.find(w) > -1: |
|
# word is in line |
|
hitwords.append(w) |
|
|
|
# examine hits closer |
|
if hitwords: |
|
# split line into words |
|
parts = wordsplit.split(line) |
|
line = "" |
|
for p in parts: |
|
# reassemble line |
|
if p in hitwords: |
|
# this part was found |
|
line += tagStart + formatAtfHtml(p) + tagEnd |
else: |
else: |
|
line += formatAtfHtml(p) |
|
|
|
else: |
|
# no hits |
|
line = formatAtfHtml(line) |
|
|
ret.append(line) |
ret.append(line) |
return "<br>\n".join(ret) |
|
|
return u'<br>\n'.join(ret) |
|
|
|
|
def URLquote(self,str): |
def URLquote(self,str): |
"""quote url""" |
"""quote url""" |
Line 2106 class CDLIRoot(Folder):
|
Line 2242 class CDLIRoot(Folder):
|
"""unquote url""" |
"""unquote url""" |
return urllib.unquote(str) |
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 forceunlock(self): |
def forceunlock(self): |
"break all locks" |
"break all locks" |
Line 2118 class CDLIRoot(Folder):
|
Line 2262 class CDLIRoot(Folder):
|
|
|
return ret |
return ret |
|
|
|
|
def getChangesByAuthor(self,author,n=100): |
def getChangesByAuthor(self,author,n=100): |
"""getChangesByAuthor""" |
"""getChangesByAuthor""" |
zcat=self.CDLIObjectsCatalog |
zcat=self.CDLIObjectsCatalog |
Line 2179 class CDLIRoot(Folder):
|
Line 2324 class CDLIRoot(Folder):
|
return ret |
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): |
def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None): |
"""standard ausgabe""" |
"""upload an atf file / basket file""" |
#self._v_uploadATF.returnValue=None |
#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 |
threadName=repeat |
if not threadName or threadName=="": |
if not threadName or threadName=="": |
|
#new thread not called from the waiting page |
tmpVar=False |
tmpVar=False |
|
|
thread=uploadATFThread() |
thread=uploadATFThread() |
Line 2196 class CDLIRoot(Folder):
|
Line 2380 class CDLIRoot(Folder):
|
self._v_uploadATF[threadName]=thread |
self._v_uploadATF[threadName]=thread |
#self._xmltrans.start() |
#self._xmltrans.start() |
#thread=Thread(target=self._v_uploadATF) |
#thread=Thread(target=self._v_uploadATF) |
|
logging.info("set thread. extern") |
self._v_uploadATF[threadName].set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT']) |
self._v_uploadATF[threadName].set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],idTmp,serverport=self.REQUEST['SERVER_PORT']) |
#thread.start() |
#thread.start() |
|
logging.info("start thread. extern") |
self._v_uploadATF[threadName].start() |
self._v_uploadATF[threadName].start() |
|
|
|
|
Line 2220 class CDLIRoot(Folder):
|
Line 2405 class CDLIRoot(Folder):
|
if threadName == thread.getName(): |
if threadName == thread.getName(): |
self._v_uploadATF[threadName]=thread |
self._v_uploadATF[threadName]=thread |
|
|
if not self._v_uploadATF[threadName].returnValue: |
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']) |
wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template']) |
Line 2232 class CDLIRoot(Folder):
|
Line 2417 class CDLIRoot(Folder):
|
return pt(txt='/uploadATF',threadName=threadName) |
return pt(txt='/uploadATF',threadName=threadName) |
|
|
else: |
else: |
# tmp={} |
tmp=getattr(self.temp_folder,idTmp).returnValue |
# for key in self._v_uploadATF[threadName].returnValue.keys(): |
|
# t=self._v_uploadATF[threadName].returnValue[key] |
|
# if type(t) is ListType: |
|
# tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:] |
|
# else: |
|
# tmp[key]=self._v_uploadATF[threadName].returnValue[key] |
|
# repr(tmp[key]),repr(key) |
|
# |
|
# # |
|
#tmp=self.cdli_main.tmpStore2[threadName] |
|
tmp=self._v_uploadATF[threadName].returnValue |
|
|
|
self._v_uploadATF[threadName].continueVar=False |
|
|
|
self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']] |
|
self.REQUEST.SESSION['lockerrors']=[x[0].getId() for x in tmp['lockerrors']] |
|
self.REQUEST.SESSION['errors']=tmp['errors'] |
|
self.REQUEST.SESSION['newPs']=tmp['newPs'] |
|
self.REQUEST.SESSION['tmpdir']=tmp['dir'] |
|
#del(self.cdli_main.tmpStore2[threadName]) |
|
|
|
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) |
|
|
Line 2283 class CDLIRoot(Folder):
|
Line 2447 class CDLIRoot(Folder):
|
|
|
self._v_uploadATF[threadName]=thread |
self._v_uploadATF[threadName]=thread |
|
|
|
idTmp=self.REQUEST.SESSION['idTmp'] |
self._v_uploadATF[threadName].set(procedure,comment=comment,basketname=basketname,unlock=unlock,SESSION=self.REQUEST.SESSION,username=self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT']) |
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() |
self._v_uploadATF[threadName].start() |
|
|
Line 2317 class CDLIRoot(Folder):
|
Line 2482 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: |
|
self.REQUEST.SESSION['idTmp']=None |
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect(self.absolute_url()) |
RESPONSE.redirect(self.absolute_url()) |
|
|
Line 2334 class CDLIRoot(Folder):
|
Line 2499 class CDLIRoot(Folder):
|
obj=self.ZopeFind(root,obj_ids=[folder]) |
obj=self.ZopeFind(root,obj_ids=[folder]) |
if ext: |
if ext: |
|
|
ext.result+="<p>adding: %s </p>"%f |
ext.result="<p>adding: %s </p>"%f+ext.result |
if not obj: |
if not obj: |
manage_addCDLIFileFolder(root,folder,folder) |
manage_addCDLIFileFolder(root,folder,folder) |
fobj=getattr(root,folder) |
fobj=getattr(root,folder) |
#get_transaction().commit() |
#transaction.get().commit() |
else: |
else: |
fobj=obj[0][1] |
fobj=obj[0][1] |
|
|
Line 2366 class CDLIRoot(Folder):
|
Line 2531 class CDLIRoot(Folder):
|
|
|
if count > 1000: |
if count > 1000: |
print "committing" |
print "committing" |
get_transaction().commit() |
transaction.get().commit() |
count=0 |
count=0 |
get_transaction().commit() |
transaction.get().commit() |
return "ok" |
return "ok" |
|
|
|
|
Line 2388 def manage_addCDLIRoot(self, id, title='
|
Line 2553 def manage_addCDLIRoot(self, id, title='
|
ob=CDLIRoot() |
ob=CDLIRoot() |
ob.id=str(id) |
ob.id=str(id) |
ob.title=title |
ob.title=title |
|
try: |
self._setObject(id, ob) |
self._setObject(id, ob) |
|
except: |
|
pass |
ob=self._getOb(id) |
ob=self._getOb(id) |
|
|
checkPermission=getSecurityManager().checkPermission |
checkPermission=getSecurityManager().checkPermission |