--- cdli/cdli_files.py 2007/03/20 10:49:15 1.69
+++ cdli/cdli_files.py 2007/08/31 14:22:52 1.79
@@ -26,7 +26,64 @@ import logging
import transaction
import copy
import codecs
+import sys
+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 generateXMLReturn(hash):
+ """erzeugt das xml file als returnwert fuer uploadATFRPC"""
+
+ ret=""
+
+ ret+=""
+ for error in hash['errors']:
+ ret+="""%s"""%error
+
+ ret+=""
+
+ ret+=""
+ for changed in hash['changed']:
+ ret+="""%s"""%changed
+ ret+=""
+
+ ret+=""
+ for new in hash['newPs']:
+ ret+=""""""%new
+ ret+=""
+
+ ret+=""
+ return ret
+
+
+
+
+
+
+
+
+
+
def unique(s):
"""Return a list of the elements in s, but without duplicates.
@@ -99,7 +156,7 @@ def unique(s):
class BasketContent(SimpleItem):
"""classe fuer den Inhalt eines Baskets"""
-
+
def __init__(self,content=[]):
"""content"""
self.contentList=content[0:]
@@ -196,6 +253,7 @@ class uploadATFfinallyThread(Thread):
self.result+="
Start processing
"
#shall I only upload the changed files?
+ logging.info("uploadATFfinally procedure: %s"%procedure)
if procedure=="uploadchanged":
changed=[x[0] for x in SESSION.get('changed',[])]
uploadFns=changed+SESSION.get('newPs',[])
@@ -341,6 +399,7 @@ class uploadATFThread(Thread):
ctx = self.getContext(app,serverport=self.serverport)
logging.info("run intern")
try:
+ logging.info("created: %s"%idTmp)
ctx.temp_folder._setObject(idTmp,tmpStore(idTmp))
except:
logging.error("thread upload: %s %s"%sys.exc_info()[0:2])
@@ -355,6 +414,7 @@ class uploadATFThread(Thread):
conn.close()
+ return getattr(ctx.temp_folder,idTmp)
def getResult(self):
"""method for accessing result"""
@@ -479,6 +539,46 @@ class CDLIBasketContainer(OrderedFolder)
security=ClassSecurityInfo()
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):
"""update content in to objects"""
@@ -506,12 +606,19 @@ class CDLIBasketContainer(OrderedFolder)
trash.manage_pasteObjects(cut)
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"""
if submit=="delete":
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:
RESPONSE.redirect(self.absolute_url())
@@ -542,7 +649,7 @@ class CDLIBasketContainer(OrderedFolder)
return pt(basketId=basketId,basketName=basketName)
- security.declareProtected('View','index_html')
+ security.declareProtected('manage','index_html')
def index_html(self):
"""stanadard ansicht"""
@@ -634,9 +741,83 @@ class CDLIBasketContainer(OrderedFolder)
baskets.sort(sortComment)
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):
"""createIds"""
last=getattr(self,'last',0)
@@ -672,13 +853,13 @@ class CDLIBasketContainer(OrderedFolder)
"""get name of the actualuser"""
return str(self.REQUEST['AUTHENTICATED_USER'])
-
+ security.declareProtected('manage','addBasket')
def addBasket(self,newBasketName):
"""add a new basket"""
ob=manage_addCDLIBasket(self,newBasketName)
return ob
-
+
def storeInBasket(self,submit,ids=None,newBasketName=None,fromFileList=None,RESPONSE=None,REQUEST=None):
"""store it"""
if not ids:
@@ -728,7 +909,43 @@ class CDLIBasket(Folder,CatalogAware):
meta_type="CDLIBasket"
default_catalog="CDLIBasketCatalog"
+ def searchInBasket(self,indexName,searchStr,regExp=False):
+ """searchInBasket"""
+ lst=self.searchInLineIndexDocs(indexName,searchStr,uniq=True,regExp=regExp)
+ 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):
return obj[1]
@@ -780,7 +997,11 @@ class CDLIBasket(Folder,CatalogAware):
self.shortDescription=shortDescription
self.comment=comment
-
+ def getActualUserName(self):
+ """get name of the actualuser"""
+
+ return str(self.REQUEST['AUTHENTICATED_USER'])
+
def getLastVersion(self):
"""hole letzte version"""
@@ -844,6 +1065,56 @@ class CDLIBasket(Folder,CatalogAware):
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 dazufgt, 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):
"""generate a new version of the basket with objects added"""
logging.info("add to basket (%s)"%(self.getId()))
@@ -883,7 +1154,17 @@ 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):
"""print basket content"""
ret=[]
@@ -970,7 +1251,22 @@ class CDLIBasketVersion(Implicit,Persist
return True
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"):
"""download all selected files in one file"""
@@ -1042,7 +1338,7 @@ class CDLIBasketVersion(Implicit,Persist
ret+=str(object[0].getData())+"\n"
elif current=="yes":
#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:
ret+=str(founds[0].getObject().getLastVersion().getData())+"\n"
@@ -1088,7 +1384,7 @@ class CDLIBasketVersion(Implicit,Persist
def __init__(self,id,user,comment="",basketContent=[]):
""" init a basket version"""
self.id=id
- self.coment=comment
+ self.comment=comment
self._setObject('content',BasketContent(basketContent))
#self.basketContent=basketContent[0:]a
self.user=user
@@ -1102,7 +1398,7 @@ class CDLIBasketVersion(Implicit,Persist
"""get Comment"""
return self.comment
- security.declareProtected('View','index_html')
+ security.declareProtected('manage','index_html')
def index_html(self):
"""view the basket"""
@@ -1157,6 +1453,7 @@ class CDLIFileObject(CatalogAware,extVer
security.declarePublic('makeThisVersionCurrent')
+ security.declareProtected('manage','index_html')
def PrincipiaSearchSource(self):
"""Return cataloguable key for ourselves."""
return str(self)
@@ -1185,7 +1482,8 @@ class CDLIFileObject(CatalogAware,extVer
def getFormattedData(self):
"""fromat text"""
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
def view(self):
"""view file"""
@@ -1264,9 +1562,10 @@ def manage_addCDLIFileObject(self,id,vC=
class CDLIFile(extVersionedFile,CatalogAware):
"""CDLI file"""
+ security=ClassSecurityInfo()
meta_type="CDLI file"
default_catalog='CDLICatalog'
-
+ security.declareProtected('manage','index_html')
#security.declarePublic('history')
def getLastVersionData(self):
"""get last version data"""
@@ -1445,17 +1744,6 @@ def checkFile(filename,data,folder):
else:
return True,""
-# else:
-# fn=os.path.join(folder,filename)
-# 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:
-# return True,""
def splitatf(fh,dir=None,ext=None):
"""split it"""
@@ -1463,7 +1751,12 @@ def splitatf(fh,dir=None,ext=None):
nf=None
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"):
#logging.log("Deal with: %s"%line)
@@ -1500,7 +1793,9 @@ def splitatf(fh,dir=None,ext=None):
nf.close()
except:
pass
- fh.close()
+
+ if not((type(fh) is StringType) or (type(fh) is UnicodeType)):
+ fh.close()
return ret,len(os.listdir(dir))
@@ -1555,7 +1850,7 @@ class CDLIFileFolder(extVersionedFileFol
"""get the content of the file fn"""
founds=self.CDLICatalog.search({'title':fn})
if not founds:
- return []
+ return ""
else:
obj=founds[0].getObject().getLastVersion()
@@ -1686,6 +1981,7 @@ class CDLIFileFolder(extVersionedFileFol
#os.write(tf,obj.getLastVersion().data)
if RESPONSE:
RESPONSE.write(obj.getLastVersion().getData()[0:])
+ RESPONSE.write("\n")
self.temp_folder.downloadCounter-=1
self._p_changed=1
transaction.get().commit()
@@ -1721,7 +2017,7 @@ class CDLIFileFolder(extVersionedFileFol
return ret
- security.declareProtected('View','index_html')
+ security.declareProtected('manage','index_html')
def index_html(self):
"""main"""
ext=self.ZopeFind(self,obj_ids=["index.html"])
@@ -1770,78 +2066,141 @@ class CDLIRoot(Folder):
meta_type="CDLIRoot"
downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible
- def findWordRegExp(self,searchTerm):
- """find all words in index which match regexp in SearchTerm"""
+ def deleteFiles(self,ids):
+ """delete files (resp. move into .trash folder)"""
+ # find or generete trash folder
+
+ found=self.ZopeFind(self,obj_ids=['.trash'])
+
+ if len(found)<1:
+ manage_addCDLIFileFolder(self, '.trash',title="Trash")
+ trash=self._getOb('.trash')
+ else:
+ logging.info(found)
+ trash=found[0][1]
+
+
+ for id in ids:
+ founds=self.CDLICatalog.search({'title':id.split(".")[0]})
+ if founds:
+ logging.info(founds)
+ folder=founds[0].getObject().aq_parent #get the parent folder of the object
+ logging.info(folder)
+ cut=folder.manage_cutObjects([founds[0].getId]) #cut it out
+ trash.manage_pasteObjects(cut) #paste it in the trash
+
+
+ def findWordRegExp(self,indexName,searchTerm):
+ """find all words in index which match regexp in SearchTerm
+ @param indexName: name of the index to be searched in
+ @param searchTerm: word to be searched"""
+
ret=[]
- for x in self.lineIndex.iterkeys():
+ for x in self.lineIndexes[indexName].iterkeys():
if re.match(searchTerm,x):
ret.append(x)
return ret
- def searchRegExpInLineIndexDocs(self,searchTerm):
- """search in inLineIndex with regexp"""
+ 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(searchTerm) # suche nach allen Treffern
+ words=self.findWordRegExp(indexName,searchTerm) # suche nach allen Treffern
logging.info("wd:%s"%words)
for word in words:
- ret+=self.searchInLineIndexDocs(word)
-
- return unique(ret)
-
+
+ ret+=self.searchInLineIndexDocs(indexName,word)
+
+
+ x= unique(ret)
+ logging.info("words_done")
+ return x
+
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
+ 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,word,uniq=True,regExp=False):
- """search occurences"""
+ 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(word)
+ return self.searchRegExpInLineIndexDocs(indexName,word)
try:
- lst=list(self.lineIndex.get(word).keys())
+
+ 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,word,doc,regExp=False):
- """get lines"""
+ 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.lineIndex.get(word)[doc]
+ return self.lineIndexes[indexName].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
+ for w in self.findWordRegExp(indexName,word):
+ if self.lineIndexes[indexName].get(w): # ein word in im dex gefunden
try:
- dc=self.lineIndex.get(word)[doc]
+ dc=self.lineIndex[indexName].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()]
+ 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,key,value):
- """store in index"""
-
- if (not hasattr(self,'lineIndex')) or (type(self.lineIndex) is DictType):
- self.lineIndex=OOBTree()
- li=self.lineIndex
+ 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):
@@ -1859,52 +2218,42 @@ class CDLIRoot(Folder):
li[key][value[0]]=[value[1]]
- self.lineIndex=li
+ self.lineIndexes=lis
transaction.get().commit()
- def showFile(self,fileId):
- """show a file"""
+ def showFile(self,fileId,wholePage=False):
+ """show a file
+ @param fileId: P-Number of the document to be displayed
+ """
f=self.CDLICatalog({'title':fileId})
if not f:
return ""
- return f[0].getObject().getLastVersionFormattedData()
+ if wholePage:
+ logging.info("whole")
+ return f[0].getObject().getLastVersion().view()
+ else:
+ 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,lineList=None,regExp=True,indexName=""):
"""get lines with word fromFileId"""
file=self.showFile(fileId)
-
+ logging.info("regEXP %s"%regExp)
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"):
- if line.find(word)>-1:
+ found=False
+ for word in wordlist:
+ try: # just a hack because of possible unicode errors in line
+ if line.find(word)>-1:
if lineList: #liste of moeglichen Zeilennummern
num=line.split(".")[0] #Zeilenummer ist alles vor dem . in der Zeile
@@ -1913,27 +2262,44 @@ class CDLIRoot(Folder):
ret.append(line)
else: # nimm alles ohne line check
ret.append(line)
+
+ break;
+ except:
+ pass
return ret
- def tagWordInFile(self,fileId,word,lineList=None):
+ def tagWordInFile(self,fileId,word,lineList=None,regExp=True,indexName=""):
"""get lines with word fromFileId"""
file=self.showFile(fileId)
- tagStr="""%s"""
+ tagStr=u'%s'
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"):
- if line.find(word)>-1:
+ line = unicodify(line)
+ found=False
+ for word in wordlist:
+ 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.replace(word,tagStr%word))
+
else: # nimm alles ohne line check
ret.append(line.replace(word,tagStr%word))
- else:
+ found=True
+ break
+ if not found: #word wurde nicht gefunden keine makierung
ret.append(line)
- return "
\n".join(ret)
+
+ return u'
\n'.join(ret)
def URLquote(self,str):
"""quote url"""
@@ -1962,19 +2328,8 @@ class CDLIRoot(Folder):
ret.append((f[0],un))
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):
"""getChangesByAuthor"""
zcat=self.CDLIObjectsCatalog
@@ -2036,10 +2391,40 @@ class CDLIRoot(Folder):
return ret
-
+ def uploadATFRPC(self,data,username):
+ """upload an atffile via xml-rpc"""
+ uploader=uploadATFThread()
+
+ #generate an random id for the upload object
+ from random import randint
+ if (not self.REQUEST.SESSION.get('idTmp',None)):
+
+ idTmp=str(randint(0,1000000000))
+ self.REQUEST.SESSION['idTmp']=idTmp
+ else:
+ idTmp=self.REQUEST.SESSION.get('idTmp',None)
+
+
+ uploader.set(data,0,username,idTmp)
+
+ stObj=uploader.run()
+
+ processor=uploadATFfinallyThread()
+
+ basketname=stObj.returnValue['basketNameFromFile']
+
+ processor.set("uploadchanged",basketname=basketname,SESSION=stObj.returnValue,username=username,serverport=self.REQUEST['SERVER_PORT'])
+
+ processor.run()
+
+
+ return generateXMLReturn(stObj.returnValue)
+
def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
"""upload an atf file / basket file"""
#self._v_uploadATF.returnValue=None
+
+ #generate an random id for the upload thread
from random import randint
if (not self.REQUEST.SESSION.get('idTmp',None)):
@@ -2048,8 +2433,10 @@ class CDLIRoot(Folder):
else:
idTmp=self.REQUEST.SESSION.get('idTmp',None)
+
threadName=repeat
if not threadName or threadName=="":
+ #new thread not called from the waiting page
tmpVar=False
thread=uploadATFThread()
@@ -2097,26 +2484,8 @@ class CDLIRoot(Folder):
return pt(txt='/uploadATF',threadName=threadName)
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
-
-
-
-
- #del(self.cdli_main.tmpStore2[threadName])
-
-
+
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],