--- OSA_system2/OSAS_root.py 2005/04/21 10:10:10 1.11 +++ OSA_system2/OSAS_root.py 2005/10/10 18:11:11 1.12 @@ -86,9 +86,9 @@ class OSAS_add_contextData(Folder): except: zLOG.LOG('OSAS_Root (addFileToDollection)',zLOG.ERROR,'%s %s'%sys.exc_info()[:2]) - return URL + return URL return urllib.urlopen(URL).read() - + def __init__(self,id,collection): self.id=id @@ -109,15 +109,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)] @@ -149,9 +149,11 @@ class OSAS_add_contextData(Folder): #link=TOBEDONE" """Hinzufuegen der Ressource""" - gifPath=path.replace("/mpiwg/online/","") - rawPath=path.replace("/mpiwg/online/permanent/einstein_exhibition/movies/","") - #lowresPath=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 @@ -168,18 +170,18 @@ class OSAS_add_contextData(Folder): zLOG.LOG('OSAS_Root (addFileToDollection2)',zLOG.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+(