--- OSAS/OSA_system/OSAS_show.py	2004/01/09 12:47:04	1.13
+++ OSAS/OSA_system/OSAS_show.py	2004/04/05 21:54:42	1.17
@@ -1,5 +1,7 @@
-# Classes for displaying, browsing and organizing the archive
+""" Classes for displaying, browsing and organizing the archive
+20040303 Needs configuration for rescaling thumbs
 
+"""
 
 import addFolder
 from OFS.Folder import Folder
@@ -22,7 +24,7 @@ class OSAS_ShowOnline(SimpleItem):
     security.declareProtected('View','index_html')
     def index_html(self):
         """main view"""
-        pt=PageTemplateFile('Products/OSA_system/OSAS_ViewFiles.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_ViewFiles.zpt').__of__(self)
         return pt()
     
     def getfilesystem2(self,start,reload=0):
@@ -62,7 +64,7 @@ InitializeClass(OSAS_ShowOnline)
 
 def manage_AddOSAS_ShowOnlineForm(self):
     """interface for adding the OSAS_root"""
-    pt=PageTemplateFile('Products/OSA_system/AddOSAS_ShowOnline.zpt').__of__(self)
+    pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_ShowOnline.zpt').__of__(self)
     return pt()
 
 def manage_AddOSAS_ShowOnline(self,id,RESPONSE=None):
@@ -86,7 +88,7 @@ class OSAS_StoreOnline(SimpleItem):
     security.declareProtected('View','index_html')
     def index_html(self):
         """main view"""
-        pt=PageTemplateFile('Products/OSA_system/OSAS_StoreFiles.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_StoreFiles.zpt').__of__(self)
         return pt()
 
     def readContexts(self,path):
@@ -100,13 +102,13 @@ class OSAS_StoreOnline(SimpleItem):
             return []
 
     def rescaleThumbs(self,path):
-        """rescale thumbs of imeages in path"""
+        """rescale thumbs of images in path"""
 
         os.popen("ssh 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/OSAS_scaled.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_scaled.zpt').__of__(self)
         return pt()
 
     
@@ -148,21 +150,26 @@ class OSAS_StoreOnline(SimpleItem):
         return isFolder(self,path)
     
     def isScannedDocument(self,path):
-        """Test ob Eintrag ein Folder ist"""
+        """Test ob Eintrag ein Scanned Document ist"""
         return isScannedDocument(self,path)
 
     def isFullText(self,path,folder_name):
         """Test ob Eintrag ein Folder ist"""
         return isFullText(path,folder_name)
 
-    def addFolderForm(self,path):
-        """add a new path"""
-        pt=PageTemplateFile('Products/OSA_system/OSAS_addFolder.zpt').__of__(self)
-        return pt()
+    def isPresentation(self,path,folder_name):
+        """Test ob Eintrag ein Folder ist"""
+        return isPresentation(path,folder_name)
 
     def date(self):
 	return strftime("%d.%m.%Y",localtime())	
 
+    def addFolderForm(self,path):
+        """add a new path"""
+        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_addFolder.zpt').__of__(self)
+        return pt()
+
+    
     def addFolder(self,path,folder_name,description,archive_creation_date,creator):
         """add the folder to the filesystem and write the metadata files"""
         return addFolder.addFolder(self,path,folder_name,description,archive_creation_date,creator)
@@ -174,9 +181,10 @@ class OSAS_StoreOnline(SimpleItem):
             indexmeta=dom.toxml()
         except:
             indexmeta=""
+            
         self.REQUEST.SESSION['indexmeta']=indexmeta
         self.REQUEST.SESSION['path']=path
-        newtemplate=PageTemplateFile('Products/OSA_system/editindex').__of__(self)
+        newtemplate=PageTemplateFile('Products/OSA_system/zpt/editindex').__of__(self)
         return newtemplate()
 
     def EditIndex2(self):
@@ -197,14 +205,14 @@ class OSAS_StoreOnline(SimpleItem):
       
     def add_metafile(self):
         """nothing"""
-        pt=PageTemplateFile('Products/OSA_system/OSAS_addmetadata.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/zpt/OSAS_addmetadata.zpt').__of__(self)
         return pt()
 
 InitializeClass(OSAS_StoreOnline)
 	
 def manage_AddOSAS_StoreOnlineForm(self):
     """interface for adding the OSAS_root"""
-    pt=PageTemplateFile('Products/OSA_system/AddOSAS_StoreOnline.zpt').__of__(self)
+    pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_StoreOnline.zpt').__of__(self)
     return pt()
 
 def manage_AddOSAS_StoreOnline(self,id,RESPONSE=None):
@@ -246,7 +254,11 @@ from AccessControl import ClassSecurityI
 from AccessControl.Role import RoleManager
 from Acquisition import Implicit
 from Globals import Persistent
-from time import strptime
+try:
+    from time import strptime
+except:
+    print "ignoring time.strptime import"
+    
 from time import strftime
 import time
 import os.path
@@ -887,7 +899,7 @@ def getBib(nodelist):
     return rc+"</table>"
 
 def getMetafile(path):
-    """get index.meta"""
+    """get index.meta and translate it to an HTML"""
     html=[]
     if not os.path.exists(path+"/index.meta"):
           
@@ -948,6 +960,8 @@ def hasMetafile(path):
     return os.path.exists(path+"/index.meta")
     #return path
 
+
+
 def isdigilib2(path):
 	  """check if folder is candidate for digilib without metadata""" 
           try: