--- OSAS/OSA_system/OSAS_addfiles.py 2005/11/04 16:37:35 1.41 +++ OSAS/OSA_system/OSAS_addfiles.py 2006/02/14 16:25:22 1.43 @@ -19,6 +19,7 @@ from Globals import package_home from xml.sax import make_parser from xml.sax.handler import ContentHandler +import zLOG def spaces(depth): """needed in XMLtoTree""" @@ -325,10 +326,14 @@ class OSAS_add_contextData(Folder): def addContextData(self,path): """Hinzufuegen zu einer Sammlung""" + + server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL']) + try: - urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta") + urllib.urlopen(server+"/"+path+"/index.meta") except: + zLOG.LOG("OSAS_addfiles (addContextData)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) return self.REQUEST['SERVER_URL']+path+"/index.meta file has to exist!" links=[(path,'standard storage')] @@ -347,7 +352,9 @@ class OSAS_add_contextData(Folder): #print "BLU" id=splitted[len(splitted)-1] title=splitted[len(splitted)-1] - metalink=self.REQUEST['SERVER_URL']+path+"/index.meta" + server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL']) + + metalink=server+"/"+path+"/index.meta" #link=TOBEDONE" """Hinzufuegen der Ressource""" @@ -385,10 +392,11 @@ class OSAS_add_contextData(Folder): return pt() - def change_OSAS_add_contextData(self,collection,pwstr=None,RESPONSE=None): + def change_OSAS_add_contextData(self,collection,serverUrl,pwstr=None,RESPONSE=None): """Change""" self.pwstr=pwstr self.collection=collection + self.serverUrl=serverUrl if RESPONSE is not None: RESPONSE.redirect('manage_main')