--- OSAS/OSA_system/OSAS_show.py	2004/08/19 19:01:17	1.27
+++ OSAS/OSA_system/OSAS_show.py	2005/05/04 14:06:32	1.31
@@ -10,7 +10,7 @@ from OFS.SimpleItem import SimpleItem
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from Globals import InitializeClass,package_home
 
 class OSAS_ShowOnline(SimpleItem):
     security=ClassSecurityInfo()
@@ -25,7 +25,7 @@ class OSAS_ShowOnline(SimpleItem):
     security.declareProtected('View','index_html')
     def index_html(self):
         """main view"""
-        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_ViewFiles.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','OSAS_ViewFiles.zpt')).__of__(self)
         return pt()
     
     def getfilesystem2(self,start,reload=0):
@@ -54,7 +54,8 @@ class OSAS_ShowOnline(SimpleItem):
         return hasMetafile(path)
 
     def getMetafile(self,path):
-        return getMetafile(path)
+        
+        return getMetafile(path).decode('utf-8')
 
     def toggle_view(self,path,file):
         """Oeffnen bzw. schließen der Subfolders"""
@@ -66,7 +67,7 @@ InitializeClass(OSAS_ShowOnline)
 
 def manage_AddOSAS_ShowOnlineForm(self):
     """interface for adding the OSAS_root"""
-    pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_ShowOnline.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_ShowOnline.zpt')).__of__(self)
     return pt()
 
 def manage_AddOSAS_ShowOnline(self,id,RESPONSE=None):
@@ -90,7 +91,7 @@ class OSAS_StoreOnline(SimpleItem):
     security.declareProtected('View','index_html')
     def index_html(self):
         """main view"""
-        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_StoreFiles.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','OSAS_StoreFiles.zpt')).__of__(self)
         return pt()
 
     def readContexts(self,path):
@@ -107,12 +108,12 @@ class OSAS_StoreOnline(SimpleItem):
         """rescale thumbs of images in path"""
 
         dlpath = re.sub('/mpiwg/online/','',self.REQUEST['path'])
-        os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -replace >> /tmp/sc.out &"%dlpath )
+        os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath )
         #os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 --replace >> /tmp/sc.out &"% re.sub('/mpiwg/online/','',self.REQUEST['path']))
 
         self.REQUEST.SESSION['path']=self.REQUEST['path']
         #return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1'])
-        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_scaled.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','OSAS_scaled.zpt')).__of__(self)
         return pt()
 
     
@@ -142,7 +143,8 @@ class OSAS_StoreOnline(SimpleItem):
         return hasMetafile(path)
 
     def getMetafile(self,path):
-        return getMetafile(path)
+        
+        return getMetafile(path).decode('utf-8')
 
     def toggle_view(self,path,file):
         """Oeffnen bzw. schließen der Subfolders"""
@@ -175,7 +177,7 @@ class OSAS_StoreOnline(SimpleItem):
 
     def addFolderForm(self,path):
         """add a new path"""
-        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_addFolder.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','OSAS_addFolder.zpt')).__of__(self)
         return pt()
 
     def showHelp(self,refType,genericTag):
@@ -206,7 +208,7 @@ class OSAS_StoreOnline(SimpleItem):
             
         self.REQUEST.SESSION['indexmeta']=indexmeta
         self.REQUEST.SESSION['path']=path
-        newtemplate=PageTemplateFile('Products/OSA_system/zpt/editindex').__of__(self)
+        newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editindex')).__of__(self)
         return newtemplate()
 
     def EditIndex2(self):
@@ -227,7 +229,7 @@ class OSAS_StoreOnline(SimpleItem):
       
     def add_metafile(self):
         """nothing"""
-        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_addmetadata.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','OSAS_addmetadata.zpt')).__of__(self)
         return pt()
 
     def getTextToolsField(self,path,name,default=''):
@@ -265,7 +267,7 @@ class OSAS_StoreOnline(SimpleItem):
     def changeTemplatesForm(self,path):
         """changeform"""
         path=self.REQUEST.SESSION['path']=path
-        pt=PageTemplateFile('Products/OSA_system/zpt/changeTemplatesForm.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeTemplatesForm.zpt')).__of__(self)
         return pt()
 
         
@@ -281,7 +283,7 @@ InitializeClass(OSAS_StoreOnline)
 	
 def manage_AddOSAS_StoreOnlineForm(self):
     """interface for adding the OSAS_root"""
-    pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_StoreOnline.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_StoreOnline.zpt')).__of__(self)
     return pt()
 
 def manage_AddOSAS_StoreOnline(self,id,RESPONSE=None):
@@ -336,7 +338,7 @@ import xml.dom.minidom
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
 import tempfile
-tempfile.tempdir="/var/tmp/archiver"
+tempfile.tempdir="/var/tmp"
 
 exclusion=[".HSResource","lost+found","Network Trash Folder","TheFindByContentFolder","TheVolumeSettingsFolder"]
 class fsentry(Implicit, Persistent, RoleManager):