--- OSAS/OSA_system/OSAS_add.py	2003/10/11 10:54:13	1.4
+++ OSAS/OSA_system/OSAS_add.py	2003/12/11 14:06:16	1.8
@@ -223,7 +223,7 @@ def addPresentation2(self):
 		os.mkdir(path+"/"+folder_name)
 	except:
 		"""nothing"""
-	print "NAME:",file_name
+	#print "NAME:",file_name
 	f=open(path+"/"+folder_name+"/"+file_name,"w")
 	f.write(xmlinfo)
 	f.close()
@@ -336,13 +336,13 @@ def addTextExternal(self,path,texturl,ve
 	writefile.close()
 	
 	#registrieren
-	print urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+	return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+	
 	
-	return "DONE:"+textpath+"/"+name
 
 def TextExternalError(text):
 	firsts=text[0:10]
-	print firsts
+	#print firsts
 	try:
 		match=re.search(r".*<?xml.*",firsts)
 	except:
@@ -408,6 +408,26 @@ def addDirsToIndexMeta(path,folder_name,
 	writefile.write(dom.toxml().encode('utf-8'))
 	writefile.close()
 
+def readArchimedesXML(folder):
+	"""gib URL aus """
+	XML=urllib.urlopen("http://archimedes.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.cgi?step=xmlcorpusmanifest").read()
+	#print XML
+	dom=xml.dom.minidom.parseString(XML)
+	items=dom.getElementsByTagName('item')
+	dict={}
+	
+	for item in items:
+		#print item.attributes['dir'].value
+		try:		
+			dict[item.attributes['dir'].value]=item.attributes['xml'].value
+			#print item.attributes['dir'].value,item.attributes['text'].value
+		except:
+			"""nothing"""
+		
+	if dict.has_key(folder):
+		return dict[folder]
+	else:
+		return ""
 def combineTextImage(self,path):
 	"""gibt input formular zur erstellung des texttools meta tag aus"""
 	files = os.listdir(path)
@@ -415,13 +435,17 @@ def combineTextImage(self,path):
 	texts=[]
 	imagefolders=[]
 	presentationfolders=[]
+
+	splitted=path.split("/")
+	externxml=readArchimedesXML(splitted[len(splitted)-1])
 	
 	for filename in files:
-		
+		#print "FN",filename
 		if archive.isdigilib2(path+"/"+filename):
 			imagefolders.append(filename)
 			
 		if archive.isFullText(path,filename):
+			#print "HI"
 			texts.append(filename)
 		if archive.isPresentation(path,filename):
 			presentationfolders.append(filename)
@@ -437,6 +461,8 @@ def combineTextImage(self,path):
 	self.REQUEST.SESSION['imagefolders']=imagefolders
 	self.REQUEST.SESSION['presentationfolders']=presentationfolders
 	self.REQUEST.SESSION['filelanguage']=filelanguage
+	self.REQUEST.SESSION['externxml']=externxml
+
 	newtemplate=PageTemplateFile('Products/OSA_system/ImageandText').__of__(self)
 	return newtemplate()
 	
@@ -473,10 +499,16 @@ def combineTextImage2(self,path):
 	if self.REQUEST.has_key('text'):		    
 		textfile=os.listdir(path+"/"+self.REQUEST['text'])[0]
 		textfoldernode=dom.createElement('text')
-		textfoldernodetext=dom.createTextNode(self.REQUEST['text']+"/"+textfile)
+		textfoldernodetext=dom.createTextNode(path+"/"+self.REQUEST['text']+"/"+textfile)
 		textfoldernode.appendChild(textfoldernodetext)
 		subnode.appendChild(textfoldernode)
 
+	if self.REQUEST.has_key('external'):#USE CVS instead of local text
+		textfoldernode=dom.createElement('text')
+		textfoldernodetext=dom.createTextNode(self.REQUEST.SESSION['externxml'])
+		textfoldernode.appendChild(textfoldernodetext)
+		subnode.appendChild(textfoldernode)
+		
 	if self.REQUEST.has_key('pagebreak'):	
 		pagebreaknode=dom.createElement('pagebreak')
 		pagebreaknodetext=dom.createTextNode(self.REQUEST['pagebreak'])
@@ -489,10 +521,50 @@ def combineTextImage2(self,path):
 		presentationnode.appendChild(presentationnodetext)
 		subnode.appendChild(presentationnode)
 	
-	node.appendChild(subnode)
 
-	# node=dom.getElementsByTagName('lang')[0] #getNode
+	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:
+		node2=node.getElementsByTagName('bib')[0]
+		subs=node2.getElementsByTagName('lang')
+		for sub in subs:
+			print "X",sub
+			node2.removeChild(sub)
+	except:
+		"""nothing"""
+	try:
+		main=dom.getElementsByTagName('bib')[0]
+		node=dom.createElement('lang')
+		textnode=dom.createTextNode(self.REQUEST['lang'])
+		print "LANG:",lang
+		node.appendChild(textnode)
+		main.appendChild(node)
+	except:
+		try:
+			subs=dom.getElementsByTagName('lang')
+			main=dom.getElementsByTagName('resource')[0]
+			for sub in subs:
+				main.removeChild(sub)
+		except:
+			"""nothing"""
+		
+		try:
+			main=dom.getElementsByTagName('resource')[0]
+			node=dom.createElement('lang')
+			textnode=dom.createTextNode(self.REQUEST['lang'])
+			#print "LANG:",self.REQUEST['lang']
+			node.appendChild(textnode)
+			main.appendChild(node)
+		except:
+			"""nothing"""
+			
 	writefile=file(path+"/index.meta","w")
 	writefile.write(dom.toxml().encode('utf-8'))
 	writefile.close()
@@ -501,7 +573,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'])