--- OSAS/OSA_system/OSAS_add.py	2004/04/15 09:45:29	1.24
+++ OSAS/OSA_system/OSAS_add.py	2004/07/01 07:46:42	1.32
@@ -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()
@@ -141,11 +142,25 @@ def add4(self):
 	self.folder_name=self.REQUEST['folder_name']
 	# next has to be changed -> error if back button is used!!
 	self.REQUEST.SESSION['folder_name']=self.folder_name
+	#return self.REQUEST['submit']
+	
+	try:	
+		os.mkdir(self.REQUEST.SESSION['path'])
+		os.chmod(self.REQUEST.SESSION['path'],0774)
+	except:
+		"""nothing"""
+
 	if self.REQUEST['submit']=="upload images":
 		self.REQUEST.SESSION['path']=os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name'])
+		
+
 		self.image_folder_name="pageimg"
 		newtemplate=PageTemplateFile('Products/OSA_system/zpt/OSAS_upload').__of__(self)
 		return newtemplate()
+	
+	elif self.REQUEST['submit']=="upload pdf":
+		os.mkdir(os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
+		return addPdf(self,os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
 	else:
 		os.mkdir(os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
 		return addText(self,os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
@@ -191,15 +206,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):
@@ -288,10 +304,45 @@ def addPresentation2(self):
 	
 	return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
 
+
+def addPdf(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['pathnew']=path
+	newtemplate=PageTemplateFile('Products/OSA_system/zpt/addPdf').__of__(self)
+	return newtemplate()
+
+def addPdf2(self):
+	"""addtext"""
+	folder_name="pdf" # foldername fixed
+	
+	if self.REQUEST['file_name']=="":
+		file_name=self.REQUEST['fileupload'].filename
+	else:
+		file_name=self.REQUEST['file_name']
+		
+	#print self.REQUEST['folder_name']
+	content_description=self.REQUEST['content_description']
+	path=self.REQUEST.SESSION['pathnew']
+
+	filedata=self.REQUEST.form['fileupload'].read()
+	try:
+		os.mkdir(path+"/"+folder_name)
+	except:
+		"""nothing"""
+	f=open(path+"/"+folder_name+"/"+file_name,"w")
+	f.write(filedata)
+	f.close()
+	os.chmod(path+"/"+folder_name,0755)
+	os.chmod(path+"/"+folder_name+"/"+file_name,0644)
+	addDirsToIndexMeta(path,folder_name,content_description,'pdf')
+
+	return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
+
 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 +351,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 +628,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)
 	
@@ -618,10 +676,10 @@ def combineTextImage2(self,path):
 	
 	
 
-	print urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+	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")
@@ -629,7 +687,7 @@ def combineTextImage2(self,path):
 		f.close()
 		splitted=path.split("/")
 		fn=splitted[len(splitted)-1]
-		remotePath="nausikaa2.rz-berlin.mpg.de:/usr/local/share/archimedes/web/docs/proj/echo/1/docs/"+fn+"/info.xml"
+		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):
@@ -653,8 +711,15 @@ def patchedInfoXML(path):
 		"""not"""
 		
 	ret+="<lang>%s</lang>\n"%archive.getText(dom.getElementsByTagName('lang')[0].childNodes)
-	ret+="<author>%s</author>\n"%archive.getText(dom.getElementsByTagName('author')[0].childNodes)
-	ret+="<title>%s</title>\n"%archive.getText(dom.getElementsByTagName('title')[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