--- OSAS/OSA_system/OSAS_addfiles.py	2005/04/27 13:17:45	1.40
+++ OSAS/OSA_system/OSAS_addfiles.py	2005/11/04 16:37:35	1.41
@@ -76,7 +76,7 @@ class OSAS_add_Document(Folder):
 
     def add4(self):
         """Applet"""
-	
+        
         return OSAS_add.add4(self)
 
     def add5(self):
@@ -93,33 +93,33 @@ class OSAS_add_Document(Folder):
         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['pathnew'])[0]
-	#metadata['folder_name']=self.REQUEST.SESSION['folder_name']
-	metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[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():
+        metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0]
+        #metadata['folder_name']=self.REQUEST.SESSION['folder_name']
+        metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[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():
             
             #print str(self.metadata[tag]).decode('utf-8').encode('utf-8')
             self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"
 
-	newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self)
-	newtemplate.content_type="text/plain"
-	renderxml = newtemplate(encoding='utf-8')
+        newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self)
+        newtemplate.content_type="text/plain"
+        renderxml = newtemplate(encoding='utf-8')
         #return renderxml
         metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
-	
-	f=open(metapath,'w')
+        
+        f=open(metapath,'w')
 
-	f.write(renderxml)
-	f.close()
-	os.chmod(metapath,0664)
-	os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) 
-	
+        f.write(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 addPdf2(self):
@@ -128,30 +128,30 @@ class OSAS_add_Document(Folder):
         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['pathnew'])[0]
