--- OSAS/OSA_system/OSAS_addfiles.py	2004/04/02 17:38:40	1.23
+++ OSAS/OSA_system/OSAS_addfiles.py	2004/04/14 21:26:23	1.27
@@ -1,10 +1,10 @@
 # Methoden und Classen zum Hinzufuegen von Dokumenten
 
 
-from OSAS_helpers import readArchimedesXML, getISO, getText
+from OSAS_helpers import readArchimedesXML, getText
 import os
 import xml.dom.minidom
-
+import re
 import urllib
 import OSAS_add
 import OSAS_show
@@ -62,13 +62,13 @@ class OSAS_add_Document(Folder):
     security.declarePublic('index_html')
     def index_html(self):
         """stantard aufruf"""
-        return OSAS_add.add(self,no_upload=1)
+        return OSAS_add.add(self.standardMD,no_upload=1)
 
 
     security.declarePublic('add2')
     def add2(self):
         """ anlegen naechster schritt"""
-        return OSAS_add.add2(self)
+        return OSAS_add.add2(self.standardMD)
 
     def add3(self):
         """Foldername"""
@@ -86,6 +86,37 @@ class OSAS_add_Document(Folder):
         """write new index.meta file"""
         return OSAS_add.add6(self)
 
+    def addText2(self):
+        """add only a text"""
+        metadata=OSAS_add.parse_query_string(self.REQUEST['QUERY_STRING'])
+        metadata['archive-creation-date']=OSAS_add.date(self)
+        metadata['creator']=self.REQUEST['creator']
+        metadata['description']=self.REQUEST['content_description']
+	metadata['archive-path']=os.path.split(self.REQUEST.SESSION['path'])[0]
+	#metadata['folder_name']=self.REQUEST.SESSION['folder_name']
+	metadata['folder_name']=os.path.split(self.REQUEST.SESSION['path'])[1]
+	metadata['content-type']="fulltext document"
+	self.reftype=self.REQUEST.SESSION['reftype']
+	self.REQUEST.SESSION['add_metadata']=metadata	
+	self.add_metadata=metadata
+	self.metadata=self.REQUEST.SESSION['metadata']
+	self.metadataprint=""
+	for tag in self.metadata.keys():
+		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"
+	renderxml = newtemplate()
+        metapath=self.REQUEST.SESSION['path']+"/index.meta"
+	
+	
+	f=open(metapath,'w')
+	f.writelines(renderxml)
+	f.close()
+	os.chmod(metapath,0664)
+	os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) 
+	
+        return OSAS_add.addText2(self)
 
     def addImages(self,path):
         """Hinzufügen eines neuen Imagesfolders"""
@@ -184,7 +215,14 @@ class OSAS_add_contextData(Folder):
             def startElement(self,name,attrs):
                 if name=="element":
                     self.depth+=1
-                    self.retStr+=spaces(self.depth)+"<input type='checkbox' name='collection' value='%s'>%s</input>"%(attrs.get('url'),attrs.get('name'))+"<br>\n"
+                    begin=""
+                    end=""
+                    if self.depth==1:
+                        print "hi"
+                        begin="<b>"
+                        end="</b>"
+                        
+                    self.retStr+=spaces(self.depth)+"<input type='radio' name='collection' value='%s'>%s</input>"%(attrs.get('url'),begin+attrs.get('name')+end)+"<br>\n"
 
 
                     
@@ -254,7 +292,7 @@ class OSAS_add_contextData(Folder):
         return pt()
     
     
-    def addContextData2(self,path,collection,context,link,label,description,content_type,responsible,weight,credits=None):
+    def addContextData2(self,path,collection,link,label,description,content_type,responsible,weight,credits=None):
         """Hinzufuegen der Resource"""
         splitted=path.split("/")
         #print "BLU"
@@ -265,10 +303,11 @@ class OSAS_add_contextData(Folder):
         #link=TOBEDONE"
         """Hinzufügen der Ressource"""
 
-        params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'content_type':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
+        params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
 
         retStr=urllib.urlopen(collection+"/addResource",params).read()
-        if not retStr:
+        return retStr
+	if not retStr:
             return "An Error occured adding the resource\n"
 
         urllib.urlopen(collection+"/"+id+"/ECHO_getResourceMD").read()
@@ -428,8 +467,9 @@ class OSAS_combineTextImage(Folder):
 	except:
 		filelanguage=""
                 
-	self.REQUEST.SESSION['isolist']=getISO()
-	tmp=getISO().keys()
+	self.REQUEST.SESSION['isolist']=OSAS_add.getISO()
+        print "DD",self.REQUEST.SESSION['isolist']
+	tmp=self.REQUEST.SESSION['isolist'].keys()
 	tmp.sort()
 	self.REQUEST.SESSION['isolistsort']=tmp
 	self.REQUEST.SESSION['path']=path
@@ -478,7 +518,7 @@ class OSAS_combineTextImage(Folder):
         linkViewerEnvironment="http://nausikaa2.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.x.cgi?dir=%s&step=thumb" % linkPath
         self.REQUEST.SESSION['linkViewerEnvironment']=linkViewerEnvironment
 
-        writeToContext(path,linkViewerEnvironment,"ECHO standard environment")
+        writeToContext(path,linkViewerEnvironment,"ECHO standard environment",unique="yes")
         
         pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_combineTextImageFinal.zpt').__of__(self)
 
@@ -492,11 +532,23 @@ class OSAS_combineTextImage(Folder):
         else:
             return None
 
-def writeToContext(path,link,description):
+def writeToContext(path,link,description,unique="no"):
     """Created an additional entry to the index.meta file of path"""
     dom=xml.dom.minidom.parse(path+"/index.meta")
     node=dom.getElementsByTagName('resource')[0]
 
+    if unique=="yes":
+        
+        contexts=node.getElementsByTagName('context')
+        for context in contexts:
+            nameTag=getText(context.getElementsByTagName('name')[0].childNodes)
+            linkTag=getText(context.getElementsByTagName('link')[0].childNodes)
+            
+            print "unique",context,nameTag,description,linkTag,link
+            linkTag=re.sub("\:86","",linkTag) # alter port 86 gleich ohne port nummer (hack)
+            if (nameTag==description) and (linkTag==link):
+                node.removeChild(context).unlink()
+                    
     subnode=dom.createElement('context')
 
     linknode=dom.createElement('link')