--- OSA_system2/OSAS_helpers.py	2005/02/11 16:27:01	1.4
+++ OSA_system2/OSAS_helpers.py	2005/02/11 20:06:57	1.6
@@ -84,15 +84,16 @@ def getBib(nodelist):
     #print rc
     return rc+"</table>"
 
-def getPropertyOfDirs(path,property):
+def getPropertyOfDirs(indexMeta,property):
     """gibt Eigenschaften der directorys gemaess Index.metas file in path aus
-    @param path: Pfad in dem das index.meta liegt
+    @param indexMeta: index.meta file
     @param propery: Property die ausgegebenwerden soll
     @return: Hash mit key  name des Directories and Value von property, None if error.
     """
     ret={}
+    
     try:
-        dom=xml.dom.minidom.parse(os.path.split(path)[0]+"/index.meta")
+        dom=xml.dom.minidom.parseString(indexMeta)
         for node in dom.getElementsByTagName("dir"):
             
             property= getText(node.getElementsByTagName("content-type")[0].childNodes)
@@ -103,24 +104,27 @@ def getPropertyOfDirs(path,property):
                 
         return ret
 
-def dirHasProperty(path,propertyName,propertyValue):
+def dirHasProperty(path,indexMeta,propertyName,propertyValue):
     """gibt 1 zurück 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
     """
-    if getPropertyOfDirs(os.path.split(path)[0],propertyName).get(os.path.split(path)[1],None)==propertyValue:
+    if getPropertyOfDirs(indexMeta,propertyName).get(os.path.split(path)[1],None)==propertyValue:
         return 1
     else:
         return 0
     
-def isImageFolder(path):
+def isImageFolder(path,indexMeta):
     """check if folder contains images without metadata or with metadata"""
     # metadaten ergeben imagefolder
-    if dirHasProperty(path,'content-type','images'): 
+    if dirHasProperty(path,indexMeta,'content-type','images'): 
         return 1
     
-    #sonst rate ob folder images enthaelten durch test nach suffix
+
+def isImageFolderGuess(path):
+    """check if folder contains images without metadata or with metadata"""
+       #sonst rate ob folder images enthaelten durch test nach suffix
     try:
                 dir=os.listdir(path)
 
@@ -144,7 +148,7 @@ def checkOSASFileType(object):
     """
     if os.path.split(object)[1][0]=="." or os.path.split(object)[1] in OSASExcludedFiles:
         return None
-    elif isImageFolder(object):
+    elif isImageFolderGuess(object):
         return 'OSAS_imageFolder'
     elif os.path.split(object)[1]=="index.meta":
         return 'OSAS_metaDataFile'