Annotation of cdli/cdli_files.py, revision 1.88
1.22 dwinter 1: """CDLI extensions of the filearchive"""
1.47 dwinter 2: from Products.versionedFile.extVersionedFile import *
1.1 dwinter 3: from Products.ZCatalog.CatalogPathAwareness import CatalogAware
1.22 dwinter 4: from tempfile import mkstemp,mkdtemp
1.1 dwinter 5: import os.path
6: import os
7: from types import *
1.3 dwinter 8: import urlparse
1.49 dwinter 9: import urllib
10: import cgi
1.4 dwinter 11: from OFS.OrderedFolder import OrderedFolder
12: from OFS.SimpleItem import SimpleItem
13: import time
1.12 dwinter 14: from OFS.Folder import manage_addFolder
15: import re
1.19 dwinter 16: from AccessControl import ClassSecurityInfo
17: from Acquisition import Implicit
1.39 dwinter 18: from Globals import Persistent
1.19 dwinter 19: from threading import Thread
20: from ZPublisher.HTTPRequest import HTTPRequest
21: from ZPublisher.HTTPResponse import HTTPResponse
22: from ZPublisher.BaseRequest import RequestContainer
1.20 dwinter 23: import threading
1.83 dwinter 24: from BTrees.OOBTree import OOBTree, OOTreeSet
1.57 dwinter 25: import logging
1.58 dwinter 26: import transaction
1.61 dwinter 27: import copy
1.66 dwinter 28: import codecs
1.76 dwinter 29: import sys
1.83 dwinter 30: from BTrees.IOBTree import IOBTree
1.81 casties 31: import cdliSplitter
1.83 dwinter 32: from sets import Set
33: import md5
1.87 dwinter 34: from DownloadBasket import DownloadBasketFinallyThread
1.85 dwinter 35:
36: def makelist(mySet):
37: x = list(mySet)
38: x.sort()
39: return x
40:
1.79 casties 41: def unicodify(s):
42: """decode str (utf-8 or latin-1 representation) into unicode object"""
43: if not s:
44: return u""
45: if isinstance(s, str):
46: try:
47: return s.decode('utf-8')
48: except:
49: return s.decode('latin-1')
50: else:
51: return s
52:
53: def utf8ify(s):
54: """encode unicode object or string into byte string in utf-8 representation.
55: assumes string objects to be utf-8"""
56: if not s:
57: return ""
58: if isinstance(s, str):
59: return s
60: else:
61: return s.encode('utf-8')
62:
1.81 casties 63: def formatAtfHtml(l):
64: """escape special ATF characters for HTML"""
65: if not l:
66: return ""
67:
68: # replace &
69: l = l.replace('&','&')
70: # replace angular brackets
71: l = l.replace('<','<')
72: l = l.replace('>','>')
73: return l
74:
75: def formatAtfLineHtml(l, nolemma=True):
76: """format ATF line for HTML"""
77: if not l:
78: return ""
79:
80: if nolemma:
81: # ignore lemma lines
82: if l.lstrip().startswith('#lem:'):
83: return ""
84:
85: return formatAtfHtml(l)
86:
1.79 casties 87:
1.81 casties 88:
89: def formatAtfFullLineNum(txt, nolemma=True):
90: """format full line numbers in ATF text"""
91: # surface codes
92: surfaces = {'@obverse':'obv',
93: '@reverse':'rev',
94: '@surface':'surface',
95: '@edge':'edge',
96: '@left':'left',
97: '@right':'right',
98: '@top':'top',
99: '@bottom':'bottom',
100: '@face':'face',
101: '@seal':'seal'}
102:
103: if not txt:
104: return ""
105:
106: ret = []
107: surf = ""
108: col = ""
109: for line in txt.splitlines():
110: line = unicodify(line)
111: if line and line[0] == '@':
112: # surface or column
113: words = line.split(' ')
114: if words[0] in surfaces:
115: surf = line.replace(words[0],surfaces[words[0]]).strip()
116:
117: elif words[0] == '@column':
118: col = ' '.join(words[1:])
119:
120: elif line and line[0] in '123456789':
121: # ordinary line -> add line number
122: line = "%s:%s:%s"%(surf,col,line)
123:
124: ret.append(line)
125:
126: return '\n'.join(ret)
127:
128:
1.73 dwinter 129: def generateXMLReturn(hash):
130: """erzeugt das xml file als returnwert fuer uploadATFRPC"""
131:
132: ret="<return>"
133:
134: ret+="<errors>"
135: for error in hash['errors']:
136: ret+="""<error atf="%s">%s</error>"""%error
137:
138: ret+="</errors>"
139:
140: ret+="<changes>"
141: for changed in hash['changed']:
142: ret+="""<change atf="%s">%s</change>"""%changed
143: ret+="</changes>"
144:
145: ret+="<newPs>"
146: for new in hash['newPs']:
147: ret+="""<new atf="%s"/>"""%new
148: ret+="</newPs>"
149:
150: ret+="</return>"
151: return ret
152:
153:
1.55 dwinter 154: def unique(s):
155: """Return a list of the elements in s, but without duplicates.
156:
157: For example, unique([1,2,3,1,2,3]) is some permutation of [1,2,3],
158: unique("abcabc") some permutation of ["a", "b", "c"], and
159: unique(([1, 2], [2, 3], [1, 2])) some permutation of
160: [[2, 3], [1, 2]].
161:
162: For best speed, all sequence elements should be hashable. Then
163: unique() will usually work in linear time.
164:
165: If not possible, the sequence elements should enjoy a total
166: ordering, and if list(s).sort() doesn't raise TypeError it's
167: assumed that they do enjoy a total ordering. Then unique() will
168: usually work in O(N*log2(N)) time.
169:
170: If that's not possible either, the sequence elements must support
171: equality-testing. Then unique() will usually work in quadratic
172: time.
173: (from the python cookbook)
174: """
175:
176: n = len(s)
177: if n == 0:
178: return []
179:
180: # Try using a dict first, as that's the fastest and will usually
181: # work. If it doesn't work, it will usually fail quickly, so it
182: # usually doesn't cost much to *try* it. It requires that all the
183: # sequence elements be hashable, and support equality comparison.
184: u = {}
185: try:
186: for x in s:
187: u[x] = 1
188: except TypeError:
189: del u # move on to the next method
190: else:
191: return u.keys()
192:
193: # We can't hash all the elements. Second fastest is to sort,
194: # which brings the equal elements together; then duplicates are
195: # easy to weed out in a single pass.
196: # NOTE: Python's list.sort() was designed to be efficient in the
197: # presence of many duplicate elements. This isn't true of all
198: # sort functions in all languages or libraries, so this approach
199: # is more effective in Python than it may be elsewhere.
200: try:
201: t = list(s)
202: t.sort()
203: except TypeError:
204: del t # move on to the next method
205: else:
206: assert n > 0
207: last = t[0]
208: lasti = i = 1
209: while i < n:
210: if t[i] != last:
211: t[lasti] = last = t[i]
212: lasti += 1
213: i += 1
214: return t[:lasti]
215:
216: # Brute force is all that's left.
217: u = []
218: for x in s:
219: if x not in u:
220: u.append(x)
221: return u
222:
223:
1.39 dwinter 224: class BasketContent(SimpleItem):
225: """classe fuer den Inhalt eines Baskets"""
1.77 dwinter 226:
1.39 dwinter 227: def __init__(self,content=[]):
228: """content"""
229: self.contentList=content[0:]
230:
231: def getContent(self):
232: """get content"""
1.87 dwinter 233:
1.39 dwinter 234: return self.contentList
235:
236: def setContent(self,content):
237: self.contentList=content[0:]
238:
239: def numberOfItems(self):
240: """number"""
241:
242: return len(self.getContent())
243:
244:
1.19 dwinter 245: class uploadATFfinallyThread(Thread):
1.20 dwinter 246: """class for adding uploaded filed (temporarily stored in the staging area at /tmp"""
247:
1.19 dwinter 248: def __init__(self):
1.20 dwinter 249: """init for uploadATFfinallyThread"""
1.19 dwinter 250: self.continueVar=True
251: self.returnValue=None
252: self.end=False
253: Thread.__init__(self)
254:
255: def set(self,procedure,comment="",basketname='',unlock=None,SESSION=None,username=None,serverport="8080"):
1.20 dwinter 256: """set start values for the thread"""
1.19 dwinter 257: self.procedure=procedure
258: self.comment=comment
259: self.basketname=basketname
260: self.unlock=unlock
261: self.SESSION=SESSION
262: self.username=username
263: self.serverport=serverport
1.60 dwinter 264:
1.19 dwinter 265:
266: def __call__(self):
1.20 dwinter 267: """call of the thread (equals run)"""
1.19 dwinter 268: self.run()
269: return True
270:
271: def getContext(self, app,serverport="8080"):
1.20 dwinter 272: """get the context within the ZODB"""
273:
1.19 dwinter 274: resp = HTTPResponse(stdout=None)
275: env = {
276: 'SERVER_NAME':'localhost',
277: 'SERVER_PORT':serverport,
278: 'REQUEST_METHOD':'GET'
279: }
280: req = HTTPRequest(None, env, resp)
281: return app.__of__(RequestContainer(REQUEST = req))
282:
1.26 dwinter 283:
1.19 dwinter 284: def run(self):
1.20 dwinter 285: """run"""
286:
1.19 dwinter 287: self.result=""
1.20 dwinter 288: #find context within ZODB
1.19 dwinter 289: from Zope import DB
290: conn = DB.open()
291: root = conn.root()
292: app = root['Application']
293: ctx = self.getContext(app,serverport=self.serverport)
294:
1.20 dwinter 295: #add the files
1.19 dwinter 296: self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username)
1.20 dwinter 297: #commit the transactions
1.58 dwinter 298: transaction.get().commit()
1.19 dwinter 299: conn.close()
1.20 dwinter 300: #set flag for end of this method
1.19 dwinter 301: self.end=True
1.66 dwinter 302: logging.info("ended")
303: return True
1.19 dwinter 304:
1.22 dwinter 305: def __del__(self):
306: """delete"""
307:
308:
309:
1.19 dwinter 310: def getResult(self):
1.20 dwinter 311: """method for accessing result"""
312:
1.19 dwinter 313: return self.result
314:
315: def uploadATFfinallyThread(self,ctx,procedure,comment="",basketname='',unlock=None,RESPONSE=None,SESSION=None,username=None):
316: """upload the files"""
1.20 dwinter 317: #TODO: make this configurable, at the moment, rootFolder for cdli has to be cdliRoot
1.19 dwinter 318: ctx2=ctx.cdliRoot
319:
320: self.result+="<h2>Start processing</h2>"
1.20 dwinter 321:
322: #shall I only upload the changed files?
1.81 casties 323: logging.debug("uploadATFfinally procedure: %s"%procedure)
1.19 dwinter 324: if procedure=="uploadchanged":
1.66 dwinter 325: changed=[x[0] for x in SESSION.get('changed',[])]
1.61 dwinter 326: uploadFns=changed+SESSION.get('newPs',[])
1.19 dwinter 327:
1.20 dwinter 328: #or all
1.19 dwinter 329: elif procedure=="uploadAll":
330: uploadFns=[]
331: for x in os.listdir(SESSION['tmpdir']):
1.45 dwinter 332: if not x in SESSION['lockerrors']:
1.19 dwinter 333: uploadFns.append(x)
1.20 dwinter 334:
335: #or maybe nothing
1.19 dwinter 336: elif procedure=="noupload":
1.81 casties 337: return True
1.19 dwinter 338: else:
339: uploadFns=[]
340:
1.20 dwinter 341: #do first the changed files
1.65 dwinter 342: i=0
1.19 dwinter 343: for fn in uploadFns:
1.81 casties 344: logging.debug("uploadATFfinally uploadFn=%s"%fn)
1.66 dwinter 345: i+=1
1.19 dwinter 346: founds=ctx2.CDLICatalog.search({'title':fn})
347: if len(founds)>0:
348: SESSION['author']=str(username)
1.63 dwinter 349: self.result="<p>Changing : %s"%fn+self.result
1.81 casties 350: logging.debug("uploadatffinallythread changing:%s"%fn+self.result)
1.49 dwinter 351: founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn),from_tmp=True)
1.81 casties 352: if i%200==0:
353: transaction.get().commit()
354: logging.debug("uploadatffinallythread changing: do commit")
1.65 dwinter 355:
356: transaction.get().commit()
1.81 casties 357: logging.debug("uploadatffinallythread changing: last commit")
1.62 dwinter 358:
1.20 dwinter 359: #now add the new files
1.19 dwinter 360: newPs=SESSION['newPs']
361: if len(newPs)>0:
362: tmpDir=SESSION['tmpdir']
1.81 casties 363: logging.debug("uploadatffinallythread adding start")
1.63 dwinter 364: self.result="<p>Adding files</p>"+self.result
1.20 dwinter 365: #TODO: make this configurable, at the moment base folder for the files has to be cdli_main
1.22 dwinter 366: ctx2.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self)
1.81 casties 367: logging.debug("uploadatffinallythread adding finished")
1.19 dwinter 368:
1.20 dwinter 369: #unlock locked files?
1.19 dwinter 370: if unlock:
1.81 casties 371: logging.debug("uploadatffinallythread unlocking start")
1.63 dwinter 372: self.result="<p>Unlock files</p>"+self.result
1.19 dwinter 373: unlockFns=[]
374: for x in os.listdir(SESSION['tmpdir']):
375: if not x in SESSION['errors']:
376: unlockFns.append(x)
1.81 casties 377:
378: logging.debug("unlocking have now what to unlock")
1.65 dwinter 379:
1.19 dwinter 380: for fn in unlockFns:
1.65 dwinter 381: #logging.info("will unlock: %s"%fn)
1.19 dwinter 382: founds=ctx2.CDLICatalog.search({'title':fn})
1.65 dwinter 383: #logging.info("found it: %s"%repr(founds))
1.19 dwinter 384: if len(founds)>0:
1.65 dwinter 385: #logging.info("unlock: %s"%founds[0].getObject().getId())
1.19 dwinter 386: SESSION['author']=str(username)
387: founds[0].getObject().lockedBy=""
1.81 casties 388:
389: logging.debug("uploadatffinallythread unlocking done")
1.19 dwinter 390:
1.65 dwinter 391: #if a basketname is given, add files to the basket
1.19 dwinter 392: if not (basketname ==''):
1.81 casties 393: logging.debug("uploadatffinallythread add to basket %s"%basketname)
1.65 dwinter 394: self.result="<p>Add to basket</p>"+self.result
1.41 dwinter 395: basketId=ctx2.basketContainer.getBasketIdfromName(basketname)
1.19 dwinter 396:
397: if not basketId: # create new basket
1.81 casties 398: logging.debug("uploadatffinallythread create basket %s"%basketname)
1.65 dwinter 399: self.result="<p>Create a new basket</p>"+self.result
1.19 dwinter 400: ob=ctx2.basketContainer.addBasket(basketname)
401: basketId=ob.getId()
402: basket=getattr(ctx2.basketContainer,str(basketId))
403: ids=os.listdir(SESSION['tmpdir'])
1.85 dwinter 404: logging.debug("should add:"+repr(ids))
1.19 dwinter 405: basket.addObjects(ids,deleteOld=True,username=str(username))
406:
1.81 casties 407: logging.debug("uploadatffinallythread uploadfinally done")
408:
1.19 dwinter 409: if RESPONSE is not None:
410: RESPONSE.redirect(self.aq_parent.absolute_url())
411:
412: return True
1.60 dwinter 413:
414: class tmpStore(SimpleItem):
415: """simple item"""
416: meta_type="cdli_upload"
1.19 dwinter 417:
1.60 dwinter 418: def __init__(self,id):
419: """init tmp"""
420: self.id=id
421:
1.19 dwinter 422: class uploadATFThread(Thread):
1.20 dwinter 423: """class for checking the files befor uploading"""
1.19 dwinter 424:
425: def __init__(self):
1.20 dwinter 426: """initialise"""
427:
1.19 dwinter 428: self.continueVar=True
429: self.returnValue=None
430:
431: Thread.__init__(self)
432:
433:
1.60 dwinter 434: def set(self,upload,basketId,username,idTmp,serverport="8080"):
1.20 dwinter 435: """set start values for the thread"""
1.19 dwinter 436: self.result=""
437: self.upload=upload
438: self.basketId=basketId
439: self.username=username
440: self.serverport=serverport
1.60 dwinter 441: self.idTmp=idTmp
1.19 dwinter 442:
443: def __call__(self):
1.20 dwinter 444: """call method """
1.19 dwinter 445: self.run()
446: return True
447:
448: def getContext(self, app,serverport="8080"):
1.20 dwinter 449: """get the context within the ZODB"""
1.19 dwinter 450: resp = HTTPResponse(stdout=None)
451: env = {
452: 'SERVER_NAME':'localhost',
453: 'SERVER_PORT':serverport,
454: 'REQUEST_METHOD':'GET'
455: }
456: req = HTTPRequest(None, env, resp)
457: return app.__of__(RequestContainer(REQUEST = req))
458:
459: def run(self):
1.60 dwinter 460: idTmp=self.idTmp
1.19 dwinter 461: self.result=""
1.20 dwinter 462: #find context within ZODB
1.19 dwinter 463: from Zope import DB
464: conn = DB.open()
465: root = conn.root()
466: app = root['Application']
467: ctx = self.getContext(app,serverport=self.serverport)
1.60 dwinter 468: logging.info("run intern")
1.63 dwinter 469: try:
1.73 dwinter 470: logging.info("created: %s"%idTmp)
1.63 dwinter 471: ctx.temp_folder._setObject(idTmp,tmpStore(idTmp))
472: except:
473: logging.error("thread upload: %s %s"%sys.exc_info()[0:2])
474:
1.60 dwinter 475: logging.info("call thread intern")
476: self.uploadATFThread(ctx,self.upload,idTmp,self.basketId)
1.24 dwinter 477:
1.30 dwinter 478: #ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue
1.58 dwinter 479:
1.66 dwinter 480:
1.58 dwinter 481: transaction.get().commit()
1.49 dwinter 482:
1.19 dwinter 483: conn.close()
1.22 dwinter 484:
1.73 dwinter 485: return getattr(ctx.temp_folder,idTmp)
1.19 dwinter 486:
487: def getResult(self):
1.20 dwinter 488: """method for accessing result"""
1.19 dwinter 489: return self.result
490:
1.60 dwinter 491: def uploadATFThread(self,ctx,upload,idTmp,basketId=0):
1.19 dwinter 492: """upload an atf file"""
493: #TODO: add comments
494: #TODO: finish uploadATF
1.60 dwinter 495:
496: stObj=getattr(ctx.temp_folder,idTmp)
497: logging.info("start, upload thread")
1.25 dwinter 498: self.result="<html><body><h2>I got your file, start now to split it into single atf-files!</h2><p>"
499:
1.20 dwinter 500: #make sure that id is a string and not an integer
1.19 dwinter 501: basketId=str(basketId)
502:
1.20 dwinter 503: #TODO: make this configurable, at the moment, rootFolder for cdli has to be cdliRoot
504: ctx2=ctx.cdliRoot
1.19 dwinter 505:
1.20 dwinter 506: #get temporary file for staging the downloaded and splitted files
1.19 dwinter 507: dir=mkdtemp()
1.20 dwinter 508:
509:
510: changed=[] # changed files
511: errors=[] # files with errors
1.45 dwinter 512: lockerrors=[] # files with errors
513:
1.20 dwinter 514: newPs=[] # new p filed
515: psNotInCatalog=[] # files not in the catalog
516:
517: #split the uploadedd atf file
1.25 dwinter 518: basketNameFromFile, numberOfFiles=splitatf(upload,dir,ext=self)
1.19 dwinter 519:
1.20 dwinter 520: #find basketId if not set
521:
522: #get active abaket
1.19 dwinter 523: if basketId == '0':
524: basketObj=ctx2.basketContainer.getActiveBasket()
525: if basketObj:
526: basketId=basketObj.getId()
527:
1.45 dwinter 528: #if there is no active basket and no basketid given, id is empty, else get besketname and length
1.19 dwinter 529: if basketId == '0':
530: basketNameFromId=""
531: basketLen=0
532: else:
533: basketNameFromId=getattr(ctx2.basketContainer,basketId).title
534: basketLen=getattr(ctx2.basketContainer,basketId).getLastVersion().numberOfItems()
535:
1.60 dwinter 536: logging.info("got the file, upload thread")
1.25 dwinter 537: self.result+="""<html><body><h2>I got the files</h2><
538: p>I am computing the differences to the exisiting files</p>"""
1.20 dwinter 539:
540: #start to check the files
1.19 dwinter 541: for fn in os.listdir(dir):
542:
1.63 dwinter 543: self.result="<p>process:%s</p>"%fn+self.result
1.19 dwinter 544:
1.20 dwinter 545: # check if file is in the catalog
546: #TODO: checkCatalog is not implemented yet
1.19 dwinter 547: if ctx2.cdli_main.checkCatalog(fn):
548: psNotInCatalog.append(fn)
549:
1.20 dwinter 550: #check if p-file already at the server
1.19 dwinter 551: founds=ctx2.CDLICatalog.search({'title':fn})
552:
1.20 dwinter 553: #if not than add filename to the list of newfiles
1.46 dwinter 554:
555: data=file(os.path.join(dir,fn)).read()
1.69 dwinter 556: status,msg=checkFile(fn,data,dir)
557: #status=True
558:
559:
1.46 dwinter 560: if not status: # error
561: errors.append((fn,msg))
1.69 dwinter 562:
1.46 dwinter 563: else:
564: if len(founds)==0:
565: newPs.append(fn)
566:
567: #if p file alread at the server
568: for found in founds:
569: #analyse the differences to the actual file
570: obj=found.getObject()
571:
572: if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))):
1.63 dwinter 573: lockerrors.append((fn,str(obj.lockedBy)))
1.46 dwinter 574: else:
575:
576: diffs=obj.diff(data)
577: if diffs[0]>0:
578: changed.append((obj,diffs)) #hochladen
1.31 dwinter 579:
1.20 dwinter 580: #ready, set the returnValues
1.19 dwinter 581: self.result+="<h3>Done</h3></body></html>"
582:
1.60 dwinter 583: stObj.returnValue={}
1.19 dwinter 584:
1.60 dwinter 585: stObj.returnValue['errors']=errors
1.69 dwinter 586:
1.60 dwinter 587: stObj.returnValue['newPs']=newPs
588: stObj.returnValue['tmpdir']=dir
589: stObj.returnValue['basketLen']=basketLen
590: stObj.returnValue['numberOfFiles']=numberOfFiles
591: stObj.returnValue['basketNameFromId']=basketNameFromId
592: stObj.returnValue['basketNameFromFile']=basketNameFromFile
593: stObj.returnValue['basketId']=basketId
594: stObj.returnValue['dir']=dir
1.61 dwinter 595: #stObj.returnValue['changed']=copy.copy(changed)
596: stObj.returnValue['changed']=[(x[0].getId(),x[1][0]) for x in changed]
597: #stObj.returnValue['lockerrors']=[x[0].getId() for x in lockerrors]
1.63 dwinter 598: stObj.returnValue['lockerrors']=[x for x in lockerrors]
1.60 dwinter 599: self.returnValue=True
1.19 dwinter 600: #ctx2.cdli_main.setTemp('v_uploadATF_returnValue',True)
601:
1.63 dwinter 602:
1.4 dwinter 603: class CDLIBasketContainer(OrderedFolder):
604: """contains the baskets"""
605:
606:
1.9 dwinter 607: security=ClassSecurityInfo()
1.4 dwinter 608: meta_type="CDLIBasketContainer"
609:
1.73 dwinter 610: def getPNumbersOfBasket(self,basketName):
611: """get all pnumbers of a basket as a list, returns an empty list if basket not found
612: @param basketName: name of the basket
613: """
614: ret=[]
615: basketId=self.getBasketIdfromName(basketName)
616: if not basketId:
617: return []
618:
619: ob=getattr(self,basketId).getContent()
620:
621: ret=[x[0].split(".")[0] for x in ob]
622:
623: return ret
624:
1.77 dwinter 625: security.declareProtected('manage','getBasketAsOneFile')
1.73 dwinter 626: def getBasketAsOneFile(self,basketName,current="no"):
627: """returns all files of the basket combined in one file
628: @param basketName: Name of the basket
629: @param current: (optional) if current is set to "yes" then the most current version of
630: all files are downloaded and not the versions of the files as stored in the basket
631: """
632: ret=""
633: basketId=self.getBasketIdfromName(basketName)
634: if not basketId:
635: return ""
636:
637: ob=getattr(self,basketId).getLastVersion()
638: for object in ob.getContent():
639: if current=="no": #version as they are in the basket
640: ret+=str(object[0].getData())+"\n"
641: elif current=="yes":
642: #search current object
1.81 casties 643: logging.debug("current: %s"%object[1].getId().split(".")[0])
1.73 dwinter 644: founds=self.CDLICatalog.search({'title':object[1].getId().split(".")[0]})
645: if len(founds)>0:
646: ret+=str(founds[0].getObject().getLastVersion().getData())+"\n"
647: return ret
648:
1.77 dwinter 649: security.declareProtected('manage','upDateBaskets')
1.39 dwinter 650: def upDateBaskets(self):
651: """update content in to objects"""
652:
653: founds=self.ZopeFind(self,obj_metatypes=['CDLIBasketVersion'],search_sub=1)
654:
655: for found in founds:
656: found[1].updateBasket()
657:
1.32 dwinter 658: security.declareProtected('manage','deleteBaskets')
1.12 dwinter 659: def deleteBaskets(self,ids=None):
660: """delete baskets, i.e. move them into trash folder"""
661:
662:
663: found=self.ZopeFind(self,obj_ids=['trash'])
664:
665: if len(found)<1:
666: manage_addFolder(self, 'trash')
667: trash=self._getOb('trash')
668: else:
669: trash=found[0][1]
670:
671: if type(ids) is not ListType:
672: ids=[ids]
673: cut=self.manage_cutObjects(ids)
674: trash.manage_pasteObjects(cut)
675:
1.32 dwinter 676: security.declareProtected('manage','manageBaskets')
1.73 dwinter 677: def manageBaskets(self,submit,ids=None,basket1="",basket2="",joinBasket="",subtractBasket="",REQUEST=None,RESPONSE=None):
1.12 dwinter 678: """manage baskets, delete or copy"""
679: if submit=="delete":
680: self.deleteBaskets(ids)
681:
1.72 dwinter 682: elif submit=="join":
1.73 dwinter 683: flag,msg=self.joinBasket(joinBasket, ids)
1.72 dwinter 684: logging.info("joining %s %s"%(flag,msg))
685:
686: elif submit=="subtract":
687: logging.info("BBBb %s %s"%(basket1,basket2))
1.73 dwinter 688: flag,msg=self.subtractBasket(subtractBasket, basket1,basket2)
1.72 dwinter 689: logging.info("subtract %s %s"%(flag,msg))
1.12 dwinter 690:
691: if RESPONSE:
692: RESPONSE.redirect(self.absolute_url())
1.32 dwinter 693:
1.33 dwinter 694: security.declareProtected('View','getBasketIdfromName')
1.5 dwinter 695: def getBasketIdfromName(self,basketname):
696: """get id from name"""
697:
698: for basket in self.ZopeFind(self,obj_metatypes=["CDLIBasket"]):
699: if basket[1].title==basketname:
700: return basket[0]
701: else:
702: None
1.9 dwinter 703:
704: security.declareProtected('manage','uploadBasket_html')
705:
1.4 dwinter 706: def uploadBasket_html(self,basketId='0'):
707: """upload an atf file, html form"""
1.9 dwinter 708:
709:
1.4 dwinter 710: basketId=str(basketId)
711: if not basketId=='0':
712: basketName=getattr(self.basketContainer,basketId).title
713: else:
714: basketName=""
715:
716: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadBasket_html.zpt')).__of__(self)
717: return pt(basketId=basketId,basketName=basketName)
718:
719:
1.77 dwinter 720: security.declareProtected('manage','index_html')
1.4 dwinter 721: def index_html(self):
722: """stanadard ansicht"""
1.9 dwinter 723:
724:
725:
1.4 dwinter 726: ext=self.ZopeFind(self,obj_ids=["index.html"])
727: if ext:
728: return ext[0][1]()
729:
730: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketContainerMain')).__of__(self)
731: return pt()
732:
733: def getStorageFolderRoot(self):
734: """root des storage folders"""
735: return self.cdli_main
736:
737: def __init__(self,id,title):
738: """ init basket container"""
739: self.id=id
740: self.title=title
741:
1.51 dwinter 742:
1.49 dwinter 743: def getBasketsId(self):
744: """get all baskets als klartext"""
1.51 dwinter 745:
746: ret=""
1.49 dwinter 747: baskets=self.ZopeFind(self,obj_metatypes=['CDLIBasket'])
748: for basket in baskets:
749: com,user,time,values = basket[1].getContentIds()
750: ret+= "BASKET:"+com+"\t"+user+"\t"+time+"\n"
751: for x in values:
752: ret+= x[0]+"\t"+x[1]+"\n"
1.66 dwinter 753: return ret
1.49 dwinter 754:
1.4 dwinter 755: def getBaskets(self,sortField='title'):
756: """get all baskets files"""
757:
758: def sortName(x,y):
759: return cmp(x[1].title.lower(),y[1].title.lower())
760:
761: def sortDate(x,y):
762: return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime())
763:
764:
765: def sortComment(x,y):
766:
767:
768:
769: try:
770: xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower()
771: except:
772: xc='ZZZZZZZZZZZZZ'.lower()
773: try:
774: yc=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower()
775: except:
776: yc='ZZZZZZZZZZZZZ'.lower()
777:
778:
779: if (xc=='') or (xc=='ZZZZZZZZZZZZZ'.lower()):
780:
781: try:
782: xc=x[1].getLastVersion().getComment().lower()
783: except:
784: xc='ZZZZZZZZZZZZZ'.lower()
785:
786: if (yc=='') or (yc=='ZZZZZZZZZZZZZ'.lower()):
787: try:
788: yc=y[1].getLastVersion().getComment().lower()
789: except:
790: yc='ZZZZZZZZZZZZZ'.lower()
791:
792:
793: return cmp(xc,yc)
794:
795: def sortAuthor(x,y):
796:
797: return cmp(x[1].getLastVersion().getUser().lower(),y[1].getLastVersion().getUser().lower())
798:
799: baskets=self.ZopeFind(self,obj_metatypes=['CDLIBasket'])
800:
801:
802: if sortField=='title':
803: baskets.sort(sortName)
804: elif sortField=='date':
805: baskets.sort(sortDate)
806: elif sortField=='author':
807: baskets.sort(sortAuthor)
808: elif sortField=='comment':
809: baskets.sort(sortComment)
1.39 dwinter 810:
1.4 dwinter 811: return baskets
1.72 dwinter 812:
813:
814: def subtractBasket(self,newBasket,basket1,basket2):
815: """subtract basket2 from basket1
816: (i.e. newbasket will contain alle elements of basket1 which are not in basket2),
817: if basket2 contains files which are not in basket1, then theses files fill be ignored
818:
819: @param newbasket: name of the new basket
820: @param basket1: basket where basket2 will be subtracted from
821: @param basket2: see above
822:
823: """
824: logging.info("CCCCC %s %s"%(basket1,basket2))
825:
826: try:
827: newB=self.addBasket(newBasket)
828: except:
829: return False, "cannot create the new basket"
830:
831:
1.4 dwinter 832:
1.72 dwinter 833:
834:
835: bas2= getattr(self,basket2)
836: bas2content=bas2.getContent()
837: bas2ids=[x[0] for x in bas2content]
838:
839:
840:
841: bas1= getattr(self,basket1)
842: bas1content=bas1.getContent()
843:
844:
845: newBasketContent={}
846:
847: for id,version in bas1content:
848: if not (id in bas2ids):
849: newBasketContent[id]=version
850:
851: username=self.getActualUserName()
852:
853: logging.info("sbc %s"%newBasketContent)
854: newB.addObjectsWithVersion(newBasketContent,username=username,catalog=self.CDLICatalog)
855:
856: return True, ""
857:
858:
859: def joinBasket(self,newBasket,oldBaskets):
1.71 dwinter 860: """join two baskets
861: @param newbasket: name of the new basket
862: @param oldbaskets: list of baskets to be joined
863: """
1.72 dwinter 864: try:
865: newB=self.addBasket(newBasket)
866: except:
867: return False, "cannot create the new basket"
868:
869: newBasketContent={}
870: for ob in oldBaskets:
871: x= getattr(self,ob,None)
872: if x is None:
873: return False, "cannot find basket: %s"%ob
874:
875: ids=x.getContent() # hole den Inhalt
876:
877: for id,version in ids:
878: if newBasketContent.has_key(id): # p number gibt's schon
879: newBasketContent[id]=max(newBasketContent[id],version) # speichere die groessere Versionsnumber
880: else:
881: newBasketContent[id]=version
882: username=self.getActualUserName()
883:
884: logging.info("nbc %s"%newBasketContent)
885: newB.addObjectsWithVersion(newBasketContent,username=username,catalog=self.CDLICatalog)
886:
887: return True, ""
888:
1.4 dwinter 889: def getNewId(self):
890: """createIds"""
891: last=getattr(self,'last',0)
892: last +=1
893: while len(self.ZopeFind(self,obj_ids=[str(last)]))>0:
894: last+=1
895:
896: self.last=last
897: return last
898:
1.6 dwinter 899: def setActiveBasket(self,basketId,REQUEST=None):
1.4 dwinter 900: """store active basketId in a cookie"""
901: self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/")
1.66 dwinter 902: try:
903: qs=cgi.parse_qs(REQUEST['QUERY_STRING'])
904: del(qs['basketId'])
905: except:
906: qs={}
1.6 dwinter 907: if REQUEST:
1.49 dwinter 908: REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+urllib.urlencode(qs))
1.6 dwinter 909:
1.4 dwinter 910: def getActiveBasket(self):
911: """get active basket from cookie"""
912:
913: id= self.REQUEST.cookies.get('CDLIActiveBasket',None)
1.6 dwinter 914: if id:
915: obj=getattr(self,str(id),None)
916: else:
917: obj=None
1.4 dwinter 918: return obj
1.6 dwinter 919:
1.4 dwinter 920: def getActualUserName(self):
921: """get name of the actualuser"""
922: return str(self.REQUEST['AUTHENTICATED_USER'])
923:
1.77 dwinter 924: security.declareProtected('manage','addBasket')
1.4 dwinter 925: def addBasket(self,newBasketName):
926: """add a new basket"""
927:
928: ob=manage_addCDLIBasket(self,newBasketName)
929: return ob
1.72 dwinter 930:
1.6 dwinter 931: def storeInBasket(self,submit,ids=None,newBasketName=None,fromFileList=None,RESPONSE=None,REQUEST=None):
1.4 dwinter 932: """store it"""
1.6 dwinter 933: if not ids:
934: ids=self.REQUEST.SESSION['fileIds']
1.83 dwinter 935:
936: if (type(ids) is not ListType) and (not isinstance(ids,Set)):
1.4 dwinter 937: ids=[ids]
938:
1.83 dwinter 939: if isinstance(ids,Set):
940: ids=list(ids)
941:
1.6 dwinter 942: if (submit.lower()=="store in new basket") or (submit.lower()=="new basket"):
1.4 dwinter 943: basketRet=self.addBasket(newBasketName)
944: self.setActiveBasket(basketRet.getId())
945: basket=getattr(self,basketRet.getId())
1.6 dwinter 946: elif (submit.lower()=="store in active basket") or (submit.lower()=="active basket"):
1.4 dwinter 947: basket=self.getActiveBasket()
1.6 dwinter 948:
949: added=basket.addObjects(ids)
950: back=self.REQUEST['HTTP_REFERER'].split("?")[0]+"?basketName="+basket.title+"&numberOfObjects="+str(added)
951:
952:
953: if fromFileList:
1.7 dwinter 954:
1.83 dwinter 955: return self.cdli_main.findObjectsFromList(list=ids,basketName=basket.title,numberOfObjects=added)
1.6 dwinter 956:
1.4 dwinter 957: if RESPONSE:
1.6 dwinter 958:
1.4 dwinter 959: RESPONSE.redirect(back)
960:
1.6 dwinter 961: return True
962:
1.4 dwinter 963: def manage_addCDLIBasketContainerForm(self):
964: """add the CDLIBasketContainer form"""
965: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addCDLIBasketContainer.zpt')).__of__(self)
966: return pt()
967:
968: def manage_addCDLIBasketContainer(self,id,title,RESPONSE=None):
969: """add the basket"""
970: ob=CDLIBasketContainer(id,title)
971:
972: self._setObject(id, ob)
973:
974: if RESPONSE is not None:
975: RESPONSE.redirect('manage_main')
976:
1.5 dwinter 977: class CDLIBasket(Folder,CatalogAware):
1.4 dwinter 978: """basket"""
979:
980: meta_type="CDLIBasket"
1.5 dwinter 981: default_catalog="CDLIBasketCatalog"
1.4 dwinter 982:
1.75 dwinter 983: def searchInBasket(self,indexName,searchStr,regExp=False):
984: """searchInBasket"""
985:
1.81 casties 986: lst=self.searchInLineIndexDocs(indexName,searchStr,uniq=True,regExp=regExp) #TODO: fix this
1.75 dwinter 987: ret={}
988:
989: lv=self.getLastVersion()
1.76 dwinter 990:
991:
1.75 dwinter 992: for obj in lv.content.getContent():
993: id=obj[1].getId().split(".")[0]
994: if id in lst:
995:
996: ret[id]=self.showWordInFile(id,searchStr,lineList=self.getLinesFromIndex(indexName,searchStr,id,regExp=regExp),regExp=regExp,indexName=indexName)
997:
998:
999: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','searchResultsInBasket')).__of__(self)
1000: return pt(result=ret,indexName=indexName,regExp=regExp,word=searchStr)
1001:
1002:
1003:
1004:
1005: def searchInBasket_v1(self,searchStr):
1.74 dwinter 1006: """search occurences of searchStr in files im basket"""
1007: ret=[]
1008: lv=self.getLastVersion()
1009: logging.info("searching")
1010: for obj in lv.content.getContent():
1011: txt=obj[0].getData()
1012: for x in txt.split("\n"):
1013: logging.info("search %s"%x)
1014: if re.match(searchStr,x):
1015: ret.append(x)
1016:
1017: return "\n".join(ret)
1018:
1019:
1.4 dwinter 1020: def getFile(self,obj):
1021: return obj[1]
1022:
1023: def getFileLastVersion(self,obj):
1024: return obj[0]
1025:
1.5 dwinter 1026: def getFileNamesInLastVersion(self):
1027: """get content of the last version as list"""
1028:
1029: return [x[1].getId() for x in self.getLastVersion().getContent()]
1030:
1.37 dwinter 1031:
1.4 dwinter 1032: def isActual(self,obj):
1033: """teste ob im basket die aktuelle version ist"""
1.85 dwinter 1034: try:
1035: logging.debug("isActual:"+repr(obj))
1036: actualNo=obj[1].getLastVersion().getVersionNumber()
1037: storedNo=obj[0].getVersionNumber()
1038:
1.87 dwinter 1039:
1040: actualNo=self.getFileObjectLastVersion(obj.getId()).getVersionNumber()
1.85 dwinter 1041:
1.87 dwinter 1042: #if len(founds)>0 and founds[0].getObject().aq_parent.getId()==".trash":
1043: # return False, -1
1.37 dwinter 1044:
1.85 dwinter 1045: if actualNo==storedNo:
1046: return True , 0
1047: else:
1048: return False, actualNo
1049: except:
1.12 dwinter 1050: return False, -1
1.85 dwinter 1051:
1.4 dwinter 1052: def history(self):
1053: """history"""
1054:
1055: ext=self.ZopeFind(self.aq_parent,obj_ids=["history_template.html"])
1056: if ext:
1057: return getattr(self,ext[0][1].getId())()
1058:
1059: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketHistory')).__of__(self)
1060: return pt()
1061:
1062: def getStorageFolderRoot(self):
1063: """root des storage folders"""
1064: return self.aq_parent.cdli_main
1065:
1066: def __init__(self,id,title,shortDescription="",comment=""):
1067: """init a CDLIBasket"""
1068:
1069: self.id=id
1070: self.title=title
1071: self.shortDescription=shortDescription
1072: self.comment=comment
1073:
1.72 dwinter 1074: def getActualUserName(self):
1075: """get name of the actualuser"""
1076:
1077: return str(self.REQUEST['AUTHENTICATED_USER'])
1078:
1.4 dwinter 1079:
1080: def getLastVersion(self):
1081: """hole letzte version"""
1.39 dwinter 1082:
1083: ids=[]
1084: idsTmp= self.objectIds()
1085: for x in idsTmp:
1086: try:
1087: ids.append(int(x))
1088: except:
1089: pass
1.4 dwinter 1090: ids.sort()
1.39 dwinter 1091:
1.4 dwinter 1092: if len(ids)==0:
1093: return None
1094: else:
1095: ob=getattr(self,str(ids[-1]))
1.39 dwinter 1096:
1097:
1.4 dwinter 1098: return ob
1099:
1100: def getVersions(self):
1101: """get versions"""
1102: versions=self.ZopeFind(self,obj_metatypes=["CDLIBasketVersion"])
1103: return versions
1104:
1105:
1.37 dwinter 1106: def updateObjects(self,ids,RESPONSE=None,REQUEST=None):
1107: """update ids, ids not in the basket the add"""
1108: if type(ids) is not ListType:
1109: ids=[ids]
1110:
1111: lastVersion=self.getLastVersion()
1.39 dwinter 1112: oldContent=lastVersion.content.getContent()
1.37 dwinter 1113: newContent=[]
1114:
1115: #first copy the old
1116: for obj in oldContent:
1117: if obj[1].getId() not in ids:
1118: newContent.append(obj)
1119: #now add the new
1120:
1121: for id in ids:
1122: founds=self.CDLICatalog.search({'title':id})
1123:
1124: for found in founds:
1125: if found.getObject() not in oldContent:
1126: #TODO: was passiert wenn, man eine Object dazufŸgt, das schon da ist aber eine neuere version
1127: newContent.append((found.getObject().getLastVersion(),found.getObject()))
1128:
1129:
1130: content=newContent
1131: user=self.getActualUserName()
1132:
1133: ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent)
1134:
1.38 dwinter 1135: obj=self._getOb(ob.getId())
1.37 dwinter 1136: if RESPONSE:
1.38 dwinter 1137:
1.37 dwinter 1138: RESPONSE.redirect(obj.absolute_url())
1.38 dwinter 1139:
1140: return obj
1141:
1.72 dwinter 1142: def addObjectsWithVersion(self,ids,deleteOld=None,username=None,catalog=None):
1143: """generate a new version of the basket with objects added,
1144: hier wird jedoch nicht die letzte Version jedes Files hinzugefuegt, s
1145: ondern ids is ein Tupel mit der Id (d.h. der p-number) und der Versionsnummer.
1146: """
1147: logging.info("add to basket (%s)"%(self.getId()))
1148: lastVersion=self.getLastVersion()
1149:
1150: if not catalog:
1151: catalog=self.CDLICatalog
1152:
1153: if lastVersion is None:
1154: oldContent=[]
1155: else:
1156: oldContent=lastVersion.content.getContent()
1157:
1158: if deleteOld:
1159: oldContent=[]
1160:
1161: newContent=[]
1162: added=0
1163:
1164: for id,version in ids.iteritems():
1165: logging.info("adding %s %s"%(id,version))
1166: id=id.split(".")[0] # title nur die pnumber ohne atf
1167:
1168: try:
1169: founds=catalog.search({'title':id})
1170: except:
1171: founds=[]
1172: logging.info(" found %s "%(founds))
1173: for found in founds:
1174: if found.getObject() not in oldContent:
1175:
1176: #TODO: was passiert wenn, man eine Object dazufŸgt, das schon da ist aber eine neuere version
1177: newContent.append((found.getObject().getVersions()[version-1][1],found.getObject()))
1178: added+=1
1179:
1180: content=oldContent+newContent
1181: if not username:
1182: logging.error("XXXXXXXXXXX %s"%repr(self))
1183: user=self.getActualUserName()
1184: else:
1185: user = username
1186:
1187: ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content)
1188: logging.info("add to basket (%s) done"%(self.getId()))
1189: return added
1190:
1191:
1.19 dwinter 1192: def addObjects(self,ids,deleteOld=None,username=None):
1.4 dwinter 1193: """generate a new version of the basket with objects added"""
1.83 dwinter 1194:
1195: def swap(x):
1196: return (x[1],x[0])
1197:
1.65 dwinter 1198: logging.info("add to basket (%s)"%(self.getId()))
1.4 dwinter 1199: lastVersion=self.getLastVersion()
1200:
1201: if lastVersion is None:
1202: oldContent=[]
1203: else:
1.39 dwinter 1204: oldContent=lastVersion.content.getContent()
1.4 dwinter 1205:
1206: if deleteOld:
1207: oldContent=[]
1208:
1.6 dwinter 1209: added=0
1.83 dwinter 1210: # for id in ids:
1211: # logging.debug("adding:"+id)
1212: # try:
1213: # founds=self.CDLICatalog.search({'title':id})
1214: # except:
1215: # founds=[]
1216: #
1217: # for found in founds:
1218: # if found.getObject() not in oldContent:
1219: # #TODO: was passiert wenn, man eine Object dazufŸgt, das schon da ist aber eine neuere version
1220: # newContent.append((found.getObject().getLastVersion(),found.getObject()))
1221: # added+=1
1222:
1.85 dwinter 1223: hash = md5.new(repr(makelist(ids))).hexdigest() # erzeuge hash als identification
1.83 dwinter 1224: #logging.debug("JJJJJJJ:"+repr(self.makelist(ids)))
1225: logging.debug("JJJJJJJ:"+repr(hash))
1226:
1.85 dwinter 1227: if hasattr(self.cdliRoot,'v_tmpStore') and self.cdliRoot.v_tmpStore.has_key(hash):
1.83 dwinter 1228: logging.debug("from store!")
1.85 dwinter 1229: newContent=Set(map(swap,self.cdliRoot.v_tmpStore[hash]))
1.83 dwinter 1230:
1231: else:
1232: logging.debug("not from store!")
1233: newContent=Set([(self.getFileObjectLastVersion(x),self.getFileObject(x)) for x in ids])
1234:
1235:
1236: content=Set(oldContent).union(newContent)
1237: added = len(content)-len(oldContent)
1.19 dwinter 1238: if not username:
1239: user=self.getActualUserName()
1240: else:
1241: user = username
1.83 dwinter 1242:
1243: #logging.debug("content:"+repr(list(content)))
1244: ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=list(content))
1.65 dwinter 1245: logging.info("add to basket (%s) done"%(self.getId()))
1.6 dwinter 1246: return added
1.4 dwinter 1247:
1.51 dwinter 1248:
1249:
1.72 dwinter 1250: def getContent(self):
1251: """print content"""
1252: ret=[]
1253:
1254: lv=self.getLastVersion()
1255: for obj in lv.content.getContent():
1256: logging.info("XXXXXXXXXX %s"%repr(obj))
1257: ret.append((obj[1].getId(),obj[0].versionNumber))
1258:
1259: return ret
1260:
1.49 dwinter 1261: def getContentIds(self):
1262: """print basket content"""
1263: ret=[]
1264: lv=self.getLastVersion()
1.51 dwinter 1265: for obj in lv.content.getContent():
1.49 dwinter 1266: ret.append((obj[0].getId(),obj[1].getId()))
1267:
1268:
1269: return lv.getComment(),lv.getUser(),lv.getTime(),ret
1270:
1.37 dwinter 1271: def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None):
1272: """change a basket"""
1273: if submit=="update":
1274: return self.updateObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
1275: elif submit=="delete":
1276: return self.deleteObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
1277:
1.12 dwinter 1278: def deleteObjects(self,ids,RESPONSE=None,REQUEST=None):
1.4 dwinter 1279: """delete objects"""
1.12 dwinter 1280:
1281: if type(ids) is not ListType:
1282: ids=[ids]
1283:
1284: lastVersion=self.getLastVersion()
1.39 dwinter 1285: oldContent=lastVersion.content.getContent()
1.12 dwinter 1286: newContent=[]
1287: for obj in oldContent:
1288: if obj[1].getId() not in ids:
1289: newContent.append(obj)
1290:
1291:
1292: user=self.getActualUserName()
1293:
1294: ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent)
1295:
1296: if RESPONSE:
1297: obj=self._getOb(ob.getId())
1298: RESPONSE.redirect(obj.absolute_url())
1.4 dwinter 1299:
1300: def manage_addCDLIBasketForm(self):
1301: """add the CDLIBasketContainer form"""
1302: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addCDLIBasket.zpt')).__of__(self)
1303: return pt()
1304:
1305: def manage_addCDLIBasket(self,title,shortDescription="",comment="",RESPONSE=None):
1306: """add the basket"""
1307:
1308: id=str(self.getNewId())
1309:
1310: ob=CDLIBasket(id,title,shortDescription,comment)
1311:
1312: self._setObject(id, ob)
1313:
1314: if RESPONSE is not None:
1315: RESPONSE.redirect('manage_main')
1316: else:
1317: return ob
1318:
1.39 dwinter 1319: class CDLIBasketVersion(Implicit,Persistent,Folder):
1.4 dwinter 1320: """version of a basket"""
1321:
1322: meta_type="CDLIBasketVersion"
1.32 dwinter 1323: security=ClassSecurityInfo()
1.4 dwinter 1324:
1.39 dwinter 1325: def updateBasket(self):
1326: """update"""
1327: try:
1328: self._setObject('content',BasketContent(self.basketContent))
1329: except:
1330: try:
1331: if len(self.basketContent)>0:
1332: self.content.setContent(self.basketContent)
1333: except:
1334: print "error",self.getId(),self.aq_parent.getId()
1335: self.basketContent=[]
1336:
1337:
1.37 dwinter 1338: def containsNonActualFiles(self):
1339: """returns True if basket contains one or more non current files"""
1340:
1341: objs=self.getContent()
1342: for obj in objs:
1343: if not self.isActual(obj)[0]:
1344: return True
1345: return False
1346:
1.72 dwinter 1347: def downloadListOfPnumbers(self):
1348: """download pnumbers of the basket as list"""
1349:
1350: basket_name=self.aq_parent.title
1351:
1352: ids=self.getContent() # get the list of objects
1353: logging.error(ids)
1354: ret="\n".join([x[1].getId().split(".")[0] for x in ids])
1355:
1356: self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.txt" """%basket_name)
1357: self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
1358: length=len(ret)
1359: self.REQUEST.RESPONSE.setHeader("Content-Length",length)
1360: self.REQUEST.RESPONSE.write(ret)
1361:
1.77 dwinter 1362: security.declareProtected('manage','downloadObjectsAsOneFile')
1.37 dwinter 1363: def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"):
1.4 dwinter 1364: """download all selected files in one file"""
1.87 dwinter 1365: logging.debug("doasof")
1.46 dwinter 1366: if self.temp_folder.downloadCounterBaskets > 10000:
1367: return """I am sorry, currently the server has to many requests for downloads, please come back later!"""
1.45 dwinter 1368:
1369:
1.37 dwinter 1370: if (check=="yes") and self.containsNonActualFiles():
1371: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self)
1.46 dwinter 1372:
1.37 dwinter 1373: return pt(lock=lock)
1374:
1.46 dwinter 1375: else:
1376:
1377: return self.downloadObjectsAsOneFileFinally(lock=lock,procedure=procedure,REQUEST=REQUEST,current="no")
1378:
1.87 dwinter 1379: def downloadObjectsAsOneFileFinally(self,lock=None,procedure=None,REQUEST=None,current="no",repeat=None):
1.46 dwinter 1380: """print do the download"""
1.87 dwinter 1381:
1.86 dwinter 1382: logging.debug("HIHHHH")
1.46 dwinter 1383: ret=""
1.4 dwinter 1384: lockedObjects={}
1385:
1.87 dwinter 1386:
1387: logging.debug("lock:"+repr(lock))
1.4 dwinter 1388: if lock:
1.87 dwinter 1389: logging.debug("------lock:"+repr(lock))
1.4 dwinter 1390: if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
1.87 dwinter 1391:
1.4 dwinter 1392: return "please login first"
1393:
1394: #check if a locked object exist in the basket.
1395: lockedObjects={}
1.39 dwinter 1396: for object in self.content.getContent():
1.4 dwinter 1397:
1.63 dwinter 1398: if (not str(object[1].lockedBy)=="") and (not (str(object[1].lockedBy)==str(self.REQUEST['AUTHENTICATED_USER']))):
1.4 dwinter 1399: lockedObjects[object[1].title]=repr(object[1].lockedBy)
1400:
1401:
1402: keys=lockedObjects.keys()
1403:
1404:
1405: if len(keys)>0 and (not procedure):
1406: self.REQUEST.SESSION['lockedObjects']=lockedObjects
1407: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','lockedObjects.zpt')).__of__(self)
1.45 dwinter 1408:
1.87 dwinter 1409:
1.46 dwinter 1410: return pt()
1.4 dwinter 1411:
1412: elif not procedure: #keine fails gesperrt dann alle donwloaden
1413: procedure="downloadAll"
1414:
1.46 dwinter 1415:
1.87 dwinter 1416:
1417:
1418: threadName=repeat
1419: if not threadName or threadName=="":
1420: thread=DownloadBasketFinallyThread()
1421: threadName=thread.getName()[0:]
1422:
1423: if (not hasattr(self,'_v_downloadBasket')):
1424: self._v_downloadBasket={}
1425:
1426:
1427: self._v_downloadBasket[threadName]=thread
1428: logging.debug("dwonloadfinally:"+repr(self))
1429: basketID=self.aq_parent.aq_parent.getId()
1430: versionNumber=self.aq_parent.getId()
1.88 ! dwinter 1431:
! 1432: if lock:
! 1433: logging.debug("-----start locking")
! 1434: for object in self.content.getContent():
! 1435: if object[1].lockedBy =='':
! 1436: object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']
! 1437: logging.debug("-----finished locking")
! 1438:
! 1439: #obj.lockedBy=user
! 1440: self._v_downloadBasket[threadName].set(lock,procedure,self.REQUEST['AUTHENTICATED_USER'],current,basketID,versionNumber)
1.45 dwinter 1441:
1.87 dwinter 1442: self._v_downloadBasket[threadName].start()
1.4 dwinter 1443:
1.87 dwinter 1444:
1445:
1446: wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
1447:
1448: if wait_template:
1449: return wait_template[0][1]()
1450: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadBasketWait.zpt')).__of__(self)
1451:
1.88 ! dwinter 1452: return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName,
! 1453: counter=self._v_downloadBasket[threadName].getCounter(),
! 1454: number=self._v_downloadBasket[threadName].getNumberOfFiles())
1.87 dwinter 1455: #_v_xmltrans.run()
1456:
1457: else:
1458: #recover thread, if lost
1459: if not hasattr(self,'_v_downloadBasket'):
1460: self._v_downloadBasket={}
1461: if not self._v_downloadBasket.get(threadName,None):
1462: for thread in threading.enumerate():
1463: if threadName == thread.getName():
1464: self._v_downloadBasket[threadName]=thread
1465:
1466: if self._v_downloadBasket.get(threadName,None) and (self._v_downloadBasket[threadName] is not None) and (not self._v_downloadBasket[threadName].end) :
1467:
1468: wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
1469: if wait_template:
1470: return wait_template[0][1]()
1.83 dwinter 1471:
1.87 dwinter 1472: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadBasketWait.zpt')).__of__(self)
1.88 ! dwinter 1473: return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName,
! 1474: counter=self._v_downloadBasket[threadName].getCounter(),
! 1475: number=self._v_downloadBasket[threadName].getNumberOfFiles())
1.87 dwinter 1476: else:
1477:
1478:
1479: logging.debug("FINISHED")
1480: if not self._v_downloadBasket.get(threadName,None):
1481: for thread in threading.enumerate():
1482: if threadName == thread.getName():
1483: self._v_downloadBasket[threadName]=thread
1484:
1485: #files = self._v_downloadBasket[threadName].result
1486: files=self.basketContainer.resultHash[threadName]
1487: # fh=file("/var/tmp/test")
1488: #ret =fh.read()
1489:
1490: if (not isinstance(self.aq_parent,CDLIBasket)):
1491: basket_name=self.aq_parent.aq_parent.title+"_V"+self.getId()
1492: else:
1493: basket_name=self.aq_parent.title+"_V"+self.getId()
1.86 dwinter 1494:
1495:
1496:
1.87 dwinter 1497: #write basketname to header of atf file
1498:
1.45 dwinter 1499:
1.87 dwinter 1500: self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.atf" """%basket_name)
1501: self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
1502: #length=len(ret)
1503: #self.REQUEST.RESPONSE.setHeader("Content-Length",length)
1504: ret="#basket: %s\n"%basket_name
1505: self.REQUEST.RESPONSE.write(ret)
1506: for fileName in files:
1507: self.REQUEST.RESPONSE.write(file(fileName).read())
1508:
1509: del self.basketContainer.resultHash[threadName]
1510:
1.4 dwinter 1511: def numberOfItems(self):
1512: """return anzahl der elemente im basket"""
1.39 dwinter 1513: return self.content.numberOfItems()
1.4 dwinter 1514:
1515: def getTime(self):
1516: """getTime"""
1517: #return self.bobobase_modification_time().ISO()
1518:
1519: if hasattr(self,'time'):
1520: return time.strftime("%Y-%m-%d %H:%M:%S",self.time)
1521: elif hasattr(self,'timefixed'):
1522: return self.timefixed
1523: else:
1524: setattr(self,'timefixed',self.bobobase_modification_time().ISO())
1525: return self.bobobase_modification_time().ISO()
1526:
1527: def getContent(self):
1528: """get Basket Content"""
1.39 dwinter 1529: return self.content.getContent()
1.4 dwinter 1530:
1531:
1532: def __init__(self,id,user,comment="",basketContent=[]):
1533: """ init a basket version"""
1534: self.id=id
1.74 dwinter 1535: self.comment=comment
1.39 dwinter 1536: self._setObject('content',BasketContent(basketContent))
1537: #self.basketContent=basketContent[0:]a
1.4 dwinter 1538: self.user=user
1539: self.time=time.localtime()
1540:
1541: def getUser(self):
1542: """get user"""
1543: return self.user
1544:
1545: def getComment(self):
1546: """get Comment"""
1547: return self.comment
1548:
1.77 dwinter 1549: security.declareProtected('manage','index_html')
1.4 dwinter 1550: def index_html(self):
1551: """view the basket"""
1.37 dwinter 1552:
1553: if self.REQUEST.get('change',False):
1.38 dwinter 1554: ob=self.aq_parent.updateObjects(self.REQUEST['change'])
1555:
1556: self.REQUEST.RESPONSE.redirect(ob.absolute_url())#go to new basket, because changing generates a new basket
1.37 dwinter 1557:
1.4 dwinter 1558: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self)
1559: return pt()
1560:
1561: def getObjUrl(self,result):
1562: """getUrl of the version of the object"""
1563: objId=result[1].getTitle()
1564: founds=self.CDLICatalog.search({'title':objId})
1565: if len(founds)>0:
1.12 dwinter 1566: return founds[0].getObject().getLastVersion().absolute_url()
1.4 dwinter 1567:
1568: else: #assume version number
1569: splitted=objId.split("_")
1.9 dwinter 1570: founds=self.CDLICatalog.search({'title':splitted[1]})
1.12 dwinter 1571: return founds[0].getObject().getLastVersion().absolute_url()+'/'+objId
1.4 dwinter 1572:
1573: def manage_addCDLIBasketVersion(self,user,comment="",basketContent=[],RESPONSE=None):
1574: """add a version"""
1575:
1576: #check for already existing versions
1577:
1578: lastVersion=self.getLastVersion()
1579: if lastVersion is None:
1580: newId=str(1)
1581: else:
1582: newId=str(int(lastVersion.getId())+1)
1583:
1584: ob=CDLIBasketVersion(newId,user,comment,basketContent)
1585:
1586: self._setObject(newId, ob)
1587:
1588: if RESPONSE is not None:
1589: RESPONSE.redirect('manage_main')
1590: else:
1591: return ob
1592:
1.46 dwinter 1593: class CDLIFileObject(CatalogAware,extVersionedFileObject):
1.1 dwinter 1594: """CDLI file object"""
1595:
1596: meta_type="CDLI File Object"
1.25 dwinter 1597: default_catalog='CDLIObjectsCatalog'
1.1 dwinter 1598:
1.12 dwinter 1599: security=ClassSecurityInfo()
1600:
1.78 dwinter 1601: security.declareProtected('manage','index_html')
1.81 casties 1602:
1603: security.declarePublic('view')
1604: view = PageTemplateFile('zpt/viewCDLIFile.zpt', globals())
1605:
1606: security.declarePublic('editATF')
1607: editATF = PageTemplateFile('zpt/editATFFile.zpt', globals())
1608:
1.28 dwinter 1609: def PrincipiaSearchSource(self):
1610: """Return cataloguable key for ourselves."""
1611: return str(self)
1612:
1.26 dwinter 1613: def makeThisVersionCurrent_html(self):
1.85 dwinter 1614: """form for mthis version current"""
1.26 dwinter 1615:
1616: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self)
1617: return pt()
1.81 casties 1618:
1619: security.declarePublic('makeThisVersionCurrent')
1.27 dwinter 1620: def makeThisVersionCurrent(self,comment,author,RESPONSE=None):
1.26 dwinter 1621: """copy this version to current"""
1622: parent=self.aq_parent
1.81 casties 1623: parent.manage_addVersionedFileObject(id=None,vC=comment,author=author,file=self.getData(),RESPONSE=RESPONSE)
1624: #newversion=parent.manage_addCDLIFileObject('',comment,author)
1625: #newversion.manage_upload(self.getData())
1.27 dwinter 1626:
1.81 casties 1627: #if RESPONSE is not None:
1628: # RESPONSE.redirect(self.aq_parent.absolute_url()+'/history')
1.27 dwinter 1629:
1.26 dwinter 1630: return True
1631:
1.52 dwinter 1632: def getFormattedData(self):
1633: """fromat text"""
1634: data=self.getData()
1.70 dwinter 1635: # return re.sub("\s\#lem"," #lem",data) #remove return vor #lem
1636: return re.sub("#lem"," #lem",data) #remove return vor #lem
1.52 dwinter 1637:
1.1 dwinter 1638:
1.40 dwinter 1639: security.declarePublic('getPNumber')
1640: def getPNumber(self):
1.46 dwinter 1641: """get the pnumber"""
1642: try:
1.49 dwinter 1643: txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.getData()[0:])
1.40 dwinter 1644: except:
1.49 dwinter 1645: txt=self.getData()[0:]
1.40 dwinter 1646:
1647: return "ERROR"
1648: try:
1649: return "P"+txt.group(1)
1650: except:
1651: return "ERROR"
1652:
1.12 dwinter 1653: security.declarePublic('getDesignation')
1654: def getDesignation(self):
1655: """get the designation out of the file"""
1.16 dwinter 1656: try:
1.46 dwinter 1657: txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.getData()[0:])
1.13 dwinter 1658: except:
1.46 dwinter 1659: txt=self.getData()[0:]
1.16 dwinter 1660:
1661: return "ERROR"
1.12 dwinter 1662: try:
1663: return txt.group(2)
1664: except:
1665: return "ERROR"
1.81 casties 1666:
1.12 dwinter 1667:
1.1 dwinter 1668: manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1')
1669:
1.81 casties 1670: def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',versionNumber=0,
1671: precondition='', content_type='',
1.48 dwinter 1672: from_tmp=False,REQUEST=None):
1.1 dwinter 1673: """Add a new File object.
1674: Creates a new File object 'id' with the contents of 'file'"""
1.48 dwinter 1675:
1.1 dwinter 1676: id=str(id)
1677: title=str(title)
1678: content_type=str(content_type)
1679: precondition=str(precondition)
1680:
1681: id, title = cookId(id, title, file)
1682:
1683: self=self.this()
1684:
1685: # First, we create the file without data:
1.81 casties 1686: self._setObject(id, CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=vC,time=time.localtime(),author=author))
1.80 casties 1687: fob = self._getOb(id)
1.45 dwinter 1688:
1.1 dwinter 1689: # Now we "upload" the data. By doing this in two steps, we
1690: # can use a database trick to make the upload more efficient.
1.48 dwinter 1691:
1692: if file and not from_tmp:
1.80 casties 1693: fob.manage_upload(file)
1.48 dwinter 1694: elif file and from_tmp:
1.81 casties 1695: fob.manage_file_upload(file) # manage_upload_from_tmp doesn't exist in ExtFile2
1696: # fob.manage_upload_from_tmp(file) # manage_upload_from_tmp doesn't exist in ExtFile2
1.1 dwinter 1697: if content_type:
1.80 casties 1698: fob.content_type=content_type
1.1 dwinter 1699:
1.81 casties 1700: #logging.debug("manage_add: lastversion=%s"%self.getData())
1701: logging.debug("reindex1: %s in %s"%(repr(self),repr(self.default_catalog)))
1.45 dwinter 1702: self.reindex_object()
1.81 casties 1703: #logging.debug("manage_add: fob_data=%s"%fob.getData())
1.80 casties 1704: logging.debug("reindex2: %s in %s"%(repr(fob), repr(fob.default_catalog)))
1.81 casties 1705: fob.index_object()
1.49 dwinter 1706:
1.85 dwinter 1707: self.CDLIRoot.updateOrAddToFileBTree(ob)
1.1 dwinter 1708: if REQUEST is not None:
1709: REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main')
1.3 dwinter 1710:
1.80 casties 1711:
1.46 dwinter 1712: class CDLIFile(extVersionedFile,CatalogAware):
1.3 dwinter 1713: """CDLI file"""
1714:
1.77 dwinter 1715: security=ClassSecurityInfo()
1.3 dwinter 1716: meta_type="CDLI file"
1.81 casties 1717: content_meta_type = ["CDLI File Object"]
1718:
1.3 dwinter 1719: default_catalog='CDLICatalog'
1.81 casties 1720:
1.78 dwinter 1721: security.declareProtected('manage','index_html')
1.81 casties 1722:
1.51 dwinter 1723: def getLastVersionData(self):
1724: """get last version data"""
1.81 casties 1725: return self.getData()
1.51 dwinter 1726:
1.52 dwinter 1727: def getLastVersionFormattedData(self):
1728: """get last version data"""
1.81 casties 1729: return self.getContentObject().getFormattedData()
1730:
1731: def getTextId(self):
1732: """returns P-number of text"""
1733: # assuming that its the beginning of the title
1734: return self.title[:7]
1.52 dwinter 1735:
1.51 dwinter 1736: #security.declarePublic('history')
1.26 dwinter 1737: def history(self):
1738: """history"""
1739:
1740: ext=self.ZopeFind(self.aq_parent,obj_ids=["history_template.html"])
1741: if ext:
1742: return getattr(self,ext[0][1].getId())()
1743:
1744: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionHistory')).__of__(self)
1745: return pt()
1746:
1747:
1.44 dwinter 1748: def getBasketFromId(self,basketid, context=None):
1749: """get basket from id"""
1750:
1751: if not context:
1752: context=self
1753:
1754: for basket in self.ZopeFind(context,obj_metatypes=["CDLIBasket"]):
1755: if basket[0]==basketid:
1756: return basket[1]
1757: else:
1758: None
1759:
1.12 dwinter 1760:
1.8 dwinter 1761: def isContainedInBaskets(self,context=None):
1762: """check is this file is part of any basket
1763: @param context: (optional) necessessary if CDLIBasketCatalog is not an (inherited) attribute of self, context.CDLIBasketCatalog
1764: has to exist.
1765: """
1766:
1767: if not context:
1768: context=self
1.12 dwinter 1769:
1770: ret=[]
1771: for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()}):
1772: #if the basket x is deleted it seemes to be that x is sometimes still in the Catalog, why?
1773: try:
1774: ret.append(x.getObject())
1775: except:
1776: pass
1777: return ret
1778: #return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})]
1.5 dwinter 1779:
1780:
1.81 casties 1781: def _newContentObject(self, id, title='', versionNumber=0, versionComment=None, time=None, author=None):
1782: """factory for content objects. to be overridden in derived classes."""
1783: logging.debug("_newContentObject(CDLI)")
1784: return CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author)
1785:
1786:
1.5 dwinter 1787: def addCDLIFileObjectForm(self):
1788: """add a new version"""
1789:
1790: if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]:
1791: return "please login first"
1792: if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy==''):
1793: out=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject',version=self.getVersion()).__of__(self)
1794: return out()
1795: else:
1796: return "Sorry file is locked by somebody else"
1797:
1.37 dwinter 1798: def manage_addCDLIFileObject(self,id,vC,author,
1799: file='',title='',
1800: precondition='',
1801: content_type='',
1802: changeName='no',newName='',
1.48 dwinter 1803: come_from=None,
1804: from_tmp=False,RESPONSE=None):
1.3 dwinter 1805: """add"""
1.48 dwinter 1806:
1.3 dwinter 1807: try: #TODO: der ganze vC unsinn muss ueberarbeitet werden
1808: vC=self.REQUEST['vC']
1809: except:
1810: pass
1811:
1.81 casties 1812: ob = self.addContentObject(id, vC, author, file, title, changeName=changeName, newName=newName, from_tmp=from_tmp,
1813: precondition=precondition, content_type=content_type)
1.3 dwinter 1814:
1.22 dwinter 1815: try:
1.81 casties 1816: #FIXME: wozu ist das gut?
1817: self.REQUEST.SESSION['objID_parent']=self.getId()
1.22 dwinter 1818: except:
1.81 casties 1819: pass
1.37 dwinter 1820:
1.85 dwinter 1821: #self.cdliRoot.updateOrAddToFileBTree(self)# now update the object in the cache
1822:
1823:
1.3 dwinter 1824: if RESPONSE:
1.81 casties 1825: if ob.getSize()==0:
1826: self.REQUEST.SESSION['objID']=ob.getId()
1.3 dwinter 1827: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self)
1828: return pt()
1829: else:
1.37 dwinter 1830: if come_from and (come_from!=""):
1.81 casties 1831: RESPONSE.redirect(come_from+"?change="+self.getId())
1.37 dwinter 1832: else:
1833: RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title)
1.3 dwinter 1834: else:
1.81 casties 1835: return ob
1.3 dwinter 1836:
1837:
1838: def manage_addCDLIFileForm(self):
1839: """interface for adding the OSAS_root"""
1840: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addCDLIFile.zpt')).__of__(self)
1841: return pt()
1842:
1843: def manage_addCDLIFile(self,id,title,lockedBy, author=None, RESPONSE=None):
1844: """add the OSAS_root"""
1845: newObj=CDLIFile(id,title,lockedBy,author)
1.22 dwinter 1846:
1847: tryToggle=True
1848: tryCount=0
1849:
1850: self._setObject(id,newObj)
1.45 dwinter 1851: getattr(self,id).reindex_object()
1.22 dwinter 1852:
1.3 dwinter 1853: if RESPONSE is not None:
1854: RESPONSE.redirect('manage_main')
1855:
1.81 casties 1856:
1.69 dwinter 1857: def checkUTF8(data):
1858: """check utf 8"""
1859: try:
1860: data.encode('utf-8')
1861: return True
1862: except:
1863: return False
1864:
1.1 dwinter 1865:
1.45 dwinter 1866: def checkFile(filename,data,folder):
1867: """check the files"""
1868: # first check the file name
1869: fn=filename.split(".") # no extension
1.48 dwinter 1870:
1.45 dwinter 1871: if not fn[0][0]=="P":
1.46 dwinter 1872: return False,"P missing in the filename"
1.45 dwinter 1873: elif len(fn[0])!=7:
1.46 dwinter 1874: return False,"P number has not the right length 6"
1.69 dwinter 1875: elif not checkUTF8(data):
1876: return False,"not utf-8"
1.45 dwinter 1877: else:
1.69 dwinter 1878: return True,""
1879:
1.45 dwinter 1880:
1.25 dwinter 1881: def splitatf(fh,dir=None,ext=None):
1.2 dwinter 1882: """split it"""
1.4 dwinter 1883: ret=None
1.2 dwinter 1884: nf=None
1.25 dwinter 1885: i=0
1.49 dwinter 1886:
1.81 casties 1887: #ROC: why split \n first and then \r???
1.73 dwinter 1888: if (type(fh) is StringType) or (type(fh) is UnicodeType):
1889: iter=fh.split("\n")
1890: else:
1891: iter=fh.readlines()
1892:
1893: for lineTmp in iter:
1.66 dwinter 1894: lineTmp=lineTmp.replace(codecs.BOM_UTF8,'') # make sure that all BOM are removed..
1895: for line in lineTmp.split("\r"):
1896: #logging.log("Deal with: %s"%line)
1897: if ext:
1898: i+=1
1899: if (i%100)==0:
1900: ext.result+="."
1901: if i==10000:
1902: i=0
1903: ext.result+="<br>"
1904: #check if basket name is in the first line
1905: if line.find("#atf basket")>=0: #old convention
1906: ret=line.replace('#atf basket ','')
1907: ret=ret.split('_')[0]
1908: elif line.find("#basket:")>=0: #new convention
1909: ret=line.replace('#basket: ','')
1910: ret=ret.split('_')[0]
1911:
1912: else:
1913: if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile
1914: if nf:
1915: nf.close() #close last file
1916:
1.49 dwinter 1917:
1.66 dwinter 1918: filename=line[1:].split("=")[0].rstrip()+".atf"
1919: if dir:
1920: filename=os.path.join(dir,filename)
1921: nf=file(filename,"w")
1922: logging.info("open %s"%filename)
1923: if nf:
1924: nf.write(line.replace("\n","")+"\n")
1925:
1926: try:
1927: nf.close()
1.61 dwinter 1928: except:
1.66 dwinter 1929: pass
1.73 dwinter 1930:
1931: if not((type(fh) is StringType) or (type(fh) is UnicodeType)):
1932: fh.close()
1.5 dwinter 1933: return ret,len(os.listdir(dir))
1.4 dwinter 1934:
1.19 dwinter 1935:
1.46 dwinter 1936: class CDLIFileFolder(extVersionedFileFolder):
1.4 dwinter 1937: """CDLI File Folder"""
1.1 dwinter 1938:
1.19 dwinter 1939: security=ClassSecurityInfo()
1.1 dwinter 1940: meta_type="CDLI Folder"
1.81 casties 1941: file_meta_type=['CDLI file']
1942: folder_meta_type=['CDLI Folder']
1943:
1944: file_catalog='CDLICatalog'
1945:
1.45 dwinter 1946: #downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert.
1.24 dwinter 1947: tmpStore2={}
1.81 casties 1948:
1949: def _newVersionedFile(self, id, title='', lockedBy=None, author=None):
1950: """factory for versioned files. to be overridden in derived classes."""
1951: logging.debug("_newVersionedFile(CDLI)")
1952: return CDLIFile(id, title, lockedBy=lockedBy, author=author)
1953:
1.19 dwinter 1954: def setTemp(self,name,value):
1955: """set tmp"""
1956:
1957: setattr(self,name,value)
1958:
1.81 casties 1959: deleteFileForm = PageTemplateFile("zpt/doDeleteFile", globals())
1.19 dwinter 1960:
1.81 casties 1961: def delete(self,ids,REQUEST=None):
1962: """delete these files"""
1.12 dwinter 1963: if type(ids) is not ListType:
1964: ids=[ids]
1.81 casties 1965:
1966: self.manage_delObjects(ids)
1.12 dwinter 1967:
1.81 casties 1968: if REQUEST is not None:
1969: return self.index_html()
1970:
1971:
1.4 dwinter 1972: def getVersionNumbersFromIds(self,ids):
1973: """get the numbers of the current versions of documents described by their ids"""
1974:
1975: ret=[]
1976: searchStr=" OR ".join(ids)
1977:
1.9 dwinter 1978: founds=self.CDLICatalog.search({'title':searchStr})
1.4 dwinter 1979:
1980: for found in founds:
1.81 casties 1981: lastVersion=found.getObject().getContentObject()
1.4 dwinter 1982: ret.append((found.getId,lastVersion))
1983:
1984: return ret
1985:
1.67 dwinter 1986: def getFile(self,fn):
1987: """get the content of the file fn"""
1.81 casties 1988: logging.debug("getFile: %s"%repr(fn))
1989: if not self.hasObject(fn):
1990: # search deeper
1991: founds=getattr(self, self.file_catalog).search({'textid':fn})
1992: if founds:
1993: obj=founds[0].getObject().getContentObject()
1994: else:
1995: return ""
1.67 dwinter 1996: else:
1.81 casties 1997: obj = self[fn].getContentObject()
1.68 dwinter 1998:
1.81 casties 1999: return obj.getData()[0:]
2000:
1.67 dwinter 2001:
1.14 dwinter 2002: def checkCatalog(self,fn):
2003: """check if fn is in the catalog"""
1.19 dwinter 2004: #TODO add checkCatalog
1.14 dwinter 2005:
1.19 dwinter 2006:
1.45 dwinter 2007: def findObjectsFromListWithVersion(self,list,author=None):
1.26 dwinter 2008: """find objects from a list with versions
2009: @param list: list of tuples (cdliFile,version)
2010: """
2011: #self.REQUEST.SESSION['fileIds']=list#store fieldIds in session for further usage
2012: #self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds']
2013:
2014: pt=getattr(self,'filelistVersioned.html')
2015:
1.45 dwinter 2016: return pt(search=list,author=author)
1.26 dwinter 2017:
2018:
1.67 dwinter 2019: def getAllPNumbers(self):
2020: """get a list of all files (resp their p-numbers) stored"""
2021:
2022: ret=[x.getId for x in self.CDLICatalog()]
2023:
2024: return ret
2025:
1.83 dwinter 2026: def expandFile(self,fileId,fileTree):
2027: """wildcard in fileID suche alle Treffer"""
2028: founds=self.CDLICatalog({'title':fileId})
2029: for found in founds:
2030: fileTree.add(found.getId)
2031: logging.debug("ADDD:"+found.getId)
2032:
1.85 dwinter 2033: def findObjectsFromList(self,enterList=None,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None,REQUEST=None,returnHash=False,hash=None):
1.1 dwinter 2034: """findObjectsFromList (, TAB oder LINE separated)"""
1.15 dwinter 2035:
1.83 dwinter 2036: logging.debug("start: findObjectsFromList")
1.85 dwinter 2037: #logging.debug("start: findObjectsFromList"+repr(list))
2038:
2039:
1.6 dwinter 2040: if upload: # list from file upload
2041: txt=upload.read()
1.35 dwinter 2042:
2043: if enterList:
2044: txt=enterList
2045:
2046: if upload or enterList:
1.6 dwinter 2047: txt=txt.replace(",","\n")
2048: txt=txt.replace("\t","\n")
1.12 dwinter 2049: txt=txt.replace("\r","\n")
1.6 dwinter 2050: idsTmp=txt.split("\n")
2051: ids=[]
2052: for id in idsTmp: # make sure that no empty lines
2053: idTmp=id.lstrip().rstrip()
2054: if len(idTmp)>0:
2055:
2056: ids.append(idTmp)
2057:
2058: #self.REQUEST.SESSION['ids']=" OR ".join(ids)
1.12 dwinter 2059:
1.6 dwinter 2060: pt=getattr(self,'filelist.html')
1.7 dwinter 2061: self.REQUEST.SESSION['searchList']=ids
1.6 dwinter 2062: return pt(search=ids)
1.7 dwinter 2063:
1.6 dwinter 2064: if basketName:
1.7 dwinter 2065: #TODO: get rid of one of these..
2066:
1.6 dwinter 2067: pt=getattr(self,'filelist.html')
1.7 dwinter 2068: return pt(basketName=basketName,numberOfObjects=numberOfObjects)
1.6 dwinter 2069:
1.85 dwinter 2070: if hash is not None and hasattr(self.cdliRoot,'v_tmpStore') and self.cdliRoot.v_tmpStore.has_key(hash):
2071:
2072: logging.debug("asking for storage2")
2073: result =self.cdliRoot.v_tmpStore[hash]
2074: if result:
2075: logging.debug("give result from storage2")
2076: return hash,self.cdliRoot.v_tmpStore[hash]
2077:
1.15 dwinter 2078: if list is not None: # got already a list
1.83 dwinter 2079:
2080: logging.debug(" ----List version")
1.6 dwinter 2081: ret=[]
1.83 dwinter 2082: fileTree=Set()
2083:
1.6 dwinter 2084: for fileId in list:
1.83 dwinter 2085:
2086: if fileId.find("*")>-1: #check for wildcards
2087: self.expandFile(fileId,fileTree)
2088:
1.35 dwinter 2089: elif len(fileId.split("."))==1:
1.6 dwinter 2090: fileId=fileId+".atf"
1.83 dwinter 2091: fileTree.add(fileId)
2092: #logging.debug(" -----:"+fileId)
2093: #ret+=self.CDLICatalog({'title':fileId})
2094: #x =self.getFileObject(fileId)
2095: #if x is not None:
2096: # ret.append(x)
1.35 dwinter 2097:
1.83 dwinter 2098:
2099:
2100: ids = fileTree & self.v_file_ids
1.85 dwinter 2101: #self.REQUEST.SESSION['fileIds']=ids#store fieldIds in session for further usage
2102: l=makelist(fileTree)[0:]
2103: logging.debug("l-list:"+repr(l))
2104: self.REQUEST.SESSION['fileIds']=l#store fieldIds in session for further usage
2105: self.REQUEST.SESSION['searchList']=l
2106: #self.REQUEST.SESSION['searchList']=['P000001.atf']
2107:
1.83 dwinter 2108:
1.85 dwinter 2109: hash = md5.new(repr(makelist(fileTree))).hexdigest() # erzeuge hash als identification
2110: self.REQUEST.SESSION['hash']=hash
2111: #TODO: do I need garbage collection for v_tmpStore ?
1.83 dwinter 2112:
1.84 dwinter 2113: #logging.debug("Hash:"+repr(hash))
1.85 dwinter 2114: #
2115: # if hasattr(self.cdliRoot,'v_tmpStore') and self.cdliRoot.v_tmpStore.has_key(hash):
2116: # logging.debug("asking for storage")
2117: # res=self.cdliRoot.v_tmpStore[hash]
2118: # if res:
2119: # if returnHash == True:
2120: # return hash,res
2121: # return res
1.83 dwinter 2122:
1.7 dwinter 2123: #TODO: get rid of one of these..
1.83 dwinter 2124: #ids=[x.getObject().getId() for x in ret]
2125: ret=[(self.getFileObject(x),self.getFileObjectLastVersion(x)) for x in ids]
1.84 dwinter 2126:
2127: #self.REQUEST.SESSION['fileIds']=ids#store fieldIds in session for further usage
2128: #self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds']
1.85 dwinter 2129:
1.25 dwinter 2130: if display:
2131: pt=getattr(self,'filelist.html')
2132:
2133: return pt(search=ids)
1.83 dwinter 2134: else:
2135: #self.REQUEST.SESSION['hash'] = ret # store in session
1.85 dwinter 2136: if not hasattr(self,'v_tmpStore'):
2137: self.cdliRoot.v_tmpStore={}
1.83 dwinter 2138: #logging.debug("HHHHHHNEU:"+repr(self.makelist(ids)))
1.84 dwinter 2139: #logging.debug("HHHHHHNEU:"+repr(hash))
1.85 dwinter 2140: self.cdliRoot.v_tmpStore[hash] = ret # store in session
2141: if returnHash == True:
2142: return hash,ret
1.25 dwinter 2143: return ret
2144:
2145:
1.1 dwinter 2146:
1.7 dwinter 2147: if start:
2148: RESPONSE.redirect("filelist.html?start:int="+str(start))
1.85 dwinter 2149:
1.19 dwinter 2150: security.declareProtected('Manage','createAllFilesAsSingleFile')
1.1 dwinter 2151: def createAllFilesAsSingleFile(self,RESPONSE=None):
2152: """download all files"""
2153:
2154: def sortF(x,y):
2155: return cmp(x[0],y[0])
2156:
1.81 casties 2157: catalog=getattr(self,self.file_catalog)
1.1 dwinter 2158: #tf,tfilename=mkstemp()
1.66 dwinter 2159: if not hasattr(self.temp_folder,'downloadCounter'):
2160: self.temp_folder.downloadCounter=0
1.49 dwinter 2161:
2162: if getattr(self.temp_folder,'downloadCounter',0) > 5:
1.46 dwinter 2163: return """I am sorry, currently the server has to many requests for downloads, please come back later!"""
1.45 dwinter 2164:
1.46 dwinter 2165: self.temp_folder.downloadCounter+=1
2166: self._p_changed=1
1.58 dwinter 2167: transaction.get().commit()
1.45 dwinter 2168:
1.1 dwinter 2169: list=[(x.getId,x) for x in catalog()]
2170: list.sort(sortF)
1.46 dwinter 2171:
1.45 dwinter 2172:
1.1 dwinter 2173:
2174: RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%"all.atf")
2175: RESPONSE.setHeader("Content-Type","application/octet-stream")
1.46 dwinter 2176: tmp=""
1.1 dwinter 2177: for l in list:
2178: obj=l[1].getObject()
2179:
2180: if obj.meta_type=="CDLI file":
2181:
2182: #os.write(tf,obj.getLastVersion().data)
2183: if RESPONSE:
1.81 casties 2184: RESPONSE.write(obj.getData()[0:])
1.71 dwinter 2185: RESPONSE.write("\n")
1.46 dwinter 2186: self.temp_folder.downloadCounter-=1
2187: self._p_changed=1
1.58 dwinter 2188: transaction.get().commit()
1.1 dwinter 2189: #os.close(tf)
2190: #RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)
2191: return True
2192:
2193: def downloadFile(self,fn):
2194: """download fn - not used yet"""
2195: self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getLastVersion().getId())
2196: self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
2197: self.REQUEST.RESPONSE.write(file(fn).read())
2198:
2199:
2200:
2201: def hasParent(self):
2202: """returns true falls subfolder"""
2203:
1.81 casties 2204: if self.aq_parent.meta_type in self.folder_meta_type:
1.1 dwinter 2205: return True
2206: else:
2207: return False
2208:
2209: def getFolders(self):
2210: """get all subfolders"""
2211: ret=[]
1.81 casties 2212: folders=self.ZopeFind(self,obj_metatypes=self.folder_meta_type)
1.1 dwinter 2213: for folder in folders:
2214: ret.append((folder[1],
1.81 casties 2215: len(self.ZopeFind(folder[1],obj_metatypes=self.folder_meta_type)),
2216: len(self.ZopeFind(folder[1],obj_metatypes=self.file_meta_type))
1.1 dwinter 2217: ))
2218: return ret
2219:
2220:
1.77 dwinter 2221: security.declareProtected('manage','index_html')
1.1 dwinter 2222: def index_html(self):
2223: """main"""
2224: ext=self.ZopeFind(self,obj_ids=["index.html"])
2225: if ext:
2226: return ext[0][1]()
2227:
2228: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','CDLIFileFolderMain')).__of__(self)
2229: return pt()
2230:
1.22 dwinter 2231:
2232: manage_addCDLIFileFolderForm=DTMLFile('dtml/folderAdd', globals())
2233:
2234:
2235: def manage_addCDLIFileFolder(self, id, title='',
2236: createPublic=0,
2237: createUserF=0,
2238: REQUEST=None):
2239: """Add a new Folder object with id *id*.
2240:
2241: If the 'createPublic' and 'createUserF' parameters are set to any true
2242: value, an 'index_html' and a 'UserFolder' objects are created respectively
2243: in the new folder.
2244: """
2245: ob=CDLIFileFolder()
2246: ob.id=str(id)
2247: ob.title=title
2248: self._setObject(id, ob)
2249: ob=self._getOb(id)
2250:
2251: checkPermission=getSecurityManager().checkPermission
2252:
2253: if createUserF:
2254: if not checkPermission('Add User Folders', ob):
2255: raise Unauthorized, (
2256: 'You are not authorized to add User Folders.'
2257: )
2258: ob.manage_addUserFolder()
2259:
2260:
2261: if REQUEST is not None:
2262: return self.manage_main(self, REQUEST, update_menu=1)
2263:
2264: class CDLIRoot(Folder):
2265: """main folder for cdli"""
2266:
2267: meta_type="CDLIRoot"
1.81 casties 2268: downloadCounterBaskets=0 # counts the current basket downloads if counter > 10 no downloads are possible
2269:
2270: file_catalog = 'CDLICatalog'
2271:
2272: # word splitter for search
2273: splitter = {'words':cdliSplitter.wordSplitter(),
2274: 'graphemes':cdliSplitter.graphemeSplitter()}
2275:
1.51 dwinter 2276:
1.86 dwinter 2277: def viewATF(self,id,RESPONSE):
2278: """view an Object"""
2279: ob = self.CDLICatalog({'title':id})
2280: logging.debug(ob[0].getObject().getLastVersion().absolute_url()+"/view")
2281: if len(ob)>0:
2282: RESPONSE.redirect(ob[0].getObject().getLastVersion().absolute_url()+"/view")
2283: return "not found"
2284:
2285: def history(self,id,RESPONSE):
2286: """view an Object"""
2287: ob = self.CDLICatalog({'title':id})
2288: if len(ob)>0:
2289: RESPONSE.redirect(ob[0].absolute_url+"/history")
2290: return "not found"
2291:
2292:
2293: def downloadLocked(self,id,RESPONSE):
2294: """view an Object"""
2295: ob = self.CDLICatalog({'title':id})
2296: if len(ob)>0:
2297: RESPONSE.redirect(ob[0].absolute_url+"/downloadLocked")
2298: return "not found"
2299:
2300: def download(self,id,RESPONSE):
2301: """view an Object"""
2302: ob = self.CDLICatalog({'title':id})
2303: if len(ob)>0:
2304: RESPONSE.redirect(ob[0].getLastVersion().absolute_url())
2305: return "not found"
2306: def addCDLIFileObjectForm(self,id,RESPONSE):
2307: """view an Object"""
2308: ob = self.CDLICatalog({'title':id})
2309: if len(ob)>0:
2310: RESPONSE.redirect(ob[0].absolute_url+"/addCDLIFileObjectForm")
2311: return "not found"
2312:
2313: def addVersionedFileObjectForm(self,id,RESPONSE):
2314: """view an Object"""
2315: ob = self.CDLICatalog({'title':id})
2316: if len(ob)>0:
2317: RESPONSE.redirect(ob[0].absolute_url+"/addVersionedFileObjectForm")
2318: return "not found"
2319:
2320: def unlock(self,id,RESPONSE):
2321: """view an Object"""
2322: ob = self.CDLICatalog({'title':id})
2323: if len(ob)>0:
2324: RESPONSE.redirect(ob[0].absolute_url+"/unlock")
2325: return "not found"
2326:
1.83 dwinter 2327: def getFileObject(self,fileId):
1.85 dwinter 2328: """get an object"""
1.83 dwinter 2329: x=self.v_files.get(fileId)
2330: #logging.debug(x)
2331: return x
2332:
2333: def getFileObjectLastVersion(self,fileId):
1.85 dwinter 2334: """get an object"""
1.83 dwinter 2335: x=self.v_files_lastVersion.get(fileId)
2336: #logging.debug(x)
2337: return x
2338:
1.85 dwinter 2339: def showFileIds(self):
2340: """showIds"""
2341: return self.v_file_ids
2342:
1.83 dwinter 2343: def generateFileBTree(self):
2344: """erzeuge einen Btree aus allen Files"""
2345: self.v_files = OOBTree()
2346: self.v_files_lastVersion = OOBTree()
2347: self.v_file_ids = Set()
2348:
2349: for x in self.CDLICatalog.searchResults():
2350:
2351: self.v_files.update({x.getId:x.getObject()})
2352: self.v_files_lastVersion.update({x.getId:x.getObject().getLastVersion()})
2353: self.v_file_ids.add(x.getId)
2354: logging.debug("add:"+x.getId+"XXX"+repr(x.getObject()))
2355:
1.85 dwinter 2356: return True
2357:
2358:
2359: def updateOrAddToFileBTree(self,obj):
2360: """update a BTree"""
2361: self.v_files.update({obj.getId():obj})
2362: self.v_files_lastVersion.update({obj.getId():obj.getLastVersion()})
2363:
2364: self.v_file_ids.add(obj.getId())
2365: logging.debug("update:"+obj.getId()+"XXX"+repr(obj))
2366:
2367: def deleteFromBTree(self,objId):
2368: """delete an obj"""
2369: self.v_files.pop(objId)
2370: self.v_files_lastVersion.pop(objId)
2371: self.v_file_ids.remove(objId)
2372:
2373:
2374:
1.73 dwinter 2375: def deleteFiles(self,ids):
1.81 casties 2376: """delete files"""
1.73 dwinter 2377: for id in ids:
2378: founds=self.CDLICatalog.search({'title':id.split(".")[0]})
2379: if founds:
1.81 casties 2380: logging.debug("deleting %s"%founds)
1.73 dwinter 2381: folder=founds[0].getObject().aq_parent #get the parent folder of the object
1.81 casties 2382: logging.debug("deleting from %s"%folder)
2383: cut=folder.delete([founds[0].getId]) #cut it out
2384:
1.73 dwinter 2385:
2386:
1.81 casties 2387: def searchText(self, query, index='graphemes'):
2388: """searches query in the fulltext index and returns a list of file ids/P-numbers"""
2389: # see also: http://www.plope.com/Books/2_7Edition/SearchingZCatalog.stx#2-13
2390: logging.debug("searchtext for '%s' in index %s"%(query,index))
2391: #import Products.ZCTextIndex.QueryParser
2392: #qp = QueryParser.QueryParser()
2393: #logging.debug()
2394: idxQuery = {index:{'query':query}}
2395: idx = getattr(self, self.file_catalog)
2396: # do search
2397: resultset = idx.search(query_request=idxQuery,sort_index='textid')
2398: # put only the P-Number in the result
2399: results = [res.getId[:7] for res in resultset]
2400: logging.debug("searchtext: found %d texts"%len(results))
2401: return results
2402:
2403:
2404: def getFile(self, pnum):
2405: """get the translit file with the given pnum"""
2406: f = getattr(self, self.file_catalog).search({'textid':pnum})
2407: if not f:
2408: return ""
1.71 dwinter 2409:
1.81 casties 2410: return f[0].getObject().getData()
2411:
1.57 dwinter 2412:
1.74 dwinter 2413: def showFile(self,fileId,wholePage=False):
1.71 dwinter 2414: """show a file
2415: @param fileId: P-Number of the document to be displayed
2416: """
1.81 casties 2417: f=getattr(self, self.file_catalog).search({'textid':fileId})
1.51 dwinter 2418: if not f:
2419: return ""
2420:
1.74 dwinter 2421: if wholePage:
1.81 casties 2422: logging.debug("show whole page")
2423: return f[0].getObject().getContentObject().view()
1.74 dwinter 2424: else:
2425: return f[0].getObject().getLastVersionFormattedData()
1.55 dwinter 2426:
1.56 dwinter 2427:
1.81 casties 2428: def showWordInFile(self,fileId,word,indexName='graphemes',regExp=False,):
2429: """get lines with word from FileId"""
2430: logging.debug("showwordinfile word='%s' index=%s file=%s"%(word,indexName,fileId))
1.56 dwinter 2431:
1.81 casties 2432: file = formatAtfFullLineNum(self.getFile(fileId))
1.66 dwinter 2433: ret=[]
1.71 dwinter 2434:
1.81 casties 2435: # add whitespace before and whitespace and line-end to splitter bounds expressions
2436: bounds = self.splitter[indexName].bounds
2437: splitexp = "(%s|\s)(%%s)(%s|\s|\Z)"%(bounds,bounds)
2438: # clean word expression
2439: # TODO: this should use QueryParser itself
2440: # take out double quotes
2441: word = word.replace('"','')
2442: # take out ignorable signs
2443: ignorable = self.splitter[indexName].ignorex
2444: word = ignorable.sub('', word)
2445: # compile into regexp objects and escape parens
2446: wordlist = [re.compile(splitexp%re.escape(w)) for w in word.split(' ')]
2447:
2448: for line in file.splitlines():
1.71 dwinter 2449: for word in wordlist:
1.81 casties 2450: #logging.debug("showwordinfile: searching for %s in %s"%(word.pattern,ignoreable.sub('',line)))
2451: if word.search(ignorable.sub('',line)):
2452: line = formatAtfLineHtml(line)
2453: ret.append(line)
2454: break
2455:
1.66 dwinter 2456: return ret
1.56 dwinter 2457:
1.81 casties 2458:
2459: def showWordInFiles(self,fileIds,word,indexName='graphemes',regExp=False):
2460: """
2461: get lines with word from all ids in list FileIds.
2462: returns dict with id:lines pairs.
2463: """
2464: logging.debug("showwordinfiles word='%s' index=%s file=%s"%(word,indexName,fileIds))
1.51 dwinter 2465:
1.81 casties 2466: return dict([(id,self.showWordInFile(id, word, indexName, regExp)) for id in fileIds])
2467:
2468:
2469: def tagWordInFile(self,fileId,word,indexName='graphemes',regExp=False):
2470: """get text with word highlighted from FileId"""
2471: logging.debug("tagwordinfile word='%s' index=%s file=%s"%(word,indexName,fileId))
2472:
2473: file=self.getFile(fileId)
2474: tagStart=u'<span class="found">'
2475: tagEnd=u'</span>'
2476: tagStr=tagStart + u'%%s' + tagEnd
1.66 dwinter 2477: ret=[]
1.71 dwinter 2478:
1.81 casties 2479: # add whitespace to splitter bounds expressions and compile into regexp object
2480: bounds = self.splitter[indexName].bounds
2481: wordsplit = re.compile("(%s|\s)"%bounds)
2482: # clean word expression
2483: # TODO: this should use QueryParser itself
2484: word = word.replace('"','') # take out double quotes
2485: # take out ignoreable signs
2486: ignorable = self.splitter[indexName].ignorex
2487: word = ignorable.sub('', word)
2488: # split search terms by blanks
2489: words = word.split(' ')
2490: # split search terms again (for grapheme search with words)
2491: splitwords = dict(((w,self.splitter[indexName].process([w])) for w in words))
1.71 dwinter 2492:
1.81 casties 2493: for line in file.splitlines():
1.79 casties 2494: line = unicodify(line)
1.81 casties 2495: # ignore lemma and other lines
2496: if line.lstrip().startswith('#lem:'):
2497: continue
2498: # ignore p-num line
2499: if line.startswith('&P'):
2500: continue
2501: # ignore version lines
2502: if line.startswith('#version'):
2503: continue
2504: # ignore atf type lines
2505: if line.startswith('#atf:'):
2506: continue
2507:
2508: # first scan
2509: hitwords = []
2510: for w in words:
2511: if ignorable.sub('',line).find(w) > -1:
2512: # word is in line
2513: # append split word for grapheme search with words
2514: hitwords.extend(splitwords[w])
2515: #hitwords.extend(wordsplit.split(w))
2516:
2517: # examine hits closer
2518: if hitwords:
2519: # split line into words
2520: parts = wordsplit.split(line)
2521: line = ""
2522: for p in parts:
2523: #logging.debug("tagwordinfile: searching for %s in %s"%(p,hitwords))
2524: # reassemble line
2525: if ignorable.sub('', p) in hitwords:
2526: #logging.debug("tagwordinfile: found %s in %s"%(p,hitwords))
2527: # this part was found
2528: line += tagStart + formatAtfHtml(p) + tagEnd
2529: else:
2530: line += formatAtfHtml(p)
2531:
2532: else:
2533: # no hits
2534: line = formatAtfHtml(line)
2535:
2536: ret.append(line)
2537:
2538: return u'<br>\n'.join(ret)
2539:
1.66 dwinter 2540:
2541:
1.81 casties 2542: def tagWordInFiles(self,fileIds,word,indexName='graphemes',regExp=False):
2543: """
2544: get texts with highlighted word from all ids in list FileIds.
2545: returns dict with id:text pairs.
2546: """
2547: logging.debug("tagwordinfiles word='%s' index=%s file=%s"%(word,indexName,fileIds))
2548: return dict([(id,self.tagWordInFile(id, word, indexName, regExp)) for id in fileIds])
2549:
1.56 dwinter 2550:
1.82 casties 2551: def getFileVersionList(self, pnum):
2552: """get the version history as a list for the translit file with the given pnum"""
2553: f = getattr(self, self.file_catalog).search({'textid':pnum})
2554: if not f:
2555: return []
2556:
2557: return f[0].getObject().getVersionList()
2558:
2559:
1.37 dwinter 2560: def URLquote(self,str):
2561: """quote url"""
2562: return urllib.quote(str)
2563:
2564: def URLunquote(self,str):
2565: """unquote url"""
2566: return urllib.unquote(str)
2567:
1.58 dwinter 2568: def URLquote_plus(self,str):
2569: """quote url"""
2570: return urllib.quote_plus(str)
2571:
2572: def URLunquote_plus(self,str):
2573: """unquote url"""
2574: return urllib.unquote_plus(str)
2575:
1.37 dwinter 2576:
1.26 dwinter 2577: def forceunlock(self):
2578: "break all locks"
2579: ret=[]
2580: for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):
2581: un=f[1].forceunlock()
1.39 dwinter 2582:
1.26 dwinter 2583: if un and un !="":
2584: ret.append((f[0],un))
1.46 dwinter 2585:
1.61 dwinter 2586: return ret
1.71 dwinter 2587:
1.61 dwinter 2588:
1.26 dwinter 2589: def getChangesByAuthor(self,author,n=100):
1.25 dwinter 2590: """getChangesByAuthor"""
1.26 dwinter 2591: zcat=self.CDLIObjectsCatalog
2592: res=zcat({'lastEditor':author,
1.25 dwinter 2593: 'sort_on':'getTime',
2594: 'sort_order':'descending',
2595: 'sort_limit':n})[:n ]
1.26 dwinter 2596:
2597: return res
2598:
2599: def getChangesByAuthor_html(self,author,n=100):
2600: """html output for changes by author"""
2601: tmp={}
2602: list=[]
2603: for x in self.getChangesByAuthor(author):
2604: nr=x.getObject().getVersionNumber()
2605: id=x.getObject().aq_parent.getId()
2606: #hinzufuegen, wenn Version neuer als die
2607: if tmp.get(id,(0,0))[1] < nr:
2608: tmp[id]=(x.getObject().aq_parent,nr)
2609:
2610:
1.45 dwinter 2611: return self.cdli_main.findObjectsFromListWithVersion(list=tmp.values(),author=author)
1.26 dwinter 2612:
1.25 dwinter 2613: def getLastChanges(self,n=100):
2614: """get the last n changes"""
2615: n=int(n)
2616: zcat=self.CDLICatalog
2617: return zcat({'sort_on':'getLastChangeDate',
2618: 'sort_order':'descending',
2619: 'sort_limit':n})[:n ]
2620:
2621:
2622: def getLastChanges_html(self,n=100):
2623: """get the last n changes"""
2624: list = [x.getId for x in self.getLastChanges(n)]
2625: return self.cdli_main.findObjectsFromList(list=list,display=True)
2626:
1.24 dwinter 2627: def refreshTxt(self,txt="",threadName=None):
1.22 dwinter 2628: """txt fuer refresh"""
2629:
1.24 dwinter 2630: return """ 2;url=%s?repeat=%s """%(self.absolute_url()+txt,threadName)
1.22 dwinter 2631:
1.87 dwinter 2632: def refreshTxtBasket(self,txt="",threadName=None):
2633: """txt fuer refresh"""
2634:
2635: return """ 2;url=%s?repeat=%s """%(txt,threadName)
2636:
1.22 dwinter 2637:
1.24 dwinter 2638: def getResult(self,threadName=None):
1.22 dwinter 2639: """result of thread"""
2640: try:
1.24 dwinter 2641: return self._v_uploadATF[threadName].getResult()
1.22 dwinter 2642: except:
2643: return "One moment, please"
2644:
1.24 dwinter 2645:
2646: def checkThreads(self):
2647: """check threads"""
1.42 dwinter 2648: ret="<html><body>"
2649: for thread in threading.enumerate():
1.45 dwinter 2650: ret+="<p>%s (%s): %s</p>"%(repr(thread),thread.getName(),thread.isAlive())
1.42 dwinter 2651:
2652: return ret
2653:
2654:
1.73 dwinter 2655: def uploadATFRPC(self,data,username):
2656: """upload an atffile via xml-rpc"""
2657: uploader=uploadATFThread()
2658:
2659: #generate an random id for the upload object
2660: from random import randint
2661: if (not self.REQUEST.SESSION.get('idTmp',None)):
2662:
2663: idTmp=str(randint(0,1000000000))
2664: self.REQUEST.SESSION['idTmp']=idTmp
2665: else:
2666: idTmp=self.REQUEST.SESSION.get('idTmp',None)
2667:
2668:
2669: uploader.set(data,0,username,idTmp)
2670:
2671: stObj=uploader.run()
2672:
2673: processor=uploadATFfinallyThread()
2674:
2675: basketname=stObj.returnValue['basketNameFromFile']
2676:
2677: processor.set("uploadchanged",basketname=basketname,SESSION=stObj.returnValue,username=username,serverport=self.REQUEST['SERVER_PORT'])
2678:
2679: processor.run()
2680:
2681:
2682: return generateXMLReturn(stObj.returnValue)
2683:
1.22 dwinter 2684: def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
1.69 dwinter 2685: """upload an atf file / basket file"""
1.22 dwinter 2686: #self._v_uploadATF.returnValue=None
1.71 dwinter 2687:
2688: #generate an random id for the upload thread
1.60 dwinter 2689: from random import randint
1.61 dwinter 2690: if (not self.REQUEST.SESSION.get('idTmp',None)):
1.22 dwinter 2691:
1.60 dwinter 2692: idTmp=str(randint(0,1000000000))
2693: self.REQUEST.SESSION['idTmp']=idTmp
2694: else:
2695: idTmp=self.REQUEST.SESSION.get('idTmp',None)
2696:
1.71 dwinter 2697:
1.22 dwinter 2698: threadName=repeat
2699: if not threadName or threadName=="":
1.71 dwinter 2700: #new thread not called from the waiting page
1.22 dwinter 2701: tmpVar=False
1.24 dwinter 2702:
1.22 dwinter 2703: thread=uploadATFThread()
1.24 dwinter 2704: threadName=thread.getName()[0:]
1.36 dwinter 2705: if (not hasattr(self,'_v_uploadATF')):
1.24 dwinter 2706: self._v_uploadATF={}
2707:
2708: self._v_uploadATF[threadName]=thread
1.22 dwinter 2709: #self._xmltrans.start()
2710: #thread=Thread(target=self._v_uploadATF)
1.60 dwinter 2711: logging.info("set thread. extern")
2712: self._v_uploadATF[threadName].set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],idTmp,serverport=self.REQUEST['SERVER_PORT'])
1.22 dwinter 2713: #thread.start()
1.60 dwinter 2714: logging.info("start thread. extern")
1.24 dwinter 2715: self._v_uploadATF[threadName].start()
1.22 dwinter 2716:
2717:
1.24 dwinter 2718: self.threadName=self._v_uploadATF[threadName].getName()[0:]
1.22 dwinter 2719: wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
2720:
2721: if wait_template:
2722: return wait_template[0][1]()
2723: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
1.24 dwinter 2724: return pt(txt='/uploadATF',threadName=threadName)
1.22 dwinter 2725: #_v_xmltrans.run()
2726:
2727: else:
2728: #recover thread, if lost
1.36 dwinter 2729: if (not hasattr(self,'_v_uploadATF')):
1.24 dwinter 2730: self._v_uploadATF={}
2731: if not self._v_uploadATF.get(threadName,None):
1.22 dwinter 2732: for thread in threading.enumerate():
2733: if threadName == thread.getName():
1.24 dwinter 2734: self._v_uploadATF[threadName]=thread
2735:
1.60 dwinter 2736: if self._v_uploadATF.get(threadName,None) and (not self._v_uploadATF[threadName].returnValue):
1.22 dwinter 2737:
2738:
2739: wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
2740: if wait_template:
2741: return wait_template[0][1]()
2742:
2743: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
2744:
1.24 dwinter 2745: return pt(txt='/uploadATF',threadName=threadName)
1.22 dwinter 2746:
2747: else:
1.60 dwinter 2748: tmp=getattr(self.temp_folder,idTmp).returnValue
1.71 dwinter 2749:
1.22 dwinter 2750: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
1.39 dwinter 2751:
1.47 dwinter 2752: return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],
1.22 dwinter 2753: basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])
1.30 dwinter 2754:
2755: def redoUpload(self,threadName):
2756: """redo the upload"""
2757: tmp=self.cdli_main.tmpStore2[threadName]
2758: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
1.45 dwinter 2759: return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],
1.30 dwinter 2760: basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])
2761:
1.22 dwinter 2762: def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None):
2763: """nowupload the files"""
2764:
2765:
2766:
2767: threadName=repeat
2768: if not threadName or threadName=="":
1.24 dwinter 2769: thread=uploadATFfinallyThread()
2770: threadName=thread.getName()[0:]
1.36 dwinter 2771:
1.35 dwinter 2772: if (not hasattr(self,'_v_uploadATF')):
1.46 dwinter 2773: self._v_uploadATF={}
1.36 dwinter 2774:
1.43 dwinter 2775:
1.24 dwinter 2776: self._v_uploadATF[threadName]=thread
1.22 dwinter 2777:
1.60 dwinter 2778: idTmp=self.REQUEST.SESSION['idTmp']
2779: stObj=getattr(self.temp_folder,idTmp)
2780: self._v_uploadATF[threadName].set(procedure,comment=comment,basketname=basketname,unlock=unlock,SESSION=stObj.returnValue,username=self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
1.22 dwinter 2781:
1.24 dwinter 2782: self._v_uploadATF[threadName].start()
1.22 dwinter 2783:
2784:
1.24 dwinter 2785:
1.22 dwinter 2786: wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
2787:
2788: if wait_template:
2789: return wait_template[0][1]()
2790: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
2791:
1.24 dwinter 2792: return pt(txt='/uploadATFfinally',threadName=threadName)
1.22 dwinter 2793: #_v_xmltrans.run()
2794:
2795: else:
2796: #recover thread, if lost
2797: if not hasattr(self,'_v_uploadATF'):
1.24 dwinter 2798: self._v_uploadATF={}
2799: if not self._v_uploadATF.get(threadName,None):
1.22 dwinter 2800: for thread in threading.enumerate():
2801: if threadName == thread.getName():
1.24 dwinter 2802: self._v_uploadATF[threadName]=thread
1.22 dwinter 2803:
1.24 dwinter 2804: if self._v_uploadATF.get(threadName,None) and (self._v_uploadATF[threadName] is not None) and (not self._v_uploadATF[threadName].end) :
1.22 dwinter 2805:
2806: wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
2807: if wait_template:
2808: return wait_template[0][1]()
2809:
2810: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
1.24 dwinter 2811: return pt(txt='/uploadATFfinally',threadName=threadName)
1.22 dwinter 2812: else:
1.85 dwinter 2813:
2814:
2815: idTmp=self.REQUEST.SESSION['idTmp']
2816: stObj=getattr(self.temp_folder,idTmp)
1.60 dwinter 2817: self.REQUEST.SESSION['idTmp']=None
1.85 dwinter 2818:
2819: #update changed
2820: logging.debug("dir:"+repr(stObj.returnValue['changed']))
2821: for x in stObj.returnValue['changed']:
2822: ob=self.CDLICatalog.search({'title':x[0]})
2823:
2824: self.cdliRoot.updateOrAddToFileBTree(ob[0].getObject())
1.22 dwinter 2825: if RESPONSE is not None:
2826: RESPONSE.redirect(self.absolute_url())
2827:
1.49 dwinter 2828: def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/atf", files=None,ext=None):
1.1 dwinter 2829: """import files"""
1.81 casties 2830: logging.debug("importFiles folderName=%s files=%s ext=%s"%(folderName,files,ext))
1.22 dwinter 2831: root=self.cdli_main
1.49 dwinter 2832: count=0
1.3 dwinter 2833: if not files:
2834: files=os.listdir(folderName)
2835:
1.1 dwinter 2836: for f in files:
2837: folder=f[0:3]
2838: f2=f[0:5]
1.85 dwinter 2839:
2840: #check if main folder PXX already exists
1.22 dwinter 2841: obj=self.ZopeFind(root,obj_ids=[folder])
1.81 casties 2842: logging.debug("importFiles: folder=%s f2=%s obj=%s"%(folder,f2,obj))
1.19 dwinter 2843: if ext:
1.65 dwinter 2844: ext.result="<p>adding: %s </p>"%f+ext.result
1.81 casties 2845:
1.85 dwinter 2846:
2847: if not obj: # if not create it
1.22 dwinter 2848: manage_addCDLIFileFolder(root,folder,folder)
2849: fobj=getattr(root,folder)
1.58 dwinter 2850: #transaction.get().commit()
1.81 casties 2851:
1.1 dwinter 2852: else:
2853: fobj=obj[0][1]
2854:
1.85 dwinter 2855: #check IF PYYYYY already exist
1.1 dwinter 2856: obj2=fobj.ZopeFind(fobj,obj_ids=[f2])
1.81 casties 2857: logging.debug("importFiles: fobj=%s obj2=%s"%(fobj,obj2))
1.1 dwinter 2858:
1.85 dwinter 2859: if not obj2:# if not create it
1.1 dwinter 2860: manage_addCDLIFileFolder(fobj,f2,f2)
2861: fobj2=getattr(fobj,f2)
2862:
2863: else:
2864: fobj2=obj2[0][1]
2865:
1.85 dwinter 2866: # not add the file
1.48 dwinter 2867: file2=os.path.join(folderName,f)
1.1 dwinter 2868: id=f
1.81 casties 2869: logging.debug("importFiles: addCDLIFile fobj2=%s, f=%s file2=%s"%(fobj2,repr(f),repr(file2)))
2870: fobj2.addFile(vC='',file=file(file2),author=author,newName=f)
1.66 dwinter 2871: count+=1
1.85 dwinter 2872:
2873: #now add the file to the storage
2874: ob = getattr(fobj2,f)
2875: self.cdliRoot.updateOrAddToFileBTree(ob)
2876:
1.81 casties 2877: if count%100==0:
2878: logging.debug("importfiles: committing")
1.66 dwinter 2879: transaction.get().commit()
1.81 casties 2880:
2881: transaction.get().commit()
1.3 dwinter 2882: return "ok"
1.22 dwinter 2883:
2884:
2885: manage_addCDLIRootForm=DTMLFile('dtml/rootAdd', globals())
1.1 dwinter 2886:
2887:
1.22 dwinter 2888: def manage_addCDLIRoot(self, id, title='',
1.1 dwinter 2889: createPublic=0,
2890: createUserF=0,
2891: REQUEST=None):
2892: """Add a new Folder object with id *id*.
2893:
2894: If the 'createPublic' and 'createUserF' parameters are set to any true
2895: value, an 'index_html' and a 'UserFolder' objects are created respectively
2896: in the new folder.
2897: """
1.22 dwinter 2898: ob=CDLIRoot()
1.1 dwinter 2899: ob.id=str(id)
2900: ob.title=title
1.61 dwinter 2901: try:
1.66 dwinter 2902: self._setObject(id, ob)
1.61 dwinter 2903: except:
1.66 dwinter 2904: pass
1.1 dwinter 2905: ob=self._getOb(id)
2906:
2907: checkPermission=getSecurityManager().checkPermission
2908:
2909: if createUserF:
2910: if not checkPermission('Add User Folders', ob):
2911: raise Unauthorized, (
2912: 'You are not authorized to add User Folders.'
2913: )
2914: ob.manage_addUserFolder()
2915:
2916:
2917: if REQUEST is not None:
1.22 dwinter 2918: return self.manage_main(self, REQUEST, update_menu=1)
2919:
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>