--- OSAS/OSA_system/OSAS_add.py	2004/01/21 07:43:01	1.9
+++ OSAS/OSA_system/OSAS_add.py	2004/03/01 17:44:29	1.11
@@ -33,6 +33,7 @@ def add(self, no_upload=0):
 
 
 def getISO():
+	"""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()
@@ -41,8 +42,7 @@ def getISO():
 			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
+			ret[key]=value
 	except:
 		ret={}
         return ret
@@ -56,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()
@@ -148,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)
@@ -464,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
@@ -537,6 +544,23 @@ def combineTextImage2(self,path):
 			xsltnode.appendChild(xsltnodetext)
 			subnode.appendChild(xsltnode)
 
+	"""
+	if self.REQUEST.has_key('thumbtemplate'):
+		if not self.REQUEST['thumbtemplate']=="":
+			xsltnode=dom.createElement('thumbtemplate')
+			xsltnodetext=dom.createTextNode(self.REQUEST['thumbtemplate'])
+			xsltnode.appendChild(xsltnodetext)
+			subnode.appendChild(xsltnode)
+
+	if self.REQUEST.has_key('topbar'):
+		if not self.REQUEST['topbar']=="":
+			xsltnode=dom.createElement('topbar')
+			xsltnodetext=dom.createTextNode(self.REQUEST['topbar'])
+			xsltnode.appendChild(xsltnodetext)
+			subnode.appendChild(xsltnode)
+
+	"""
+			
 	node.appendChild(subnode)
 	
 	try: