--- OSA_system2/OSAS_helpers.py	2005/02/11 20:06:57	1.6
+++ OSA_system2/OSAS_helpers.py	2005/03/03 20:41:00	1.7
@@ -4,7 +4,7 @@ from types import *
 import xml.dom.minidom
 import zLOG
 
-OSASObjectTypes=['OSAS_metaDataFile','OSAS_dir','OSAS_file','OSAS_imageFolder','OSAS_dir_archive','OSAS_file_archive']
+OSASObjectTypes=['OSAS_metaDataFile','OSAS_dir','OSAS_file','OSAS_imageFolder','OSAS_dir_archive','OSAS_file_archive','OSAS_videoFolder','OSAS_videoFile']
 OSASExcludedFiles=['TheVolumeSettingsFolder','TheFindByContentFolder']
 
 
@@ -84,26 +84,35 @@ def getBib(nodelist):
     #print rc
     return rc+"</table>"
 
-def getPropertyOfDirs(indexMeta,property):
+def getPropertyOfDirs(indexMeta,propertyName):
     """gibt Eigenschaften der directorys gemaess Index.metas file in path aus
     @param indexMeta: index.meta file
-    @param propery: Property die ausgegebenwerden soll
+    @param propertyName: Property die ausgegebenwerden soll
     @return: Hash mit key  name des Directories and Value von property, None if error.
     """
     ret={}
     
     try:
         dom=xml.dom.minidom.parseString(indexMeta)
-        for node in dom.getElementsByTagName("dir"):
+
+        rootProp=xml.xpath.Evaluate("/resource/%s"%propertyName,dom)
+        if len(rootProp)==1:
+            property= getText(rootProp[0].childNodes)
+            ret["."]=property
             
-            property= getText(node.getElementsByTagName("content-type")[0].childNodes)
-            dirName=getText(node.getElementsByTagName("name")[0].childNodes)
-            ret[dirName]=property
+        for node in dom.getElementsByTagName("dir"):
+            try:
+                property= getText(node.getElementsByTagName(propertyName)[0].childNodes)
+                dirName=getText(node.getElementsByTagName("name")[0].childNodes)
+                ret[dirName]=property
+            except:
+                ret[dirName]=none
         return ret
     except:
                 
         return ret
 
+                   
 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
@@ -121,7 +130,17 @@ def isImageFolder(path,indexMeta):
     if dirHasProperty(path,indexMeta,'content-type','images'): 
         return 1
     
+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
 
+def isVideoStream(path,indexMeta):
+    if dirHasProperty(path,indexMeta,'container-format','quicktime'):
+        return 1
+    
 def isImageFolderGuess(path):
     """check if folder contains images without metadata or with metadata"""
        #sonst rate ob folder images enthaelten durch test nach suffix