-	#metadata['folder_name']=self.REQUEST.SESSION['folder_name']
-	metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[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(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self)
-	newtemplate.content_type="text/plain"
-	renderxml = newtemplate(encoding='utf-8')
+        metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0]
+        #metadata['folder_name']=self.REQUEST.SESSION['folder_name']
+        metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[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(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self)
+        newtemplate.content_type="text/plain"
+        renderxml = newtemplate(encoding='utf-8')
         metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
-	
-	
-	f=open(metapath,'w')
-	f.write(renderxml)
-	f.close()
-	os.chmod(metapath,0664)
-	os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) 
-	
+        
+        
+        f=open(metapath,'w')
+        f.write(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.addPdf2(self)
 
     def addImages(self,path):
@@ -289,9 +289,9 @@ class OSAS_add_contextData(Folder):
             return curHandler.retStr
 
         except:
-	    return URL
+            return URL
             return urllib.urlopen(URL).read()
-	    
+            
       
     def __init__(self,id,collection):
         self.id=id
@@ -312,16 +312,16 @@ class OSAS_add_contextData(Folder):
 
 
         URL+="/getPartnersXML"
-        parser=make_parser()	
-	curHandler=requestHandler()
+        parser=make_parser()    
+        curHandler=requestHandler()
         parser.setContentHandler(curHandler)
-	parser.parse(urllib.urlopen(URL))	        
-        try:	
+        parser.parse(urllib.urlopen(URL))               
+        try:    
                   
-	        return curHandler.ret
+                return curHandler.ret
         except:
-        	return [("",URL)]
-	    
+                return [("",URL)]
+            
     
     def addContextData(self,path):
         """Hinzufuegen zu einer Sammlung"""
@@ -360,18 +360,18 @@ class OSAS_add_contextData(Folder):
         except:
             return "An Error occured adding the resource\n", collection,params
         
-	#print "added"
-	if not retStr:
+        #print "added"
+        if not retStr:
             return "An Error occured adding the resource\n", collection,params
-	
+        
         #print collection+"/"+id+"/copyIndex_meta2echo_resource"
 
         urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
-	#print "copy2res"
+        #print "copy2res"
         urllib.urlopen(collection+"/"+id+"/generate_label").read()
-	#print "label"
+        #print "label"
         urllib.urlopen(collection+"/"+id+"/generate_title").read()
-	#print "title"
+        #print "title"
         return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
         
     manage_options = Folder.manage_options+(
@@ -492,47 +492,47 @@ class OSAS_combineTextImage(Folder):
     def combineTextImage(self,path):
         """Hinzufügen der Presenationsinformation"""
         """gibt input formular zur erstellung des texttools meta tag aus"""
-	files = os.listdir(path)
-	
-	texts=[]
-	imagefolders=[]
-	presentationfolders=[]
-
-	splitted=path.split("/")
-	externxml=readArchimedesXML(splitted[len(splitted)-1])
-	
-	for filename in files:
-		#print "FN",filename
-		if archive.isdigilib2(path+"/"+filename):
-			imagefolders.append(filename)
-			
-		if archive.isFullText(path,filename):
-			#print "HI"
-			texts.append(filename)
-		if archive.isPresentation(path,filename):
-			presentationfolders.append(filename)
-	
-	dom=xml.dom.minidom.parse(path+"/index.meta")
-	try:
-		filelanguage=archive.getText(dom.getElementsByTagName('lang')[0].childNodes)
-	except:
-		filelanguage=""
+        files = os.listdir(path)
+        
+        texts=[]
+        imagefolders=[]
+        presentationfolders=[]
+
+        splitted=path.split("/")
+        externxml=readArchimedesXML(splitted[len(splitted)-1])
+        
+        for filename in files:
+                #print "FN",filename
+                if archive.isdigilib2(path+"/"+filename):
+                        imagefolders.append(filename)
+                        
+                if archive.isFullText(path,filename):
+                        #print "HI"
+                        texts.append(filename)
+                if archive.isPresentation(path,filename):
+                        presentationfolders.append(filename)
+        
+        dom=xml.dom.minidom.parse(path+"/index.meta")
+        try:
+                filelanguage=archive.getText(dom.getElementsByTagName('lang')[0].childNodes)
+        except:
+                filelanguage=""
                 
-	self.REQUEST.SESSION['isolist']=OSAS_add.getISO()
+        self.REQUEST.SESSION['isolist']=OSAS_add.getISO()
+        
+        tmp=self.REQUEST.SESSION['isolist'].keys()
+        tmp.sort()
+        self.REQUEST.SESSION['isolistsort']=tmp
+        self.REQUEST.SESSION['path']=path
+        self.REQUEST.SESSION['texts']=texts
+        self.REQUEST.SESSION['imagefolders']=imagefolders
+        self.REQUEST.SESSION['presentationfolders']=presentationfolders
+        self.REQUEST.SESSION['filelanguage']=filelanguage
+        self.REQUEST.SESSION['externxml']=externxml
+
+        newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ImageandText')).__of__(self)
+        return newtemplate()
         
-	tmp=self.REQUEST.SESSION['isolist'].keys()
-	tmp.sort()
-	self.REQUEST.SESSION['isolistsort']=tmp
-	self.REQUEST.SESSION['path']=path
-	self.REQUEST.SESSION['texts']=texts
-	self.REQUEST.SESSION['imagefolders']=imagefolders
-	self.REQUEST.SESSION['presentationfolders']=presentationfolders
-	self.REQUEST.SESSION['filelanguage']=filelanguage
-	self.REQUEST.SESSION['externxml']=externxml
-
-	newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ImageandText')).__of__(self)
-	return newtemplate()
-	
     def getViewerTemplateSets(self,obj_ids=None):
         """Get the ViewerTemplateSet title for configuration"""
         ret=[]
@@ -569,9 +569,9 @@ class OSAS_combineTextImage(Folder):
 
     def combineTextImage2(self,path):
         """Eingabe von Metadateninformationen"""
-	
-	# correct path
-	path=re.sub("//","/",path)
+        
+        # correct path
+        path=re.sub("//","/",path)
         OSAS_add.combineTextImage2(self,path) # Add images
         splitted=path.split("/")
         linkPath=splitted[len(splitted)-1]