version 1.73, 2007/03/23 13:58:10
|
version 1.80.2.19, 2008/01/21 17:06:21
|
Line 26 import logging
|
Line 26 import logging
|
import transaction |
import transaction |
import copy |
import copy |
import codecs |
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.splitlines(): |
|
line = unicodify(line) |
|
if line and line[0] == '@': |
|
# surface or column |
|
words = line.split(' ') |
|
if words[0] in surfaces: |
|
surf = line.replace(words[0],surfaces[words[0]]).strip() |
|
|
|
elif words[0] == '@column': |
|
col = ' '.join(words[1:]) |
|
|
|
elif line and line[0] in '123456789': |
|
# ordinary line -> add line number |
|
line = "%s:%s:%s"%(surf,col,line) |
|
|
|
ret.append(line) |
|
|
|
return '\n'.join(ret) |
|
|
|
|
def generateXMLReturn(hash): |
def generateXMLReturn(hash): |
"""erzeugt das xml file als returnwert fuer uploadATFRPC""" |
"""erzeugt das xml file als returnwert fuer uploadATFRPC""" |
Line 52 def generateXMLReturn(hash):
|
Line 144 def generateXMLReturn(hash):
|
return ret |
return ret |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def unique(s): |
def unique(s): |
"""Return a list of the elements in s, but without duplicates. |
"""Return a list of the elements in s, but without duplicates. |
|
|
Line 229 class uploadATFfinallyThread(Thread):
|
Line 313 class uploadATFfinallyThread(Thread):
|
self.result+="<h2>Start processing</h2>" |
self.result+="<h2>Start processing</h2>" |
|
|
#shall I only upload the changed files? |
#shall I only upload the changed files? |
logging.info("uploadATFfinally procedure: %s"%procedure) |
logging.debug("uploadATFfinally procedure: %s"%procedure) |
if procedure=="uploadchanged": |
if procedure=="uploadchanged": |
changed=[x[0] for x in SESSION.get('changed',[])] |
changed=[x[0] for x in SESSION.get('changed',[])] |
uploadFns=changed+SESSION.get('newPs',[]) |
uploadFns=changed+SESSION.get('newPs',[]) |
Line 250 class uploadATFfinallyThread(Thread):
|
Line 334 class uploadATFfinallyThread(Thread):
|
#do first the changed files |
#do first the changed files |
i=0 |
i=0 |
for fn in uploadFns: |
for fn in uploadFns: |
|
logging.debug("uploadATFfinally uploadFn=%s"%fn) |
i+=1 |
i+=1 |
founds=ctx2.CDLICatalog.search({'title':fn}) |
founds=ctx2.CDLICatalog.search({'title':fn}) |
if len(founds)>0: |
if len(founds)>0: |
SESSION['author']=str(username) |
SESSION['author']=str(username) |
self.result="<p>Changing : %s"%fn+self.result |
self.result="<p>Changing : %s"%fn+self.result |
|
logging.debug("uploadatffinallythread changing:%s"%fn+self.result) |
founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn),from_tmp=True) |
founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn),from_tmp=True) |
if i==200: |
if i%200==0: |
i=0 |
|
transaction.get().commit() |
transaction.get().commit() |
logging.info("changing: do commit") |
logging.debug("uploadatffinallythread changing: do commit") |
|
|
transaction.get().commit() |
transaction.get().commit() |
logging.info("changing: last commit") |
logging.debug("uploadatffinallythread changing: last commit") |
|
|
#now add the new files |
#now add the new files |
newPs=SESSION['newPs'] |
newPs=SESSION['newPs'] |
if len(newPs)>0: |
if len(newPs)>0: |
tmpDir=SESSION['tmpdir'] |
tmpDir=SESSION['tmpdir'] |
logging.info("adding start") |
logging.debug("uploadatffinallythread adding start") |
self.result="<p>Adding files</p>"+self.result |
self.result="<p>Adding files</p>"+self.result |
#TODO: make this configurable, at the moment base folder for the files has to be cdli_main |
#TODO: make this configurable, at the moment base folder for the files has to be cdli_main |
|
|
ctx2.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self) |
ctx2.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self) |
logging.info("adding finished") |
logging.debug("uploadatffinallythread adding finished") |
|
|
|
|
#unlock locked files? |
#unlock locked files? |
if unlock: |
if unlock: |
logging.info("unlocking start") |
logging.debug("uploadatffinallythread unlocking start") |
self.result="<p>Unlock files</p>"+self.result |
self.result="<p>Unlock files</p>"+self.result |
unlockFns=[] |
unlockFns=[] |
for x in os.listdir(SESSION['tmpdir']): |
for x in os.listdir(SESSION['tmpdir']): |
if not x in SESSION['errors']: |
if not x in SESSION['errors']: |
unlockFns.append(x) |
unlockFns.append(x) |
logging.info("unlocking have now what to unlock") |
|
|
logging.debug("unlocking have now what to unlock") |
|
|
for fn in unlockFns: |
for fn in unlockFns: |
#logging.info("will unlock: %s"%fn) |
#logging.info("will unlock: %s"%fn) |
Line 293 class uploadATFfinallyThread(Thread):
|
Line 377 class uploadATFfinallyThread(Thread):
|
if len(founds)>0: |
if len(founds)>0: |
#logging.info("unlock: %s"%founds[0].getObject().getId()) |
#logging.info("unlock: %s"%founds[0].getObject().getId()) |
SESSION['author']=str(username) |
SESSION['author']=str(username) |
|
|
founds[0].getObject().lockedBy="" |
founds[0].getObject().lockedBy="" |
logging.info("unlocking done") |
|
|
logging.debug("uploadatffinallythread unlocking done") |
|
|
#if a basketname is given, add files to the basket |
#if a basketname is given, add files to the basket |
if not (basketname ==''): |
if not (basketname ==''): |
logging.info("add to basket %s"%basketname) |
logging.debug("uploadatffinallythread add to basket %s"%basketname) |
self.result="<p>Add to basket</p>"+self.result |
self.result="<p>Add to basket</p>"+self.result |
basketId=ctx2.basketContainer.getBasketIdfromName(basketname) |
basketId=ctx2.basketContainer.getBasketIdfromName(basketname) |
|
|
if not basketId: # create new basket |
if not basketId: # create new basket |
logging.info("create basket %s"%basketname) |
logging.debug("uploadatffinallythread create basket %s"%basketname) |
self.result="<p>Create a new basket</p>"+self.result |
self.result="<p>Create a new basket</p>"+self.result |
ob=ctx2.basketContainer.addBasket(basketname) |
ob=ctx2.basketContainer.addBasket(basketname) |
basketId=ob.getId() |
basketId=ob.getId() |
Line 312 class uploadATFfinallyThread(Thread):
|
Line 396 class uploadATFfinallyThread(Thread):
|
ids=os.listdir(SESSION['tmpdir']) |
ids=os.listdir(SESSION['tmpdir']) |
basket.addObjects(ids,deleteOld=True,username=str(username)) |
basket.addObjects(ids,deleteOld=True,username=str(username)) |
|
|
|
logging.debug("uploadatffinallythread uploadfinally done") |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect(self.aq_parent.absolute_url()) |
RESPONSE.redirect(self.aq_parent.absolute_url()) |
|
|
|
|
logging.info("uploadfinally done") |
|
return True |
return True |
|
|
class tmpStore(SimpleItem): |
class tmpStore(SimpleItem): |
Line 530 class CDLIBasketContainer(OrderedFolder)
|
Line 614 class CDLIBasketContainer(OrderedFolder)
|
|
|
return ret |
return ret |
|
|
|
security.declareProtected('manage','getBasketAsOneFile') |
def getBasketAsOneFile(self,basketName,current="no"): |
def getBasketAsOneFile(self,basketName,current="no"): |
"""returns all files of the basket combined in one file |
"""returns all files of the basket combined in one file |
@param basketName: Name of the basket |
@param basketName: Name of the basket |
Line 547 class CDLIBasketContainer(OrderedFolder)
|
Line 632 class CDLIBasketContainer(OrderedFolder)
|
ret+=str(object[0].getData())+"\n" |
ret+=str(object[0].getData())+"\n" |
elif current=="yes": |
elif current=="yes": |
#search current object |
#search current object |
logging.info("crrent: %s"%object[1].getId().split(".")[0]) |
logging.debug("current: %s"%object[1].getId().split(".")[0]) |
founds=self.CDLICatalog.search({'title':object[1].getId().split(".")[0]}) |
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" |
return ret |
return ret |
|
|
|
security.declareProtected('manage','upDateBaskets') |
def upDateBaskets(self): |
def upDateBaskets(self): |
"""update content in to objects""" |
"""update content in to objects""" |
|
|
Line 623 class CDLIBasketContainer(OrderedFolder)
|
Line 709 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 827 class CDLIBasketContainer(OrderedFolder)
|
Line 913 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 883 class CDLIBasket(Folder,CatalogAware):
|
Line 969 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 1204 class CDLIBasketVersion(Implicit,Persist
|
Line 1326 class CDLIBasketVersion(Implicit,Persist
|
self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
self.REQUEST.RESPONSE.write(ret) |
self.REQUEST.RESPONSE.write(ret) |
|
|
security.declareProtected('View','downloadObjectsAsOneFile') |
security.declareProtected('manage','downloadObjectsAsOneFile') |
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"): |
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"): |
"""download all selected files in one file""" |
"""download all selected files in one file""" |
|
|
Line 1322 class CDLIBasketVersion(Implicit,Persist
|
Line 1444 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 1336 class CDLIBasketVersion(Implicit,Persist
|
Line 1458 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 1388 class CDLIFileObject(CatalogAware,extVer
|
Line 1510 class CDLIFileObject(CatalogAware,extVer
|
|
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
|
|
|
security.declareProtected('manage','index_html') |
|
|
security.declarePublic('makeThisVersionCurrent') |
security.declarePublic('view') |
|
view = PageTemplateFile('zpt/viewCDLIFile.zpt', globals()) |
|
|
|
security.declarePublic('editATF') |
|
editATF = PageTemplateFile('zpt/editATFFile.zpt', globals()) |
|
|
def PrincipiaSearchSource(self): |
def PrincipiaSearchSource(self): |
"""Return cataloguable key for ourselves.""" |
"""Return cataloguable key for ourselves.""" |
Line 1400 class CDLIFileObject(CatalogAware,extVer
|
Line 1527 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 |
|
parent.manage_addVersionedFileObject(id=None,vC=comment,author=author,file=self.getData(),RESPONSE=RESPONSE) |
|
#newversion=parent.manage_addCDLIFileObject('',comment,author) |
|
#newversion.manage_upload(self.getData()) |
|
|
|
#if RESPONSE is not None: |
newversion=parent.manage_addCDLIFileObject('',comment,author) |
# RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') |
newversion.manage_upload(self.getData()) |
|
|
|
if RESPONSE is not None: |
|
RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') |
|
|
|
|
|
return True |
return True |
|
|
security.declarePublic('view') |
|
|
|
def getFormattedData(self): |
def getFormattedData(self): |
"""fromat text""" |
"""fromat text""" |
data=self.getData() |
data=self.getData() |
# return re.sub("\s\#lem"," #lem",data) #remove return vor #lem |
# return re.sub("\s\#lem"," #lem",data) #remove return vor #lem |
return re.sub("#lem"," #lem",data) #remove return vor #lem |
return re.sub("#lem"," #lem",data) #remove return vor #lem |
|
|
def view(self): |
|
"""view file""" |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) |
|
return pt() |
|
|
|
security.declarePublic('getPNumber') |
security.declarePublic('getPNumber') |
def getPNumber(self): |
def getPNumber(self): |
Line 1455 class CDLIFileObject(CatalogAware,extVer
|
Line 1576 class CDLIFileObject(CatalogAware,extVer
|
except: |
except: |
return "ERROR" |
return "ERROR" |
|
|
|
|
manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') |
manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') |
|
|
def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='', |
def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',versionNumber=0, |
|
precondition='', content_type='', |
from_tmp=False,REQUEST=None): |
from_tmp=False,REQUEST=None): |
"""Add a new File object. |
"""Add a new File object. |
|
|
Creates a new File object 'id' with the contents of 'file'""" |
Creates a new File object 'id' with the contents of 'file'""" |
|
|
id=str(id) |
id=str(id) |
Line 1473 def manage_addCDLIFileObject(self,id,vC=
|
Line 1595 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 1558 class CDLIFile(extVersionedFile,CatalogA
|
Line 1689 class CDLIFile(extVersionedFile,CatalogA
|
#return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] |
#return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] |
|
|
|
|
|
def _newContentObject(self, id, title='', versionNumber=0, versionComment=None, time=None, author=None): |
|
"""factory for content objects. to be overridden in derived classes.""" |
|
logging.debug("_newContentObject(CDLI)") |
|
return CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author) |
|
|
|
|
def addCDLIFileObjectForm(self): |
def addCDLIFileObjectForm(self): |
"""add a new version""" |
"""add a new version""" |
|
|
Line 1583 class CDLIFile(extVersionedFile,CatalogA
|
Line 1720 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 1620 class CDLIFile(extVersionedFile,CatalogA
|
Line 1730 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 1649 def manage_addCDLIFile(self,id,title,loc
|
Line 1755 def manage_addCDLIFile(self,id,title,loc
|
tryToggle=True |
tryToggle=True |
tryCount=0 |
tryCount=0 |
|
|
|
|
|
|
self._setObject(id,newObj) |
self._setObject(id,newObj) |
getattr(self,id).reindex_object() |
getattr(self,id).reindex_object() |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
|
|
|
|
def checkUTF8(data): |
def checkUTF8(data): |
"""check utf 8""" |
"""check utf 8""" |
try: |
try: |
Line 1687 def splitatf(fh,dir=None,ext=None):
|
Line 1792 def splitatf(fh,dir=None,ext=None):
|
nf=None |
nf=None |
i=0 |
i=0 |
|
|
|
#ROC: why split \n first and then \r??? |
if (type(fh) is StringType) or (type(fh) is UnicodeType): |
if (type(fh) is StringType) or (type(fh) is UnicodeType): |
iter=fh.split("\n") |
iter=fh.split("\n") |
else: |
else: |
Line 1740 class CDLIFileFolder(extVersionedFileFol
|
Line 1846 class CDLIFileFolder(extVersionedFileFol
|
|
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
meta_type="CDLI Folder" |
meta_type="CDLI Folder" |
filesMetaType=['CDLI file'] |
file_meta_type=['CDLI file'] |
folderMetaType=['CDLI Folder'] |
folder_meta_type=['CDLI Folder'] |
default_catalog='CDLICatalog' |
|
defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzufŸgen einer neuen version eines files dieser catalog neuiniziert |
file_catalog='CDLICatalog' |
|
|
#downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert. |
#downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert. |
tmpStore2={} |
tmpStore2={} |
|
|
|
def _newVersionedFile(self, id, title='', lockedBy=None, author=None): |
|
"""factory for versioned files. to be overridden in derived classes.""" |
|
logging.debug("_newVersionedFile(CDLI)") |
|
return CDLIFile(id, title, lockedBy=lockedBy, author=author) |
|
|
def setTemp(self,name,value): |
def setTemp(self,name,value): |
"""set tmp""" |
"""set tmp""" |
|
|
setattr(self,name,value) |
setattr(self,name,value) |
|
|
|
deleteFileForm = PageTemplateFile("zpt/doDeleteFile", globals()) |
|
|
def delete(self,ids): |
def delete(self,ids,REQUEST=None): |
"""delete this file, i.e. move into a trash folder""" |
"""delete these files""" |
|
if type(ids) is not ListType: |
|
ids=[ids] |
|
|
found=self.ZopeFind(self,obj_ids=['.trash']) |
self.manage_delObjects(ids) |
|
|
if len(found)<1: |
if REQUEST is not None: |
manage_addCDLIFileFolder(self, '.trash',title="Trash") |
return self.index_html() |
trash=self._getOb('.trash') |
|
else: |
|
trash=found[0][1] |
|
|
|
if type(ids) is not ListType: |
|
ids=[ids] |
|
cut=self.manage_cutObjects(ids) |
|
trash.manage_pasteObjects(cut) |
|
|
|
def getVersionNumbersFromIds(self,ids): |
def getVersionNumbersFromIds(self,ids): |
"""get the numbers of the current versions of documents described by their ids""" |
"""get the numbers of the current versions of documents described by their ids""" |
Line 1777 class CDLIFileFolder(extVersionedFileFol
|
Line 1886 class CDLIFileFolder(extVersionedFileFol
|
founds=self.CDLICatalog.search({'title':searchStr}) |
founds=self.CDLICatalog.search({'title':searchStr}) |
|
|
for found in founds: |
for found in founds: |
lastVersion=found.getObject().getLastVersion() |
lastVersion=found.getObject().getContentObject() |
ret.append((found.getId,lastVersion)) |
ret.append((found.getId,lastVersion)) |
|
|
return ret |
return ret |
|
|
def getFile(self,fn): |
def getFile(self,fn): |
"""get the content of the file fn""" |
"""get the content of the file fn""" |
founds=self.CDLICatalog.search({'title':fn}) |
logging.debug("getFile: %s"%repr(fn)) |
if not founds: |
if not self.hasObject(fn): |
|
# search deeper |
|
founds=getattr(self, self.file_catalog).search({'textid':fn}) |
|
if founds: |
|
obj=founds[0].getObject().getContentObject() |
|
else: |
return "" |
return "" |
else: |
else: |
obj=founds[0].getObject().getLastVersion() |
obj = self[fn].getContentObject() |
|
|
return obj.getData()[0:] |
return obj.getData()[0:] |
|
|
|
|
def checkCatalog(self,fn): |
def checkCatalog(self,fn): |
"""check if fn is in the catalog""" |
"""check if fn is in the catalog""" |
#TODO add checkCatalog |
#TODO add checkCatalog |
|
|
|
|
|
|
def findObjectsFromListWithVersion(self,list,author=None): |
def findObjectsFromListWithVersion(self,list,author=None): |
"""find objects from a list with versions |
"""find objects from a list with versions |
@param list: list of tuples (cdliFile,version) |
@param list: list of tuples (cdliFile,version) |
""" |
""" |
|
|
|
|
|
|
#self.REQUEST.SESSION['fileIds']=list#store fieldIds in session for further usage |
#self.REQUEST.SESSION['fileIds']=list#store fieldIds in session for further usage |
#self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] |
#self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] |
|
|
|
|
pt=getattr(self,'filelistVersioned.html') |
pt=getattr(self,'filelistVersioned.html') |
|
|
return pt(search=list,author=author) |
return pt(search=list,author=author) |
Line 1889 class CDLIFileFolder(extVersionedFileFol
|
Line 1999 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 1916 class CDLIFileFolder(extVersionedFileFol
|
Line 2026 class CDLIFileFolder(extVersionedFileFol
|
|
|
#os.write(tf,obj.getLastVersion().data) |
#os.write(tf,obj.getLastVersion().data) |
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(obj.getLastVersion().getData()[0:]) |
RESPONSE.write(obj.getData()[0:]) |
RESPONSE.write("\n") |
RESPONSE.write("\n") |
self.temp_folder.downloadCounter-=1 |
self.temp_folder.downloadCounter-=1 |
self._p_changed=1 |
self._p_changed=1 |
Line 1936 class CDLIFileFolder(extVersionedFileFol
|
Line 2046 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 1944 class CDLIFileFolder(extVersionedFileFol
|
Line 2054 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 2002 class CDLIRoot(Folder):
|
Line 2112 class CDLIRoot(Folder):
|
meta_type="CDLIRoot" |
meta_type="CDLIRoot" |
downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible |
downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible |
|
|
def deleteFiles(self,ids): |
file_catalog = 'CDLICatalog' |
"""delete files (resp. move into .trash folder)""" |
|
# find or generete trash folder |
|
|
|
found=self.ZopeFind(self,obj_ids=['.trash']) |
# word splitter for search |
|
splitter = {'words':cdliSplitter.wordSplitter(), |
if len(found)<1: |
'graphemes':cdliSplitter.graphemeSplitter()} |
manage_addCDLIFileFolder(self, '.trash',title="Trash") |
|
trash=self._getOb('.trash') |
|
else: |
|
logging.info(found) |
|
trash=found[0][1] |
|
|
|
|
|
|
def deleteFiles(self,ids): |
|
"""delete files""" |
for id in ids: |
for id in ids: |
founds=self.CDLICatalog.search({'title':id.split(".")[0]}) |
founds=self.CDLICatalog.search({'title':id.split(".")[0]}) |
if founds: |
if founds: |
logging.info(founds) |
logging.debug("deleting %s"%founds) |
folder=founds[0].getObject().aq_parent #get the parent folder of the object |
folder=founds[0].getObject().aq_parent #get the parent folder of the object |
logging.info(folder) |
logging.debug("deleting from %s"%folder) |
cut=folder.manage_cutObjects([founds[0].getId]) #cut it out |
cut=folder.delete([founds[0].getId]) #cut it out |
trash.manage_pasteObjects(cut) #paste it in the trash |
|
|
|
|
|
def findWordRegExp(self,indexName,searchTerm): |
|
"""find all words in index which match regexp in SearchTerm |
|
@param indexName: name of the index to be searched in |
|
@param searchTerm: word to be searched""" |
|
|
|
ret=[] |
|
for x in self.lineIndexes[indexName].iterkeys(): |
|
if re.match(searchTerm,x): |
|
ret.append(x) |
|
return ret |
|
|
|
def searchRegExpInLineIndexDocs(self,indexName,searchTerm): |
|
"""search in inLineIndex with regexp |
|
@param indexName: name of the index to be searched in |
|
@param searchTerm: term to be searched |
|
""" |
|
if not searchTerm: |
|
return [] |
|
ret=[] |
|
words=self.findWordRegExp(indexName,searchTerm) # suche nach allen Treffern |
|
logging.info("wd:%s"%words) |
|
for word in words: |
|
ret+=self.searchInLineIndexDocs(indexName,word) |
|
|
|
return unique(ret) |
|
|
|
def showInLineIndex(self): |
|
"""get the index for debug purposes""" |
|
print "show" |
|
for key in self.lineIndexes.keys(): |
|
logging.info("index:%s"%key) |
|
for x in self.lineIndexes[key].iterkeys(): |
|
logging.info("word:%s"%repr(x)) |
|
#for y in self.lineIndex[x].iterkeys(): |
|
# print "doc",repr(y),repr(self.lineIndex[x][y]) |
|
|
|
return self.lineIndexes |
|
|
|
def searchInLineIndexDocs(self,indexName,word,uniq=True,regExp=False): |
|
"""search occurences in an index |
|
@param indexName: name of the index to be searched in |
|
@param word: word to be searched |
|
@param unique: (optional) unify the list of results |
|
@param regExp: (optional) use regular expressions |
|
""" |
|
|
|
if regExp: |
|
return self.searchRegExpInLineIndexDocs(indexName,word) |
|
|
|
try: |
|
|
|
lst=list(self.lineIndexes[indexName].get(word).keys()) |
|
except: |
|
logging.error("error: searchInLineIndexDocs (%s %s)"%(sys.exc_info()[0:2])) |
|
lst=[] |
|
if uniq: |
|
return unique(lst) |
|
else: |
|
return lst |
|
|
|
def getLinesFromIndex(self,indexName,word,doc,regExp=False): |
|
"""return all lines from a document where word is found |
|
@param indexName: Name of the index |
|
@param word: word to be searched |
|
@param doc: name of the document (usuallay the p-number) |
|
@param regExp: (optional) use regExp |
|
""" |
|
|
|
if not regExp: |
|
return self.lineIndexes[indexName].get(word)[doc] |
|
else: # wenn regexp, suche welches word |
|
for w in self.findWordRegExp(indexName,word): |
|
if self.lineIndexes[indexName].get(w): # ein word in im dex gefunden |
|
try: |
|
dc=self.lineIndex[indexName].get(word)[doc] |
|
return dc # und ein document dann gib es zurueck |
|
except: |
|
pass #andernfalls weiter |
|
|
|
def cleanInLineIndex(self,indexName): |
|
"""empty an InlineIndex |
|
@param indexName: name of the index |
|
""" |
|
for x in list(self.lineIndexes[indexName].keys()): |
|
del(self.lineIndexes[indexName][x]) |
|
print [x for x in self.lineIndexes[indexName].keys()] |
|
|
|
return "ok" |
|
|
|
def storeInLineIndex(self,indexName,key,value): |
|
"""store in index, key is normally a word or grapheme |
|
and value is a tuple (documentname, line) where the word can be found |
|
@param indexName: name of the index |
|
@param key: key in index |
|
@param value: value in index, value is a tuple (document name, line) |
|
""" |
|
logging.error("indexing: %s %s"%(indexName,key)) |
|
if (not hasattr(self,'lineIndexes')): |
|
|
|
self.lineIndexes={} |
|
|
|
if self.lineIndexes.get(indexName,None) is None: |
|
#index exisitiert noch nicht dann anlegen |
|
|
|
self.lineIndexes[indexName]=OOBTree() |
|
lis=self.lineIndexes |
|
li=lis[indexName] |
|
|
|
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 |
|
logging.debug("searchtext for '%s' in index %s"%(query,index)) |
|
#import Products.ZCTextIndex.QueryParser |
|
#qp = QueryParser.QueryParser() |
|
#logging.debug() |
|
idxQuery = {index:{'query':query}} |
|
idx = getattr(self, self.file_catalog) |
|
# do search |
|
resultset = idx.search(query_request=idxQuery,sort_index='textid') |
|
# put only the P-Number in the result |
|
results = [res.getId[:7] for res in resultset] |
|
logging.debug("searchtext: found %d texts"%len(results)) |
|
return results |
|
|
|
|
|
def getFile(self, pnum): |
|
"""get the translit file with the given pnum""" |
|
f = getattr(self, self.file_catalog).search({'textid':pnum}) |
|
if not f: |
|
return "" |
|
|
self.lineIndexes=lis |
return f[0].getObject().getData() |
|
|
transaction.get().commit() |
|
|
|
|
|
def showFile(self,fileId): |
def showFile(self,fileId,wholePage=False): |
"""show a file |
"""show a file |
@param fileId: P-Number of the document to be displayed |
@param fileId: P-Number of the document to be displayed |
""" |
""" |
f=self.CDLICatalog({'title':fileId}) |
f=getattr(self, self.file_catalog).search({'textid':fileId}) |
if not f: |
if not f: |
return "" |
return "" |
|
|
|
if wholePage: |
|
logging.debug("show whole page") |
|
return f[0].getObject().getContentObject().view() |
|
else: |
return f[0].getObject().getLastVersionFormattedData() |
return f[0].getObject().getLastVersionFormattedData() |
|
|
|
|
def showWordInFile(self,fileId,word,lineList=None,regExp=True,indexName=""): |
def showWordInFile(self,fileId,word,indexName='graphemes',regExp=False,): |
"""get lines with word fromFileId""" |
"""get lines with word fromFileId""" |
|
logging.debug("showwordinfile word='%s' index=%s file=%s"%(word,indexName,fileId)) |
|
|
file=self.showFile(fileId) |
file = formatAtfFullLineNum(self.getFile(fileId)) |
|
|
ret=[] |
ret=[] |
if regExp: # wenn regexp dann generiere alle worte aus der list die der regexp entsprechen |
|
wordlist=self.findWordRegExp(indexName,word) |
|
else: |
|
wordlist=[word] |
|
|
|
for line in file.split("\n"): |
# add whitespace before and whitespace and line-end to splitter bounds expressions |
found=False |
bounds = self.splitter[indexName].bounds |
for word in wordlist: |
splitexp = "(%s|\s)(%%s)(%s|\s|\Z)"%(bounds,bounds) |
if line.find(word)>-1: |
# clean word expression |
if lineList: #liste of moeglichen Zeilennummern |
# TODO: this should use QueryParser itself |
num=line.split(".")[0] #Zeilenummer ist alles vor dem . in der Zeile |
# take out double quotes |
|
word = word.replace('"','') |
if num in lineList: |
# take out ignorable signs |
|
ignorable = self.splitter[indexName].ignorex |
|
word = ignorable.sub('', word) |
|
# compile into regexp objects and escape parens |
|
wordlist = [re.compile(splitexp%re.escape(w)) for w in word.split(' ')] |
|
|
|
for line in file.splitlines(): |
|
for word in wordlist: |
|
#logging.debug("showwordinfile: searching for %s in %s"%(word.pattern,ignoreable.sub('',line))) |
|
if word.search(ignorable.sub('',line)): |
|
line = formatAtfLineHtml(line) |
ret.append(line) |
ret.append(line) |
else: # nimm alles ohne line check |
break |
ret.append(line) |
|
|
|
break; |
|
return ret |
return ret |
|
|
def tagWordInFile(self,fileId,word,lineList=None,regExp=True,indexName=""): |
|
"""get lines with word fromFileId""" |
|
|
|
file=self.showFile(fileId) |
def showWordInFiles(self,fileIds,word,indexName='graphemes',regExp=False): |
tagStr="""<span class="found">%s</span>""" |
""" |
|
get lines with word from all ids in list FileIds. |
|
returns dict with id:lines pairs. |
|
""" |
|
logging.debug("showwordinfiles word='%s' index=%s file=%s"%(word,indexName,fileIds)) |
|
|
|
return dict([(id,self.showWordInFile(id, word, indexName, regExp)) for id in fileIds]) |
|
|
|
|
|
def tagWordInFile(self,fileId,word,indexName='graphemes',regExp=False): |
|
"""get text with word highlighted from FileId""" |
|
logging.debug("tagwordinfile word='%s' index=%s file=%s"%(word,indexName,fileId)) |
|
|
|
file=self.getFile(fileId) |
|
tagStart=u'<span class="found">' |
|
tagEnd=u'</span>' |
|
tagStr=tagStart + u'%%s' + tagEnd |
ret=[] |
ret=[] |
|
|
if regExp: # wenn regexp dann generiere alle worte aus der list die der regexp entsprechen |
# add whitespace to splitter bounds expressions and compile into regexp object |
wordlist=self.findWordRegExp(indexName,word) |
bounds = self.splitter[indexName].bounds |
|
wordsplit = re.compile("(%s|\s)"%bounds) |
|
# clean word expression |
|
# TODO: this should use QueryParser itself |
|
word = word.replace('"','') # take out double quotes |
|
# take out ignoreable signs |
|
ignorable = self.splitter[indexName].ignorex |
|
word = ignorable.sub('', word) |
|
# split search terms by blanks |
|
words = word.split(' ') |
|
# split search terms again (for grapheme search with words) |
|
splitwords = dict(((w,self.splitter[indexName].process([w])) for w in words)) |
|
|
|
for line in file.splitlines(): |
|
line = unicodify(line) |
|
# ignore lemma and other lines |
|
if line.lstrip().startswith('#lem:'): |
|
continue |
|
# ignore p-num line |
|
if line.startswith('&P'): |
|
continue |
|
# ignore version lines |
|
if line.startswith('#version'): |
|
continue |
|
# ignore atf type lines |
|
if line.startswith('#atf:'): |
|
continue |
|
|
|
# first scan |
|
hitwords = [] |
|
for w in words: |
|
if ignorable.sub('',line).find(w) > -1: |
|
# word is in line |
|
# append split word for grapheme search with words |
|
hitwords.extend(splitwords[w]) |
|
#hitwords.extend(wordsplit.split(w)) |
|
|
|
# examine hits closer |
|
if hitwords: |
|
# split line into words |
|
parts = wordsplit.split(line) |
|
line = "" |
|
for p in parts: |
|
#logging.debug("tagwordinfile: searching for %s in %s"%(p,hitwords)) |
|
# reassemble line |
|
if ignorable.sub('', p) in hitwords: |
|
#logging.debug("tagwordinfile: found %s in %s"%(p,hitwords)) |
|
# this part was found |
|
line += tagStart + formatAtfHtml(p) + tagEnd |
else: |
else: |
wordlist=[word] |
line += formatAtfHtml(p) |
|
|
for line in file.split("\n"): |
else: |
found=False |
# no hits |
for word in wordlist: |
line = formatAtfHtml(line) |
if line.find(word)>-1: #word ist gefunden dann makiere und breche die Schleife ab |
|
if lineList: #liste of moeglichen Zeilennummern |
|
num=line.split(".")[0] #Zeilenummer ist alles vor dem . in der Zeile |
|
|
|
if num in lineList: |
ret.append(line) |
|
|
ret.append(line.replace(word,tagStr%word)) |
return u'<br>\n'.join(ret) |
|
|
else: # nimm alles ohne line check |
|
ret.append(line.replace(word,tagStr%word)) |
|
found=True |
|
break |
|
if not found: #word wurde nicht gefunden keine makierung |
|
ret.append(line) |
|
|
|
return "<br>\n".join(ret) |
|
|
def tagWordInFiles(self,fileIds,word,indexName='graphemes',regExp=False): |
|
""" |
|
get texts with highlighted word from all ids in list FileIds. |
|
returns dict with id:text pairs. |
|
""" |
|
logging.debug("tagwordinfiles word='%s' index=%s file=%s"%(word,indexName,fileIds)) |
|
return dict([(id,self.tagWordInFile(id, word, indexName, regExp)) for id in fileIds]) |
|
|
|
|
def URLquote(self,str): |
def URLquote(self,str): |
"""quote url""" |
"""quote url""" |
Line 2479 class CDLIRoot(Folder):
|
Line 2550 class CDLIRoot(Folder):
|
|
|
def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/atf", files=None,ext=None): |
def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/atf", files=None,ext=None): |
"""import files""" |
"""import files""" |
|
logging.debug("importFiles folderName=%s files=%s ext=%s"%(folderName,files,ext)) |
root=self.cdli_main |
root=self.cdli_main |
count=0 |
count=0 |
if not files: |
if not files: |
Line 2488 class CDLIRoot(Folder):
|
Line 2560 class CDLIRoot(Folder):
|
folder=f[0:3] |
folder=f[0:3] |
f2=f[0:5] |
f2=f[0:5] |
obj=self.ZopeFind(root,obj_ids=[folder]) |
obj=self.ZopeFind(root,obj_ids=[folder]) |
|
logging.debug("importFiles: folder=%s f2=%s obj=%s"%(folder,f2,obj)) |
if ext: |
if ext: |
|
|
ext.result="<p>adding: %s </p>"%f+ext.result |
ext.result="<p>adding: %s </p>"%f+ext.result |
|
|
if not obj: |
if not obj: |
manage_addCDLIFileFolder(root,folder,folder) |
manage_addCDLIFileFolder(root,folder,folder) |
fobj=getattr(root,folder) |
fobj=getattr(root,folder) |
#transaction.get().commit() |
#transaction.get().commit() |
|
|
else: |
else: |
fobj=obj[0][1] |
fobj=obj[0][1] |
|
|
obj2=fobj.ZopeFind(fobj,obj_ids=[f2]) |
obj2=fobj.ZopeFind(fobj,obj_ids=[f2]) |
|
logging.debug("importFiles: fobj=%s obj2=%s"%(fobj,obj2)) |
|
|
if not obj2: |
if not obj2: |
manage_addCDLIFileFolder(fobj,f2,f2) |
manage_addCDLIFileFolder(fobj,f2,f2) |
Line 2509 class CDLIRoot(Folder):
|
Line 2584 class CDLIRoot(Folder):
|
|
|
file2=os.path.join(folderName,f) |
file2=os.path.join(folderName,f) |
id=f |
id=f |
manage_addCDLIFile(fobj2,f,'','') |
logging.debug("importFiles: addCDLIFile fobj2=%s, f=%s file2=%s"%(fobj2,repr(f),repr(file2))) |
id=f |
fobj2.addFile(vC='',file=file(file2),author=author,newName=f) |
ob=fobj2._getOb(f) |
|
ob.title=id |
|
|
|
manage_addCDLIFileObject(ob,id,comment,author,file2,content_type='',from_tmp=True) |
|
self.CDLICatalog.catalog_object(ob) |
|
#self.CDLICatalog.manage_catalogFoundItems(obj_ids=[id],search_sub=1) |
|
#self.CDLICatalog.manage_catalogObject(self.REQUEST, self.REQUEST.RESPONSE, 'CDLICatalog', urlparse.urlparse(ob.absolute_url())[1]) |
|
count+=1 |
count+=1 |
|
|
if count > 1000: |
if count%100==0: |
print "committing" |
logging.debug("importfiles: committing") |
transaction.get().commit() |
transaction.get().commit() |
count=0 |
|
transaction.get().commit() |
transaction.get().commit() |
return "ok" |
return "ok" |
|
|