--- OSAS/OSA_system/OSAS_show.py 2007/01/26 11:35:04 1.34 +++ OSAS/OSA_system/OSAS_show.py 2008/01/18 20:36:28 1.35 @@ -343,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 = "" @@ -573,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: @@ -581,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) @@ -651,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 @@ -1255,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: