version 1.65, 2007/02/08 10:46:36
|
version 1.80.2.6, 2007/11/02 15:37:46
|
Line 25 from BTrees.OOBTree import OOBTree
|
Line 25 from BTrees.OOBTree import OOBTree
|
import logging |
import logging |
import transaction |
import transaction |
import copy |
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 195 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',[])] |
changed=[x[0] for x in SESSION.get('changed',[])] |
uploadFns=changed+SESSION.get('newPs',[]) |
uploadFns=changed+SESSION.get('newPs',[]) |
Line 340 class uploadATFThread(Thread):
|
Line 467 class uploadATFThread(Thread):
|
ctx = self.getContext(app,serverport=self.serverport) |
ctx = self.getContext(app,serverport=self.serverport) |
logging.info("run intern") |
logging.info("run intern") |
try: |
try: |
|
logging.info("created: %s"%idTmp) |
ctx.temp_folder._setObject(idTmp,tmpStore(idTmp)) |
ctx.temp_folder._setObject(idTmp,tmpStore(idTmp)) |
except: |
except: |
logging.error("thread upload: %s %s"%sys.exc_info()[0:2]) |
logging.error("thread upload: %s %s"%sys.exc_info()[0:2]) |
Line 354 class uploadATFThread(Thread):
|
Line 482 class uploadATFThread(Thread):
|
|
|
conn.close() |
conn.close() |
|
|
|
return getattr(ctx.temp_folder,idTmp) |
|
|
def getResult(self): |
def getResult(self): |
"""method for accessing result""" |
"""method for accessing result""" |
Line 424 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 476 class CDLIBasketContainer(OrderedFolder)
|
Line 607 class CDLIBasketContainer(OrderedFolder)
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
meta_type="CDLIBasketContainer" |
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 [] |
|
|
|
ob=getattr(self,basketId).getContent() |
|
|
|
ret=[x[0].split(".")[0] for x in ob] |
|
|
|
return ret |
|
|
|
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="" |
|
basketId=self.getBasketIdfromName(basketName) |
|
if not basketId: |
|
return "" |
|
|
|
ob=getattr(self,basketId).getLastVersion() |
|
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 503 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 539 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 633 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 669 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 725 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 777 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 841 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())) |
logging.info("add to basket (%s)"%(self.getId())) |
Line 880 class CDLIBasket(Folder,CatalogAware):
|
Line 1222 class CDLIBasket(Folder,CatalogAware):
|
|
|
|
|
|
|
|
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 967 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 1039 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 1085 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 1099 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 1151 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 1163 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.manage_upload(self.getData()) |
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 1219 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 1235 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 1320 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 1345 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 1382 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 1411 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 1430 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 1483 def splitatf(fh,dir=None,ext=None):
|
Line 1837 def splitatf(fh,dir=None,ext=None):
|
nf.close() |
nf.close() |
except: |
except: |
pass |
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 1492 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 1505 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 1529 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 1625 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 1652 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 |
transaction.get().commit() |
transaction.get().commit() |
Line 1671 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 1679 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 1737 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): |
|
"""search in inLineIndex with regexp""" |
|
if not searchTerm: |
|
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: |
|
return self.searchRegExpInLineIndexDocs(word) |
|
|
|
try: |
|
lst=list(self.lineIndex.get(word).keys()) |
|
except: |
|
lst=[] |
|
if uniq: |
|
return unique(lst) |
|
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): |
# word splitter for search |
self.lineIndex=OOBTree() |
splitter = {'words':cdliSplitter.wordSplitter(), |
li=self.lineIndex |
'graphemes':cdliSplitter.graphemeSplitter()} |
|
|
if li.has_key(key): |
|
|
|
# if li[key].has_key(value[0]) and (not (value[1] in li[key][value[0]])): |
def deleteFiles(self,ids): |
if li[key].has_key(value[0]): |
"""delete files""" |
tmp=li[key][value[0]] |
for id in ids: |
tmp.append(value[1]) # add it if now in the array |
founds=self.CDLICatalog.search({'title':id.split(".")[0]}) |
li[key][value[0]]=tmp[0:] |
if founds: |
else: |
logging.debug("deleting %s"%founds) |
li[key][value[0]]=[value[1]] # new array for lines |
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 |
|
|
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() |
|
|
transaction.get().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) |
|
#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): |
def showWordInFile(self,fileId,word,indexName='graphemes',regExp=False,): |
"""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: |
|
line += formatAtfHtml(p) |
|
|
else: |
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 1930 class CDLIRoot(Folder):
|
Line 2262 class CDLIRoot(Folder):
|
|
|
return ret |
return ret |
|
|
def forceDahl(self): |
|
"break all locks" |
|
ret=[] |
|
for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1): |
|
if str(f[1].lockedBy)=="dahl": |
|
un=f[1].forceunlock() |
|
|
|
if un and un !="": |
|
ret.append((f[0],un)) |
|
|
|
return ret |
|
|
|
def getChangesByAuthor(self,author,n=100): |
def getChangesByAuthor(self,author,n=100): |
"""getChangesByAuthor""" |
"""getChangesByAuthor""" |
Line 2003 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 |
from random import randint |
if (not self.REQUEST.SESSION.get('idTmp',None)): |
if (not self.REQUEST.SESSION.get('idTmp',None)): |
|
|
Line 2015 class CDLIRoot(Folder):
|
Line 2366 class CDLIRoot(Folder):
|
else: |
else: |
idTmp=self.REQUEST.SESSION.get('idTmp',None) |
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 2064 class CDLIRoot(Folder):
|
Line 2417 class CDLIRoot(Folder):
|
return pt(txt='/uploadATF',threadName=threadName) |
return pt(txt='/uploadATF',threadName=threadName) |
|
|
else: |
else: |
# tmp={} |
|
# for key in self._v_uploadATF[threadName].returnValue.keys(): |
|
# t=self._v_uploadATF[threadName].returnValue[key] |
|
# if type(t) is ListType: |
|
# tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:] |
|
# else: |
|
# tmp[key]=self._v_uploadATF[threadName].returnValue[key] |
|
# repr(tmp[key]),repr(key) |
|
# |
|
# # |
|
#tmp=self.cdli_main.tmpStore2[threadName] |
|
|
|
tmp=getattr(self.temp_folder,idTmp).returnValue |
tmp=getattr(self.temp_folder,idTmp).returnValue |
|
|
|
|
|
|
|
|
#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) |
|
|
return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |
return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |