Diff for /OSA_system2/OSAS_helpers.py between versions 1.7 and 1.12

version 1.7, 2005/03/03 20:41:00 version 1.12, 2010/02/15 19:09:10
Line 2 Line 2
 import os.path  import os.path
 from types import *  from types import *
 import xml.dom.minidom  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']  OSASExcludedFiles=['TheVolumeSettingsFolder','TheFindByContentFolder']
   
   
Line 114  def getPropertyOfDirs(indexMeta,property Line 122  def getPropertyOfDirs(indexMeta,property
   
                                         
 def dirHasProperty(path,indexMeta,propertyName,propertyValue):  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 propertyName:Property von path in index.meta des parent folders von path
     @param propertyValue:Wert der Property      @param propertyValue:Wert der Property
     @param path: Pfad der getestet werden soll      @param path: Pfad der getestet werden soll
Line 133  def isImageFolder(path,indexMeta): Line 141  def isImageFolder(path,indexMeta):
 def isVideoFolder(path,indexMeta):  def isVideoFolder(path,indexMeta):
     """check if folder contains images without metadata or with metadata"""      """check if folder contains images without metadata or with metadata"""
     # metadaten ergeben imagefolder      # metadaten ergeben imagefolder
     print "test video",path  
     if dirHasProperty(path,indexMeta,'media-type','video'):      if dirHasProperty(path,indexMeta,'media-type','video'):
         return 1          return 1
   

Removed from v.1.7  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>