--- OSAS/OSA_system/OSAS_Root.py	2004/08/04 18:36:05	1.14
+++ OSAS/OSA_system/OSAS_Root.py	2006/02/13 10:48:24	1.19
@@ -5,8 +5,11 @@ from OFS.Folder import Folder
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
 import urllib
+import zLOG
 import re
 import xml.dom.minidom
+import os.path
+from Globals import package_home
 
 class OSAS_ViewerObject(Folder):
     """Beschreibung eines Viewers"""
@@ -24,10 +27,10 @@ class OSAS_ViewerObject(Folder):
 
     def changeViewerObjectForm(self):
         """Main configuration"""
-        pt=PageTemplateFile('Products/OSA_system/zpt/changeViewerObjectForm.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeViewerObjectForm.zpt')).__of__(self)
         return pt()
 
-    def changeViewerObject(self,title,prefix):
+    def changeViewerObject(self,title,prefix,RESPONSE=None):
         """Change RootFolderName"""
         self.title=title
         self.prefix=prefix
@@ -39,7 +42,7 @@ class OSAS_ViewerObject(Folder):
 
 def manage_AddOSAS_ViewerObjectForm(self):
     """interface for adding the viewer Object"""
-    pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_ViewerObject.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_ViewerObject.zpt')).__of__(self)
     return pt()
 
 def manage_AddOSAS_ViewerObject(self,id,title,prefix,RESPONSE=None):
@@ -73,7 +76,7 @@ class OSAS_Root(Folder,Implicit):
         
     def Root_config(self):
         """Main configuration"""
-        pt=PageTemplateFile('Products/OSA_system/zpt/ConfigOSAS_Root.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ConfigOSAS_Root.zpt')).__of__(self)
         return pt()
 
     def change_OSAS_Root(self,RootFolderName,DigILibURL,uploadServletUrl,RESPONSE=None):
@@ -98,14 +101,16 @@ class OSAS_Root(Folder,Implicit):
 
     def downloadExternalXML(self,index_meta_url,xml_url):
         """lade xml file"""
-
+        #print "GI"
+        #print xml_url
         xmlneu=urllib.urlopen(xml_url).read()
-
+        
+	
         try:
             dom=xml.dom.minidom.parseString(xmlneu)
         except:
             print "Error"
-            print xmlneu
+            return repr(xml_url)
             return "error"
 
         path=re.sub(self.REQUEST['SERVER_URL'],'',index_meta_url)
@@ -117,9 +122,11 @@ class OSAS_Root(Folder,Implicit):
 
         path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server
         path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
-
+        path=re.sub('http://vision.mpiwg-berlin.mpg.de','',path) # falls vision als server
+	path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo
+#	path=re.sub('//','/',path) # falls echo
         fh=open(path,'w')
-
+	zLOG.LOG("OSAS",zLOG.INFO,path)
         fh.write(xmlneu)
         fh.close()
         return "ok"
@@ -127,7 +134,7 @@ class OSAS_Root(Folder,Implicit):
         
 def manage_AddOSAS_RootForm(self):
     """interface for adding the OSAS_root"""
-    pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_Root.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_Root.zpt')).__of__(self)
     return pt()
 
 def manage_AddOSAS_Root(self,id,RootFolderName,DigILibURL,uploadServletUrl,RESPONSE=None):