OSA_system2/OSAS_helpers.py - diff

Return to OSAS_helpers.py CVS log

Up to [Repository] / OSA_system2

Diff for /OSA_system2/OSAS_helpers.py between versions 1.4 and 1.6

version 1.4, 2005/02/11 16:27:01	version 1.6, 2005/02/11 20:06:57
Line 84 def getBib(nodelist):	Line 84 def getBib(nodelist):
#print rc	#print rc
return rc+"</table>"	return rc+"</table>"

def getPropertyOfDirs(path,property):	def getPropertyOfDirs(indexMeta,property):
"""gibt Eigenschaften der directorys gemaess Index.metas file in path aus	"""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	@param propery: Property die ausgegebenwerden soll
@return: Hash mit key name des Directories and Value von property, None if error.	@return: Hash mit key name des Directories and Value von property, None if error.
"""	"""
ret={}	ret={}

try:	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"):	for node in dom.getElementsByTagName("dir"):

property= getText(node.getElementsByTagName("content-type")[0].childNodes)	property= getText(node.getElementsByTagName("content-type")[0].childNodes)
Line 103 def getPropertyOfDirs(path,property):	Line 104 def getPropertyOfDirs(path,property):

return ret	return ret

def dirHasProperty(path,propertyName,propertyValue):	def dirHasProperty(path,indexMeta,propertyName,propertyValue):
"""gibt 1 zurück falls path hat propertyName und properName=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 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
"""	"""
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	return 1
else:	else:
return 0	return 0

def isImageFolder(path):	def isImageFolder(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
if dirHasProperty(path,'content-type','images'):	if dirHasProperty(path,indexMeta,'content-type','images'):
return 1	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	#sonst rate ob folder images enthaelten durch test nach suffix
try:	try:
dir=os.listdir(path)	dir=os.listdir(path)
Line 144 def checkOSASFileType(object):	Line 148 def checkOSASFileType(object):
"""	"""
if os.path.split(object)[1][0]=="." or os.path.split(object)[1] in OSASExcludedFiles:	if os.path.split(object)[1][0]=="." or os.path.split(object)[1] in OSASExcludedFiles:
return None	return None
elif isImageFolder(object):	elif isImageFolderGuess(object):
return 'OSAS_imageFolder'	return 'OSAS_imageFolder'
elif os.path.split(object)[1]=="index.meta":	elif os.path.split(object)[1]=="index.meta":
return 'OSAS_metaDataFile'	return 'OSAS_metaDataFile'

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

Removed from v.1.4
changed lines
	Added in v.1.6