--- OSA_system2/OSAS_helpers.py	2005/03/03 20:41:00	1.7
+++ OSA_system2/OSAS_helpers.py	2010/02/15 19:09:10	1.12
@@ -2,9 +2,17 @@
 import os.path
 from types import *
 import xml.dom.minidom
-import zLOG
+import logging
 
-OSASObjectTypes=['OSAS_metaDataFile','OSAS_dir','OSAS_file','OSAS_imageFolder','OSAS_dir_archive','OSAS_file_archive','OSAS_videoFolder','OSAS_videoFile']
+#ersetzt logging
+def logger(txt,method,txt2):
+    """logging"""
+    logging.info(txt+ txt2)
+
+
+
+OSASObjectTypes=['OSAS_metaDataFile','OSAS_dir','Osas_file','OSAS_imageFolder','OSAS_dir_archive','OSAS_file_archive','OSAS_videoFolder','OSAS_videoFile','OSAS_videoFolder']
+OSASDirObjects=['OSAS_dir','OSAS_imageFolder',]
 OSASExcludedFiles=['TheVolumeSettingsFolder','TheFindByContentFolder']
 
 
@@ -12,7 +20,7 @@ def getText(nodelist):
     """gibt text aus nodelist"""
     rc = ""
     for node in nodelist:
-    	if node.nodeType == node.TEXT_NODE:
+        if node.nodeType == node.TEXT_NODE:
            rc = rc + node.data
     return rc
 
@@ -76,10 +84,10 @@ def getBib(nodelist):
     
     for node in nodelist:
         
-    	if node.nodeType == node.ELEMENT_NODE:
-	   """nothing"""
+        if node.nodeType == node.ELEMENT_NODE:
+           """nothing"""
            
-	   rc = rc+"<tr><td valign='right'>"+str(node.nodeName)+":</td><td> "+getText(node.childNodes)+"</td></tr>"
+           rc = rc+"<tr><td valign='right'>"+str(node.nodeName)+":</td><td> "+getText(node.childNodes)+"</td></tr>"
            
     #print rc
     return rc+"</table>"
@@ -114,7 +122,7 @@ def getPropertyOfDirs(indexMeta,property
 
                    
 def dirHasProperty(path,indexMeta,propertyName,propertyValue):
-    """gibt 1 zurück falls path hat propertyName und properName=propertyValue
+    """gibt 1 zurueck falls path hat propertyName und properName=propertyValue
     @param propertyName:Property von path in index.meta des parent folders von path
     @param propertyValue:Wert der Property
     @param path: Pfad der getestet werden soll
@@ -133,7 +141,7 @@ def isImageFolder(path,indexMeta):
 def isVideoFolder(path,indexMeta):
     """check if folder contains images without metadata or with metadata"""
     # metadaten ergeben imagefolder
-    print "test video",path
+
     if dirHasProperty(path,indexMeta,'media-type','video'):
         return 1
 
@@ -152,7 +160,7 @@ def isImageFolderGuess(path):
                 for a in dir:
                       
                       suffix=os.path.splitext(a)[1].lower()
-		
+                
                       if suffix in imagesuffixes:
                             return 1
 
@@ -190,6 +198,6 @@ def toList(fields):
 
 def localDate():
         """gives formatted local date"""
-	return strftime("%d.%m.%Y",localtime())	
+        return strftime("%d.%m.%Y",localtime())