--- OSAS/OSA_system/OSAS_add.py	2003/12/11 14:06:16	1.8
+++ OSAS/OSA_system/OSAS_add.py	2004/01/29 10:19:38	1.10
@@ -33,14 +33,18 @@ def add(self, no_upload=0):
 
 
 def getISO():
-        f=file('/usr/local/mpiwg/Zope/lib/python/Products/OSA_system/iso639-1.inc','r').readlines()
-	ret={}
-	for lineraw in f:
-		line=lineraw.encode('ascii','replace')
-		value=string.split(line,'\t')[0].encode('ascii','replace')
-		key=string.split(line,'\t')[1].encode('ascii','replace')
-		
-		ret[key]=value
+	"""ISO"""
+	try:
+		f=file('/usr/local/mpiwg/Zope/lib/python/Products/OSA_system/iso639-1.inc','r').readlines()
+		#f=file('OSA_system/iso639-1.inc','r').readlines()
+		ret={}
+		for lineraw in f:
+			line=lineraw.encode('ascii','replace')
+			value=string.split(line,'\t')[0].encode('ascii','replace')
+			key=string.split(line,'\t')[1].encode('ascii','replace')
+			ret[key]=value
+	except:
+		ret={}
         return ret
 
 def add2(self):
@@ -52,6 +56,9 @@ def add2(self):
 
 	self.fields=self.bibdata[self.reftype]
 	self.isolist=getISO()
+	tmp=getISO().keys()
+	tmp.sort()
+	self.isokeys=tmp
         #listed=[ x for x in self.isolist.keys()]
 	#print listed
         #sorted=listed.sort()
@@ -144,7 +151,8 @@ def add6(self):
 	f=open(metapath,'w')
 	f.writelines(renderxml)
 	f.close()
-	os.chmod(metapath,0644)
+	os.chmod(metapath,0664)
+	os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) 
 	if self.REQUEST.SESSION.has_key('no_upload'):
 		
 		#newtemplate2=PageTemplateFile('/usr/local/mpiwg/Zope/Extensions/done',"text/html").__of__(self)
@@ -177,7 +185,11 @@ def addPresentation(self,path):
 	try:
 		author=archive.getText(dom.getElementsByTagName('author')[0].childNodes)
 	except:
-		author=archive.getText(dom.getElementsByTagName('Author')[0].childNodes)
+		try:
+			author=archive.getText(dom.getElementsByTagName('Author')[0].childNodes)
+		except:
+			author=archive.getText(dom.getElementsByTagName('Editor')[0].childNodes)
+			
 	title=archive.getText(dom.getElementsByTagName('title')[0].childNodes)
 	try:
 		date=archive.getText(dom.getElementsByTagName('year')[0].childNodes)
@@ -456,6 +468,9 @@ def combineTextImage(self,path):
 	except:
 		filelanguage=""
 	self.REQUEST.SESSION['isolist']=getISO()
+	tmp=getISO().keys()
+	tmp.sort()
+	self.REQUEST.SESSION['isolistsort']=tmp
 	self.REQUEST.SESSION['path']=path
 	self.REQUEST.SESSION['texts']=texts
 	self.REQUEST.SESSION['imagefolders']=imagefolders