--- OSAS/OSA_system/OSAS_show.py 2006/06/14 16:13:53 1.33 +++ OSAS/OSA_system/OSAS_show.py 2008/01/18 20:36:28 1.35 @@ -11,6 +11,7 @@ from Products.PageTemplates.PageTemplate from Products.PageTemplates.PageTemplate import PageTemplate from AccessControl import ClassSecurityInfo from Globals import InitializeClass,package_home +import zLOG class OSAS_ShowOnline(SimpleItem): security=ClassSecurityInfo() @@ -108,9 +109,10 @@ 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=100 -sync >> /tmp/sc.out &"%dlpath ) + ret=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=100 -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'])) - + zLOG.LOG("OSAS_StoreOnline (rescleThumbs)",zLOG.INFO,ret.read()) + zLOG.LOG("OSAS_StoreOnline (rescleThumbs)",zLOG.INFO,"ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=100 -sync >> /tmp/sc.out &"%dlpath) self.REQUEST.SESSION['path']=self.REQUEST['path'] #return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']) pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','OSAS_scaled.zpt')).__of__(self) @@ -341,6 +343,7 @@ import tempfile tempfile.tempdir="/var/tmp" exclusion=[".HSResource","lost+found","Network Trash Folder","TheFindByContentFolder","TheVolumeSettingsFolder"] + class fsentry(Implicit, Persistent, RoleManager): """File entry class""" path = "" @@ -571,7 +574,7 @@ class filesystem2(Implicit, Persistent, def loadfs(self,start): """analyse filesystem""" for line in self.getfs(start): - + logging.debug("loadfs: reading %s"%repr(line)) g=re.search(r"(.*/)(.*)\n",line) if not g==None: try: @@ -579,6 +582,10 @@ class filesystem2(Implicit, Persistent, file=g.group(2) except: """nothing""" + logging.debug("loadfs: file=%s"%repr(file)) + #if file[0] in ('.',':'): + # skip dot-files + # continue if self.node.has_key(path): elements=self.node[path] elements.append(file) @@ -649,7 +656,7 @@ class browse(Implicit, Persistent, RoleM def filterExcluded(self,dir): ret=[] for item in dir: - if not item in exclusion: + if not ((item in exclusion) or (item[0] in ('.',':'))): ret.append(item) return ret @@ -1253,11 +1260,12 @@ def isScannedDocument(self,path): """returns TRUE, wenn path der Stammordner eines gescannten Documents ist""" try: f = file(path+"/index.meta","r") + logging.debug("isscanneddocument: file=%s"%f) lines = f.read() - try: dom = xml.dom.minidom.parseString(lines) content_type=getText(dom.getElementsByTagName("content-type")[0].childNodes) + logging.debug("isscanneddocument: content_type=%s"%content_type) if (content_type=="scanned-document") or (content_type=="scanned document") or (content_type=="fulltext document"): return 1 else: