version 1.64, 2005/11/03 14:45:28
|
version 1.65, 2005/11/25 18:46:40
|
Line 531 def checkOnlyOneInGroup(object):
|
Line 531 def checkOnlyOneInGroup(object):
|
return displayedObjects[0][1] |
return displayedObjects[0][1] |
else: return object |
else: return object |
|
|
def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,generic="yes"): |
def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchSimple=None,generic="yes"): |
|
|
def sort(x,y): |
def sort(x,y): |
return cmp(x[0],y[0]) |
return cmp(x[0],y[0]) |
Line 552 def getSubCols(self, sortfield=None, sub
|
Line 552 def getSubCols(self, sortfield=None, sub
|
displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes) |
displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes) |
|
|
|
|
|
if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'): |
|
searchString=" AND ".join(searchSimple.split()) |
|
ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString})] |
|
|
|
else: |
for entry in displayedObjects: |
for entry in displayedObjects: |
|
|
|
|
Line 560 def getSubCols(self, sortfield=None, sub
|
Line 564 def getSubCols(self, sortfield=None, sub
|
if searchMD and hasattr(object,'getMDValue'): |
if searchMD and hasattr(object,'getMDValue'): |
flag=0 |
flag=0 |
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)): |
flag=1 |
flag=1 |
else: |
else: |
flag=0 |
flag=0 |
break |
break |
if flag==1: |
if flag==1: |
ids.append(object) |
ids.append(object) |
|
|
|
|
else: |
else: |
ids.append(object) |
ids.append(object) |
|
|