--- OSAS/OSA_system/archive.py	2003/12/23 15:17:37	1.4
+++ 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):
@@ -75,6 +75,7 @@ class filesystem(Implicit, Persistent, R
      
       def getfs(self,start):
         """load filessystem"""
+        
         f = os.popen("find "+ start+" -name '*' ","r")
 	lines = f.readlines()
 	
@@ -137,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:
@@ -176,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")
@@ -239,6 +242,7 @@ class filesystem2(Implicit, Persistent,
      
       def getfs(self,start):
         """load filessystem"""
+        
         f = os.popen("find "+ start+" -name '*' ","r")
 	lines = f.readlines()
 	
@@ -373,6 +377,7 @@ class browse(Implicit, Persistent, RoleM
       
 def getfs(start):
 	"""return filesystem"""
+        
         f = os.popen("find "+ start+" -name '*'","r")
 	lines = f.readlines()
         return lines
@@ -527,6 +532,7 @@ class metacheck(Implicit, Persistent, Ro
                       return [retstr,error]
                 else:
                       return ['','running']
+                
 	def __init__(self,path):
 		"""archive the documents in path"""
     		self.lines=[]
@@ -577,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):
@@ -643,7 +649,7 @@ def getText(nodelist):
 
 def getBib(nodelist):
     rc= "<table border='0'>"
-    print "HI"
+    
     for node in nodelist:
         
     	if node.nodeType == node.ELEMENT_NODE:
@@ -686,7 +692,7 @@ def getMetafile(path):
 	else:
 	  html=html+"<h4>Info</h4>"
         html=html+getBib(bib.childNodes)
-        print html
+        #print html
        except:
         """none"""
        
@@ -865,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"
@@ -943,14 +950,14 @@ 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):
       if not self.REQUEST.has_key('fileupload'):
             #newtext=urllib.unquote(self.REQUEST['indexmeta'])
             newtext=self.REQUEST['indexmeta']
-            print newtext
+            #print newtext
       else:
             self.file_name=self.REQUEST['fileupload'].filename
             #newtext=self.REQUEST.form['fileupload'].read()