ECHO_content/ECHO_helpers.py - diff

Return to ECHO_helpers.py CVS log

Up to [Repository] / ECHO_content

version 1.74, 2006/03/03 22:05:31	version 1.75, 2006/03/06 14:26:10
Line 537 def checkOnlyOneInGroup(object):	Line 537 def checkOnlyOneInGroup(object):
else: return object	else: return object


def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchSimple=None,generic="yes",search_sub=0):	def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchMD_modus='search',searchSimple=None,generic="yes",search_sub=0):

def sort(x,y):	def sort(x,y):
return cmp(x[0],y[0])	return cmp(x[0],y[0])
Line 569 def getSubCols(self, sortfield=None, sub	Line 569 def getSubCols(self, sortfield=None, sub
for field in searchMD.keys():	for field in searchMD.keys():
#if object.getMDValue(field,generic=generic)==searchMD[field]:	#if object.getMDValue(field,generic=generic)==searchMD[field]:
#if re.match(searchMD[field],object.getMDValue(field,generic=generic)):	#if re.match(searchMD[field],object.getMDValue(field,generic=generic)):
if object.getMDValue(field,generic=generic).find(searchMD[field])>-1:	if searchMD_modus=='match':
	searchResult=re.match(searchMD[field],object.getMDValue(field,generic=generic))
	else:
	searchResult=re.search(searchMD[field],object.getMDValue(field,generic=generic))
	if searchResult:
flag=1	flag=1
else:	else:
flag=0	flag=0