--- OSA_system2/OSAS_root.py	2005/03/17 19:26:52	1.8
+++ OSA_system2/OSAS_root.py	2010/02/15 19:09:10	1.14
@@ -16,7 +16,14 @@ from urlparse import *
 import re
 import xml.dom.minidom
 from types import *
-import zLOG
+import logging
+
+#ersetzt logging
+def logger(txt,method,txt2):
+    """logging"""
+    logging.info(txt+ txt2)
+
+
 import os.path
 import Globals
 from Globals import package_home
@@ -85,10 +92,10 @@ class OSAS_add_contextData(Folder):
             return curHandler.retStr.encode('utf-8')
 
         except:
-            zLOG.LOG('OSAS_Root (addFileToDollection)',zLOG.ERROR,'%s %s'%sys.exc_info()[:2])
-	    return URL
+            logger('OSAS_Root (addFileToDollection)',logging.ERROR,'%s %s'%sys.exc_info()[:2])
+            return URL
             return urllib.urlopen(URL).read()
-	    
+            
       
     def __init__(self,id,collection):
         self.id=id
@@ -109,15 +116,15 @@ 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)]
 
     
     
@@ -139,7 +146,7 @@ class OSAS_add_contextData(Folder):
     
     index_html=addContextData
     
-    def addContextData2(self,path,collection,label,description,content_type,responsible,weight,thumb="",streamingfile="",rawfile="",credits=None):
+    def addContextData2(self,path,collection,label,description,content_type,responsible,weight,thumb="",streamingfile="",rawfile="",lowresfile="",credits=None):
         """Hinzufuegen der Resource"""
         splitted=path.split("/")
         #print "BLU"
@@ -149,11 +156,15 @@ class OSAS_add_contextData(Folder):
         
         #link=TOBEDONE"
         """Hinzufuegen der Ressource"""
-	gifPath=path.replace("/mpiwg/online/","")
-	rawPath=path.replace("/mpiwg/online/permanent/einstein_exhibition/movies/","")
+
+        gifPath=path.replace("/mpiwg/online/","")
+        rawPath=path.replace("/mpiwg/online/permanent/einstein_exhibition/movies/","")
+        lowresPath=path.replace("/mpiwg/online/permanent/einstein_exhibition/movies/","")
+
         thumbUrl="http://einst3.mpiwg-berlin.mpg.de/"+gifPath+"/"+thumb
         link="rtsp://einst1.mpiwg-berlin.mpg.de/"+gifPath+"/"+streamingfile
         rawFile="file:///Volumes/einstein_movies/"+rawPath+"/"+rawfile
+        lowresFile="rtsp://einst1.mpiwg-berlin.mpg.de/"+gifPath+"/"+lowresfile
 
         
         params=urllib.urlencode({'id':id,'title':title,'link':link,'thumbUrl':thumbUrl,'rawFile':rawFile,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
@@ -161,23 +172,23 @@ class OSAS_add_contextData(Folder):
                 
         try:
             server=xmlrpclib.Server(collection,allow_none=True)
-            retStr=server.addMovie(id,title,label,description,content_type,responsible,link,thumbUrl,rawFile,metalink,weight,credits)
+            retStr=server.addMovie(id,title,label,description,content_type,responsible,link,thumbUrl,rawFile,lowresFile,metalink,weight,credits)
         except:
-            zLOG.LOG('OSAS_Root (addFileToDollection2)',zLOG.ERROR,'%s %s'%sys.exc_info()[:2])
+            logger('OSAS_Root (addFileToDollection2)',logging.ERROR,'%s %s'%sys.exc_info()[:2])
             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']+'/browse?path='+path)
         
     manage_options = Folder.manage_options+(
@@ -230,8 +241,8 @@ class OSAS_handlerObject(Folder):
          - `id` : Zope ID des Objektes
          - `title`: Titel des Objektes
          - `prefix` : URL bzw. URL Rumpf der Zusammen mit dem Pfad des Objectes die Anzeige URL ergibt
-         - `objectType` : liste von Objekttypen die mittels dieses Handlers angezeigt werden können.
-         - `ignorePath` : Pfad der bei dem übergebenen Pfad element ingnoriert werden soll. Optional.
+         - `objectType` : liste von Objekttypen die mittels dieses Handlers angezeigt werden koennen.
+         - `ignorePath` : Pfad der bei dem uebergebenen Pfad element ignoriert werden soll. Optional.
         """
         self.id=id
         self.title=title
@@ -302,6 +313,14 @@ class OSAS_root(Folder,Implicit):
 
     OSASObjectTypes=OSAS_helpers.OSASObjectTypes
 
+    def extendDict(self,dict1,dict2):
+        """add two dicts"""
+        ret=dict1
+        for name in dict2.keys():
+            ret[name]=dict2[name]
+        return ret
+    
+        
     def generateMovieThumb(self,name):
         """generate movie"""
         server=xmlrpclib.Server(self.serverUrl)
@@ -406,7 +425,7 @@ class OSAS_root(Folder,Implicit):
         
         dom=self.validateIndexMeta(xmlneu)
         if not dom:
-            zLOG.LOG('OSAS_Root (downloadExternalXML)',zLOG.ERROR,'cannot parse: %s', xml_url)
+            logger('OSAS_Root (downloadExternalXML)',logging.ERROR,'cannot parse: %s', xml_url)
             return "error"