--- OSAS/OSA_system/OSAS_add.py	2004/04/15 21:30:42	1.26
+++ OSAS/OSA_system/OSAS_add.py	2004/06/23 05:36:08	1.31
@@ -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()
@@ -143,6 +144,14 @@ def add4(self):
 	self.REQUEST.SESSION['folder_name']=self.folder_name
 	if self.REQUEST['submit']=="upload images":
 		self.REQUEST.SESSION['path']=os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name'])
+		
+
+		try:	
+			os.mkdir(self.REQUEST.SESSION['path'])
+			os.chmod(self.REQUEST.SESSION['path'],0774)
+		except:
+			"""nothing"""
+
 		self.image_folder_name="pageimg"
 		newtemplate=PageTemplateFile('Products/OSA_system/zpt/OSAS_upload').__of__(self)
 		return newtemplate()
@@ -191,15 +200,16 @@ def add6(self):
 	else:
                 #print self.add_metadata['archive-path']
 		self.viewpath=re.search(r"/mpiwg/online/(.*)",self.add_metadata['archive-path']).group(1)
-		if not (self.REQUEST.SESSION['no_upload']=="text"):
+	
+	if (self.REQUEST.SESSION.has_key('no_upload')) and (self.REQUEST.SESSION['no_upload']=="text"):
+			"""text upload"""
+			return 1
+	else:	
 			newtemplate2=PageTemplateFile('Products/OSA_system/zpt/OSAS_saved').__of__(self)
 			newtemplate2.content_type="text/html"
 			self.REQUEST.response.setHeader('Content-Type','text/html')
 			return newtemplate2()
-		else:
-			"""text upload"""
-			return 1
-
+		
 
 
 def date(self):
@@ -291,7 +301,7 @@ 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()
 
@@ -300,7 +310,7 @@ def addText2(self):
 	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)
@@ -577,6 +587,13 @@ def combineTextImage2(self,path):
 			xsltnodetext=dom.createTextNode(self.REQUEST['project'])
 			xsltnode.appendChild(xsltnodetext)
 			subnode.appendChild(xsltnode)
+
+	if self.REQUEST.has_key('digiliburlprefix'):
+		if not self.REQUEST['digiliburlprefix']=="":
+			xsltnode=dom.createElement('digiliburlprefix')
+			xsltnodetext=dom.createTextNode(self.REQUEST['digiliburlprefix'])
+			xsltnode.appendChild(xsltnodetext)
+			subnode.appendChild(xsltnode)
 			
 	node.appendChild(subnode)
 	
@@ -621,7 +638,7 @@ def combineTextImage2(self,path):
 	urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
 
 	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']))
+		os.popen("ssh archive@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")