--- OSAS/OSA_system/archive.py 2004/01/09 12:47:05 1.6 +++ OSAS/OSA_system/archive.py 2004/03/03 13:02:54 1.9 @@ -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") @@ -869,10 +871,11 @@ class overview(Implicit,Persistent, Role if not len(str)==0: for line in str: retstr=retstr+line+"
" - 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):