version 1.62, 2005/10/10 10:29:12
|
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): |
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]) |
|
|
def sortfnc(sortfield,x,y): |
def sortfnc(sortfield,x,y): |
try: |
try: |
xa=x[1].getMDValue(sortfield) |
xa=x[1].getMDValue(sortfield,generic=generic) |
except: |
except: |
xa="" |
xa="" |
try: |
try: |
ya=y[1].getMDValue(sortfield) |
ya=y[1].getMDValue(sortfield,generic=generic) |
except: |
except: |
ya="" |
ya="" |
return cmp(xa,ya) |
return cmp(xa,ya) |
Line 553 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)==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) |
|
|
Line 608 def ECHO_rerenderLinksMD(self,obj=None,t
|
Line 615 def ECHO_rerenderLinksMD(self,obj=None,t
|
for entry in entries: |
for entry in entries: |
if entry[1].meta_type == 'ECHO_resource': |
if entry[1].meta_type == 'ECHO_resource': |
try: |
try: |
entry[1].ECHO_getResourceMD(template="no") |
entry[1].ECHO_getResourceMD(template="no",overwrite="yes") |
if "title" in types: |
if "title" in types: |
entry[1].generate_title() |
entry[1].generate_title() |
if "label" in types: |
if "label" in types: |
Line 626 def reloadMetaDataFromStorage(self,RESPO
|
Line 633 def reloadMetaDataFromStorage(self,RESPO
|
"""copy metadata from the storage to ECHO""" |
"""copy metadata from the storage to ECHO""" |
ret="" |
ret="" |
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1) |
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1) |
|
if RESPONSE is not None: |
|
RESPONSE.setHeader("Content-Type", type) |
|
RESPONSE.write("<html><body>\n") |
|
|
for resource in resources: |
for resource in resources: |
x=str(resource[1].copyIndex_meta2echo_resource())+"<br>" |
x=str(resource[1].copyIndex_meta2echo_resource())+"<br>" |
|
if RESPONSE is not None: |
|
RESPONSE.write(x+"\n") |
|
|
ret+=x |
ret+=x |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
#RESPONSE.redirect('./manage_main') |
#RESPONSE.redirect('./manage_main') |
return "<html><body>"+ret+"</html></body>" |
RESPONSE.write( "</html></body>") |
|
|
return ret |
return ret |
|
|
Line 737 def checkDiffs(self,metadict):
|
Line 750 def checkDiffs(self,metadict):
|
|
|
for field in tags[1]: |
for field in tags[1]: |
try: |
try: |
if (NoneToEmpty(self.getFieldValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]): |
if (NoneToEmpty(self.getMDValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]): |
diffs[self.getFieldTag(tags,field)]=1 |
diffs[self.getFieldTag(tags,field)]=1 |
else: |
else: |
|
|