--- OSAS/OSA_system/OSAS_add.py	2004/03/25 09:59:19	1.17
+++ OSAS/OSA_system/OSAS_add.py	2004/04/05 21:54:42	1.18
@@ -1,4 +1,4 @@
-#BAUSTELLE
+#Neue Version Begin 5.4.2004
 
 
 """Methoden zum hinzufügen von Dokumenten ins Archiv"""
@@ -15,16 +15,16 @@ import string
 import urllib
 import xml.dom.minidom
 from time import localtime,strftime
-
-#referencetypes=['Book','Bic','Journal Article','Manuscript','jiji']
+from Globals import package_home
 
 import re
 def add(self, no_upload=0):
         """ Add metadata or metadata and documents to the repository
         no_upload=0 kein upload sonst upload von documententen"""
-        
-	self.referencetypes=['Book','Journal Article','Manuscript']
 
+        #self.referencetypes=self.ZopeFind(self,obj_metatypes=['OSAS_MetadataMapping'])
+	self.referencetypes=self.ZopeFind(self)
+	
 	newtemplate=PageTemplateFile('Products/OSA_system/zpt/OSAS_add_new').__of__(self)
         self.REQUEST.SESSION['path']=self.REQUEST['path']
 	if no_upload==0:
@@ -34,15 +34,14 @@ def add(self, no_upload=0):
 			del self.REQUEST.SESSION['no_upload']
 			
 	return newtemplate()
-	return self.referencetypes
 
 
 
 def getISO():
 	"""ISO"""
 	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()
+		f=file(os.path.join(package_home(globals()),'iso639-1.inc'),'r').readlines()
+
 		ret={}
 		for lineraw in f:
 			line=lineraw.encode('ascii','replace')
@@ -55,10 +54,11 @@ def getISO():
 
 def add2(self):
 	self.reftype=self.REQUEST['Reference Type']
-	self.REQUEST.SESSION['reftype']=self.reftype	
-	self.bibdata={'Book':['author','year','title','series editor','series title','series volume','number of pages','city','publisher','edition','number of volumes','translator','ISBN ISSN'],
-'Journal Article':['author','year','title','journal','volume','issue','pages','alternate journal','call number'],
-'Manuscript':['author','year','title','location','signature','pages','editorial remarks','description','keywords']}
+	self.REQUEST.SESSION['reftype']=self.reftype
+	self.bibdata={}
+	for referenceType in self.referencetypes:
+		print referenceType
+		self.bibdata[referenceType[1].title]=referenceType[1].fields
 
 	self.fields=self.bibdata[self.reftype]
 	self.isolist=getISO()
@@ -104,7 +104,18 @@ def add3(self):
 	"""Foldername"""
 	metadata=parse_query_string(self.REQUEST['QUERY_STRING'])
 	self.REQUEST.SESSION['metadata']=metadata
-	vorschlag_naming=metadata['author'][:5]+"_"+metadata['title'][:5]+"_"+metadata['year']
+	vorschlag=[]
+	if metadata.has_key('author'):
+		vorschlag.append(metadata['author'][:5])
+	if metadata.has_key('title'):
+		vorschlag.append(metadata['title'][:5])
+	if metadata.has_key('year'):
+		vorschlag.append(metadata['year'])
+	
+		
+	vorschlag_naming=string.join(vorschlag,"_")
+	
+		
 	self.vorschlag_naming=unicode(vorschlag_naming,'ascii','ignore')
 	if self.REQUEST.SESSION.has_key('no_upload'):
 		self.REQUEST.SESSION['folder_name']=self.REQUEST.SESSION['path']
@@ -118,7 +129,7 @@ def add4(self):
 	self.path=re.search(r"/mpiwg(.*)",self.REQUEST.SESSION['path']).group(1)
 	
 	self.folder_name=self.REQUEST['folder_name']
-	# netx has to be changed -> error if back button is used!!
+	# next has to be changed -> error if back button is used!!
 	self.REQUEST.SESSION['path']=self.REQUEST.SESSION['path']+"/"+self.REQUEST['folder_name']