--- OSAS/OSA_system/archive.py	2004/01/09 12:47:05	1.6
+++ OSAS/OSA_system/archive.py	2005/05/04 14:06:32	1.11
@@ -17,7 +17,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):
@@ -138,6 +138,7 @@ class filesystem(Implicit, Persistent, R
 	       	        j[k]=self.node[k]	  
        	   return j
 
+
       def archive_the_path(self,path):
            """parse indexmeta and return digilib path"""
            try:
@@ -177,6 +178,7 @@ class filesystem(Implicit, Persistent, R
 	      if self.archive_the_path(k):
                     j[k]=self.node[k]
        	   return j
+     
       security.declarePublic('getImageDirs')
       def getImageDirs(self,dom,path):
       	  dirs=dom.getElementsByTagName("dir")
@@ -581,11 +583,11 @@ class archive(Implicit, Persistent, Role
            
             if type(path)==StringType:
                   self.filenames[path]=tempfile.mktemp()
-                  f = os.popen("/usr/local/mpiwg/archive/archiver "+path+" > "+self.filenames[path]+" &","r")
+                  f = os.popen("/usr/local/mpiwg/archive/archiver "+path+" -premigrate > "+self.filenames[path]+" &","r")
             else:
                   for singlepath in path:
                         self.filenames[singlepath]=tempfile.mktemp()
-                        f = os.popen("/usr/local/mpiwg/archive/archiver "+singlepath+" > "+self.filenames[singlepath]+" &","r")
+                        f = os.popen("/usr/local/mpiwg/archive/archiver "+singlepath+" -premigrate > "+self.filenames[singlepath]+" &","r")
                             
       security.declarePublic('messages')
       def messages(self):
@@ -869,10 +871,11 @@ class overview(Implicit,Persistent, Role
             if not len(str)==0:
                   for line in str:
                         retstr=retstr+line+"<br>"
-                  check=re.search(r"(.*):(.*)",line)
-                  if check.group(1)=='ABORT':
+                  check=line.split(":")
+                  #re.search(r"(.*):(.*)",line)
+                  if check[0]=='ABORT':
                         error="error"
-                  elif check.group(1)=='DONE':
+                  elif check[0]=='DONE':
                         error="ok"
                   else:
                         error="running"
@@ -947,7 +950,7 @@ def EditIndex(self,path):
             indexmeta=""
       self.REQUEST.SESSION['indexmeta']=indexmeta
       self.REQUEST.SESSION['path']=path
-      newtemplate=PageTemplateFile('/usr/local/mpiwg/Zope/Extensions/editindex').__of__(self)
+      newtemplate=PageTemplateFile('Products/OSA_system/zpt/editindex').__of__(self)
       return newtemplate()
 
 def EditIndex2(self):