--- OSAS/OSA_system/OSAS_add.py	2004/04/14 21:26:23	1.21
+++ OSAS/OSA_system/OSAS_add.py	2004/04/16 09:11:34	1.28
@@ -67,9 +67,10 @@ def add2(self):
 	self.bibdata={}
 	for referenceType in self.referencetypes:
 		#print referenceType
-		self.bibdata[referenceType[1].title]=referenceType[1].fields
-		self.bibdata['data']=referenceType[1]
-	self.fields=self.bibdata[self.reftype]
+		if referenceType[1].title == self.reftype: 
+			self.bibdata[referenceType[1].title]=referenceType[1].fields
+			self.bibdata['data']=referenceType[1]
+			self.fields=self.bibdata[self.reftype]
 	
 	self.isolist=getISO()
 	tmp=getISO().keys()
@@ -168,7 +169,8 @@ def add6(self):
 	self.metadata=self.REQUEST.SESSION['metadata']
 	self.metadataprint=""
 	for tag in self.metadata.keys():
-		self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"
+		if tag!="":
+			self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"
 
 	newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
 	newtemplate.content_type="text/plain"
@@ -290,15 +292,16 @@ def addPresentation2(self):
 def addText(self,path,folder=None):
 	"""add fulltext to the path"""
 	self.REQUEST.SESSION['existing_names']=['pageimg'] # to be done generate list of existing text files
-	self.REQUEST.SESSION['path']=path
+	self.REQUEST.SESSION['pathnew']=path
 	newtemplate=PageTemplateFile('Products/OSA_system/zpt/addText').__of__(self)
 	return newtemplate()
 
 def addText2(self):
+	"""addtext"""
 	folder_name=self.REQUEST['folder_name']
 	#print self.REQUEST['folder_name']
 	content_description=self.REQUEST['content_description']
-	path=self.REQUEST.SESSION['path']
+	path=self.REQUEST.SESSION['pathnew']
 	file_name=self.REQUEST['fileupload'].filename
 	filedata=self.REQUEST.form['fileupload'].read()
 	os.mkdir(path+"/"+folder_name)
@@ -617,8 +620,49 @@ 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 >> /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'])
+
+	if self.REQUEST.has_key('image'): # falls bilder
+		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']))
+
+	else: # falls keine Bilder (bug in reg.cgi info file ersetzen)
+		f=file("/tmp/tmp_info.xml","w")
+		f.write(patchedInfoXML(self.REQUEST['path']))
+		f.close()
+		splitted=path.split("/")
+		fn=splitted[len(splitted)-1]
+		remotePath="archive@nausikaa2.rz-berlin.mpg.de:/usr/local/share/archimedes/web/docs/proj/echo/1/docs/"+fn+"/info.xml"
+		os.popen("scp /tmp/tmp_info.xml %s"%remotePath)
+
+def patchedInfoXML(path):
+	dom=xml.dom.minidom.parse(path+"/index.meta")
 	
+	ret="<info>\n"
+	ret+="<remotetext>%s</remotetext>\n"%archive.getText(dom.getElementsByTagName('text')[0].childNodes)
+	ret+="<pagebreak>%s</pagebreak>\n"%archive.getText(dom.getElementsByTagName('pagebreak')[0].childNodes)
+	ret+="<display>%s</display>\n"%archive.getText(dom.getElementsByTagName('display')[0].childNodes)
+	try:
+		ret+="<toptemplate>%s</toptemplate>\n"%archive.getText(dom.getElementsByTagName('toptemplate')[0].childNodes)
+	except:
+		"""not"""
+	try:
+		ret+="<thumbtemplate>%s</thumbtemplate>\n"%archive.getText(dom.getElementsByTagName('thumbtemplate')[0].childNodes)
+	except:
+		"""not"""
+	try:
+		ret+="<startpage>%s</startpage>\n"%archive.getText(dom.getElementsByTagName('startpage')[0].childNodes)
+	except:
+		"""not"""
+		
+	ret+="<lang>%s</lang>\n"%archive.getText(dom.getElementsByTagName('lang')[0].childNodes)
+	try:
+		ret+="<author>%s</author>\n"%archive.getText(dom.getElementsByTagName('author')[0].childNodes)
+	except:
+		"""not"""
+	try:
+		ret+="<title>%s</title>\n"%archive.getText(dom.getElementsByTagName('title')[0].childNodes)
+	except:
+		"""not"""
+		
+	ret+="</info>"
+
+	return ret