version 1.48, 2006/10/05 07:22:58
|
version 1.49, 2006/10/16 13:19:34
|
Line 6 import os.path
|
Line 6 import os.path
|
import os |
import os |
from types import * |
from types import * |
import urlparse |
import urlparse |
|
import urllib |
|
import cgi |
from OFS.OrderedFolder import OrderedFolder |
from OFS.OrderedFolder import OrderedFolder |
from OFS.SimpleItem import SimpleItem |
from OFS.SimpleItem import SimpleItem |
import time |
import time |
Line 98 class uploadATFfinallyThread(Thread):
|
Line 100 class uploadATFfinallyThread(Thread):
|
conn.close() |
conn.close() |
#set flag for end of this method |
#set flag for end of this method |
self.end=True |
self.end=True |
|
print "ended" |
return True |
return True |
|
|
def __del__(self): |
def __del__(self): |
Line 141 class uploadATFfinallyThread(Thread):
|
Line 144 class uploadATFfinallyThread(Thread):
|
if len(founds)>0: |
if len(founds)>0: |
SESSION['author']=str(username) |
SESSION['author']=str(username) |
self.result+="<p>Changing : %s"%fn |
self.result+="<p>Changing : %s"%fn |
founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn,from_tmp=True)) |
founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn),from_tmp=True) |
|
|
|
|
#now add the new files |
#now add the new files |
Line 688 class CDLIBasketContainer(OrderedFolder)
|
Line 691 class CDLIBasketContainer(OrderedFolder)
|
self.id=id |
self.id=id |
self.title=title |
self.title=title |
|
|
|
def getBasketsId(self): |
|
"""get all baskets als klartext""" |
|
ret="" |
|
baskets=self.ZopeFind(self,obj_metatypes=['CDLIBasket']) |
|
for basket in baskets: |
|
com,user,time,values = basket[1].getContentIds() |
|
ret+= "BASKET:"+com+"\t"+user+"\t"+time+"\n" |
|
for x in values: |
|
ret+= x[0]+"\t"+x[1]+"\n" |
|
return ret |
|
|
def getBaskets(self,sortField='title'): |
def getBaskets(self,sortField='title'): |
"""get all baskets files""" |
"""get all baskets files""" |
Line 762 class CDLIBasketContainer(OrderedFolder)
|
Line 775 class CDLIBasketContainer(OrderedFolder)
|
def setActiveBasket(self,basketId,REQUEST=None): |
def setActiveBasket(self,basketId,REQUEST=None): |
"""store active basketId in a cookie""" |
"""store active basketId in a cookie""" |
self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/") |
self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/") |
|
try: |
|
qs=cgi.parse_qs(REQUEST['QUERY_STRING']) |
|
del(qs['basketId']) |
|
except: |
|
qs={} |
if REQUEST: |
if REQUEST: |
REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+REQUEST['QUERY_STRING']) |
REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+urllib.urlencode(qs)) |
|
|
def getActiveBasket(self): |
def getActiveBasket(self): |
"""get active basket from cookie""" |
"""get active basket from cookie""" |
Line 968 class CDLIBasket(Folder,CatalogAware):
|
Line 985 class CDLIBasket(Folder,CatalogAware):
|
newContent=[] |
newContent=[] |
added=0 |
added=0 |
for id in ids: |
for id in ids: |
|
try: |
founds=self.CDLICatalog.search({'title':id}) |
founds=self.CDLICatalog.search({'title':id}) |
|
except: |
|
founds=[] |
for found in founds: |
for found in founds: |
if found.getObject() not in oldContent: |
if found.getObject() not in oldContent: |
#TODO: was passiert wenn, man eine Object dazufgt, das schon da ist aber eine neuere version |
#TODO: was passiert wenn, man eine Object dazufgt, das schon da ist aber eine neuere version |
Line 986 class CDLIBasket(Folder,CatalogAware):
|
Line 1005 class CDLIBasket(Folder,CatalogAware):
|
|
|
return added |
return added |
|
|
|
def getContentIds(self): |
|
"""print basket content""" |
|
ret=[] |
|
lv=self.getLastVersion() |
|
for obj in lv.content.getContent(): |
|
ret.append((obj[0].getId(),obj[1].getId())) |
|
|
|
|
|
return lv.getComment(),lv.getUser(),lv.getTime(),ret |
|
|
def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None): |
def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None): |
"""change a basket""" |
"""change a basket""" |
if submit=="update": |
if submit=="update": |
Line 1131 class CDLIBasketVersion(Implicit,Persist
|
Line 1160 class CDLIBasketVersion(Implicit,Persist
|
|
|
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
if current=="no": #version as they are in the basket |
if current=="no": #version as they are in the basket |
ret+=str(object[0].data)+"\n" |
ret+=str(object[0].getData())+"\n" |
elif current=="yes": |
elif current=="yes": |
#search current object |
#search current object |
founds=self.CDLICatalog.search({'title':object[0].getId()}) |
founds=self.CDLICatalog.search({'title':object[0].getId()}) |
if len(founds)>0: |
if len(founds)>0: |
ret+=str(founds[0].getObject().getLastVersion().data)+"\n" |
ret+=str(founds[0].getObject().getLastVersion().getData())+"\n" |
|
|
if lock and object[1].lockedBy=='': |
if lock and object[1].lockedBy=='': |
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] |
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] |
Line 1283 class CDLIFileObject(CatalogAware,extVer
|
Line 1312 class CDLIFileObject(CatalogAware,extVer
|
def getPNumber(self): |
def getPNumber(self): |
"""get the pnumber""" |
"""get the pnumber""" |
try: |
try: |
txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.data[0:]) |
txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.getData()[0:]) |
except: |
except: |
txt=self.data[0:] |
txt=self.getData()[0:] |
|
|
return "ERROR" |
return "ERROR" |
try: |
try: |
Line 1343 def manage_addCDLIFileObject(self,id,vC=
|
Line 1372 def manage_addCDLIFileObject(self,id,vC=
|
self._getOb(id).content_type=content_type |
self._getOb(id).content_type=content_type |
|
|
self.reindex_object() |
self.reindex_object() |
|
self._getOb(id).reindex_object() |
|
|
if REQUEST is not None: |
if REQUEST is not None: |
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') |
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') |
|
|
Line 1524 def splitatf(fh,dir=None,ext=None):
|
Line 1555 def splitatf(fh,dir=None,ext=None):
|
ret=None |
ret=None |
nf=None |
nf=None |
i=0 |
i=0 |
for line in fh.readlines(): |
|
|
for lineTmp in fh.readlines(): |
|
for line in lineTmp.split("\r"): |
if ext: |
if ext: |
i+=1 |
i+=1 |
if (i%100)==0: |
if (i%100)==0: |
Line 1698 class CDLIFileFolder(extVersionedFileFol
|
Line 1731 class CDLIFileFolder(extVersionedFileFol
|
|
|
catalog=getattr(self,self.default_catalog) |
catalog=getattr(self,self.default_catalog) |
#tf,tfilename=mkstemp() |
#tf,tfilename=mkstemp() |
|
if not hasattr(self.temp_folder,'downloadCounter'): |
|
self.temp_folder.downloadCounter=0 |
|
|
if self.temp_folder.downloadCounter > 5: |
if getattr(self.temp_folder,'downloadCounter',0) > 5: |
return """I am sorry, currently the server has to many requests for downloads, please come back later!""" |
return """I am sorry, currently the server has to many requests for downloads, please come back later!""" |
|
|
self.temp_folder.downloadCounter+=1 |
self.temp_folder.downloadCounter+=1 |
Line 1721 class CDLIFileFolder(extVersionedFileFol
|
Line 1756 class CDLIFileFolder(extVersionedFileFol
|
|
|
#os.write(tf,obj.getLastVersion().data) |
#os.write(tf,obj.getLastVersion().data) |
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(obj.getLastVersion().data[0:]) |
RESPONSE.write(obj.getLastVersion().getData()[0:]) |
self.temp_folder.downloadCounter-=1 |
self.temp_folder.downloadCounter-=1 |
self._p_changed=1 |
self._p_changed=1 |
get_transaction().commit() |
get_transaction().commit() |
Line 1952 class CDLIRoot(Folder):
|
Line 1987 class CDLIRoot(Folder):
|
#tmp=self.cdli_main.tmpStore2[threadName] |
#tmp=self.cdli_main.tmpStore2[threadName] |
tmp=self._v_uploadATF[threadName].returnValue |
tmp=self._v_uploadATF[threadName].returnValue |
|
|
#self._v_uploadATF[threadName].continueVar=False |
self._v_uploadATF[threadName].continueVar=False |
|
|
self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']] |
self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']] |
self.REQUEST.SESSION['lockerrors']=[x[0].getId() for x in tmp['lockerrors']] |
self.REQUEST.SESSION['lockerrors']=[x[0].getId() for x in tmp['lockerrors']] |
Line 2028 class CDLIRoot(Folder):
|
Line 2063 class CDLIRoot(Folder):
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect(self.absolute_url()) |
RESPONSE.redirect(self.absolute_url()) |
|
|
def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/Documents/workspace/cdli/atf", files=None,ext=None): |
def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/atf", files=None,ext=None): |
"""import files""" |
"""import files""" |
root=self.cdli_main |
root=self.cdli_main |
|
count=0 |
if not files: |
if not files: |
files=os.listdir(folderName) |
files=os.listdir(folderName) |
|
|
Line 2069 class CDLIRoot(Folder):
|
Line 2104 class CDLIRoot(Folder):
|
self.CDLICatalog.catalog_object(ob) |
self.CDLICatalog.catalog_object(ob) |
#self.CDLICatalog.manage_catalogFoundItems(obj_ids=[id],search_sub=1) |
#self.CDLICatalog.manage_catalogFoundItems(obj_ids=[id],search_sub=1) |
#self.CDLICatalog.manage_catalogObject(self.REQUEST, self.REQUEST.RESPONSE, 'CDLICatalog', urlparse.urlparse(ob.absolute_url())[1]) |
#self.CDLICatalog.manage_catalogObject(self.REQUEST, self.REQUEST.RESPONSE, 'CDLICatalog', urlparse.urlparse(ob.absolute_url())[1]) |
|
count+=1 |
|
|
|
if count > 1000: |
|
print "committing" |
|
get_transaction().commit() |
|
count=0 |
|
get_transaction().commit() |
return "ok" |
return "ok" |
|
|
|
|