--- OSAS/OSA_system/OSAS_add.py	2003/12/05 14:57:03	1.6
+++ OSAS/OSA_system/OSAS_add.py	2004/01/21 07:43:01	1.9
@@ -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')
-		
+	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):
@@ -177,7 +181,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)
@@ -521,6 +529,14 @@ def combineTextImage2(self,path):
 		presentationnode.appendChild(presentationnodetext)
 		subnode.appendChild(presentationnode)
 	
+
+	if self.REQUEST.has_key('xslt'):
+		if not self.REQUEST['xslt']=="":
+			xsltnode=dom.createElement('xslt')
+			xsltnodetext=dom.createTextNode(self.REQUEST['xslt'])
+			xsltnode.appendChild(xsltnodetext)
+			subnode.appendChild(xsltnode)
+
 	node.appendChild(subnode)
 	
 	try:
@@ -565,7 +581,7 @@ def combineTextImage2(self,path):
 
 	urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
 	#return urllib.quote("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)
-	os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 &"% re.sub('mpiwg/online/','',self.REQUEST['path']+"/"+self.REQUEST['image']))
+	os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 >> /tmp/sc.out &"% re.sub('/mpiwg/online/','',self.REQUEST['path']+"/"+self.REQUEST['image']))
 	
 	#return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+self.REQUEST['path'])