version 1.69, 2005/12/13 12:45:21
|
version 1.74, 2006/03/03 22:05:31
|
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"): |
def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,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 555 def getSubCols(self, sortfield=None, sub
|
Line 555 def getSubCols(self, sortfield=None, sub
|
|
|
sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y)) |
sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y)) |
ids=[] |
ids=[] |
displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes) |
displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes,search_sub=search_sub) |
|
|
if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'): |
if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'): |
searchString=" AND ".join(searchSimple.split()) |
searchString=" AND ".join(searchSimple.split()) |
ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString})] |
ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString})] |
else: |
else: |
for entry in displayedObjects: |
for entry in displayedObjects: |
object=entry[1] |
object=entry[1] |
if searchMD and hasattr(object,'getMDValue'): |
if searchMD: |
|
if 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)): |
#if re.match(searchMD[field],object.getMDValue(field,generic=generic)): |
|
if object.getMDValue(field,generic=generic).find(searchMD[field])>-1: |
flag=1 |
flag=1 |
else: |
else: |
flag=0 |
flag=0 |
Line 906 def writeMetadata(url,metadict,project=N
|
Line 909 def writeMetadata(url,metadict,project=N
|
metanode.removeChild(nodeOld[0]).unlink() |
metanode.removeChild(nodeOld[0]).unlink() |
|
|
metanodeneu=dom.createElement(metaData) |
metanodeneu=dom.createElement(metaData) |
|
try: |
|
metanodetext=dom.createTextNode(metadict[metaData]) |
|
except: |
metanodetext=dom.createTextNode(metadict[metaData].decode('utf-8')) |
metanodetext=dom.createTextNode(metadict[metaData].decode('utf-8')) |
#try: |
#try: |
#metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8")) |
#metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8")) |