cdli/cdli_files.py - diff

Return to cdli_files.py CVS log

Up to [Repository] / cdli

Diff for /cdli/cdli_files.py between versions 1.12 and 1.17

version 1.12, 2006/03/19 03:27:21	version 1.17, 2006/05/10 15:44:07
Line 208 class BasketObject_old(Folder):	Line 208 class BasketObject_old(Folder):
elif not procedure: #keine fails gesperrt dann alle donwloaden	elif not procedure: #keine fails gesperrt dann alle donwloaden
procedure="downloadAll"	procedure="downloadAll"

print procedure
for object in self.contents:	for object in self.contents:

if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']):	if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']):
Line 757 class CDLIFileObject(versionedFileObject	Line 757 class CDLIFileObject(versionedFileObject
security.declarePublic('getDesignation')	security.declarePublic('getDesignation')
def getDesignation(self):	def getDesignation(self):
"""get the designation out of the file"""	"""get the designation out of the file"""
txt=re.search("&[Pp](.)= (.)",self.data)	try:
	txt=re.search("&[Pp](.*)= (.+[^\n\r])",self.data[0:])
	except:
	txt=self.data[0:]

	return "ERROR"
try:	try:
return txt.group(2)	return txt.group(2)
except:	except:
Line 970 class CDLIFileFolder(versionedFileFolder	Line 974 class CDLIFileFolder(versionedFileFolder

return ret	return ret

	def checkCatalog(self,fn):
	"""check if fn is in the catalog"""


def uploadATF(self,upload,basketId=0,RESPONSE=None):	def uploadATF(self,upload,basketId=0,RESPONSE=None):
"""upload an atf file"""	"""upload an atf file"""
Line 983 class CDLIFileFolder(versionedFileFolder	Line 990 class CDLIFileFolder(versionedFileFolder
changed=[]	changed=[]
errors=[]	errors=[]
newPs=[]	newPs=[]
	psNotInCatalog=[]
basketNameFromFile, numberOfFiles=splitatf(upload,dir)	basketNameFromFile, numberOfFiles=splitatf(upload,dir)

if basketId == '0':	if basketId == '0':
Line 999 class CDLIFileFolder(versionedFileFolder	Line 1007 class CDLIFileFolder(versionedFileFolder


for fn in os.listdir(dir):	for fn in os.listdir(dir):

	if self.checkCatalog(fn):
	psNotInCatalog.append(fn)


founds=self.CDLICatalog.search({'title':fn})	founds=self.CDLICatalog.search({'title':fn})

if len(founds)==0:	if len(founds)==0:
Line 1029 class CDLIFileFolder(versionedFileFolder	Line 1042 class CDLIFileFolder(versionedFileFolder
"""upload the files"""	"""upload the files"""

if procedure=="uploadchanged":	if procedure=="uploadchanged":
uploadFns=self.REQUEST.SESSION['changed']+self.REQUEST.SESSION['newPs']
	uploadFns=self.REQUEST.SESSION.get('changed',[])+self.REQUEST.SESSION.get('newPs',[])

elif procedure=="uploadAll":	elif procedure=="uploadAll":
uploadFns=[]	uploadFns=[]
for x in os.listdir(self.REQUEST.SESSION['tmpdir']):	for x in os.listdir(self.REQUEST.SESSION['tmpdir']):
if not x in self.REQUEST.SESSION['errors']:	if not x in self.REQUEST.SESSION['errors']:
uploadFns.append(x)	uploadFns.append(x)
	elif procedure=="noupload":
	if RESPONSE is not None:
	RESPONSE.redirect(self.aq_parent.absolute_url())
	return ""
	else:
	return ""
else:	else:
uploadFns=[]	uploadFns=[]

Line 1086 class CDLIFileFolder(versionedFileFolder	Line 1106 class CDLIFileFolder(versionedFileFolder

def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):	def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
"""findObjectsFromList (, TAB oder LINE separated)"""	"""findObjectsFromList (, TAB oder LINE separated)"""


if upload: # list from file upload	if upload: # list from file upload
txt=upload.read()	txt=upload.read()
txt=txt.replace(",","\n")	txt=txt.replace(",","\n")
Line 1111 class CDLIFileFolder(versionedFileFolder	Line 1133 class CDLIFileFolder(versionedFileFolder
pt=getattr(self,'filelist.html')	pt=getattr(self,'filelist.html')
return pt(basketName=basketName,numberOfObjects=numberOfObjects)	return pt(basketName=basketName,numberOfObjects=numberOfObjects)

if list: # got already a list	if list is not None: # got already a list
ret=[]	ret=[]
for fileId in list:	for fileId in list:
if len(fileId.split("."))==1:	if len(fileId.split("."))==1:
Line 1126 class CDLIFileFolder(versionedFileFolder	Line 1148 class CDLIFileFolder(versionedFileFolder
if start:	if start:
RESPONSE.redirect("filelist.html?start:int="+str(start))	RESPONSE.redirect("filelist.html?start:int="+str(start))

	print "nothing"

def createAllFilesAsSingleFile(self,RESPONSE=None):	def createAllFilesAsSingleFile(self,RESPONSE=None):
"""download all files"""	"""download all files"""

Line 1149 class CDLIFileFolder(versionedFileFolder	Line 1173 class CDLIFileFolder(versionedFileFolder

#os.write(tf,obj.getLastVersion().data)	#os.write(tf,obj.getLastVersion().data)
if RESPONSE:	if RESPONSE:
RESPONSE.write(obj.getLastVersion().data)	RESPONSE.write(obj.getLastVersion().data[0:])
#os.close(tf)	#os.close(tf)
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)	#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)
return True	return True
Line 1275 def manage_addCDLIFileFolder(self, id, t	Line 1299 def manage_addCDLIFileFolder(self, id, t
if REQUEST is not None:	if REQUEST is not None:
return self.manage_main(self, REQUEST, update_menu=1)	return self.manage_main(self, REQUEST, update_menu=1)

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.12
changed lines
	Added in v.1.17