--- OSAS/OSA_system/OSAS_Root.py	2004/10/29 14:24:32	1.17
+++ OSAS/OSA_system/OSAS_Root.py	2006/02/14 17:42:37	1.20
@@ -5,9 +5,12 @@ from OFS.Folder import Folder
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
 import urllib
+import sys
 import zLOG
 import re
 import xml.dom.minidom
+import os.path
+from Globals import package_home
 
 class OSAS_ViewerObject(Folder):
     """Beschreibung eines Viewers"""
@@ -25,10 +28,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
@@ -40,7 +43,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):
@@ -74,7 +77,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):
@@ -101,9 +104,12 @@ class OSAS_Root(Folder,Implicit):
         """lade xml file"""
         #print "GI"
         #print xml_url
-        xmlneu=urllib.urlopen(xml_url).read()
-        
-	
+	try:
+	        xmlneu=urllib.urlopen(xml_url).read()
+	except:
+                zLOG.LOG("OSASRoot (downloadExternalXML)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+                zLOG.LOG("OSASRoot (downloadExternalXML)", zLOG.INFO,xml_url)
+		return "error"
         try:
             dom=xml.dom.minidom.parseString(xmlneu)
         except:
@@ -132,7 +138,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):