--- ECHO_content/ECHO_helpers.py 2005/10/10 10:05:06 1.61
+++ ECHO_content/ECHO_helpers.py 2005/12/13 12:45:21 1.69
@@ -14,9 +14,20 @@ from AccessControl import ClassSecurityI
import os.path
from OFS.Folder import Folder
import ECHO_collection
+import base64
+import bz2
+import xmlrpclib
displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder','ECHO_movie']
+
+#decode and compress for xmlrpc communication with OSAS_server
+
+def encodeRPC(string):
+ return base64.encodestring(bz2.compress(string))
+def decodeRPC(string):
+ return bz2.decompress(base64.decodestring(string))
+
def content_html(self,type):
"""template fuer content"""
#templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])
@@ -38,7 +49,9 @@ class ECHO_basis:
"""basis eigenschaften fuer echo objekte"""
security=ClassSecurityInfo()
security.declarePublic('getImageTag')
-
+
+ management_page_charset="utf-8"
+
def manage_addECHO_locale(self,lang,title,label,text=None,content_type=None,RESPONSE=None):
return ECHO_collection.manage_addECHO_locale(self,lang,title,label)
@@ -115,6 +128,10 @@ class ECHO_basis:
return ret
+ def content_html_XMLRpc(self):
+ """xml_rpc_version"""
+ return encodeRPC(self.content_html())
+
def content_html(self,type="collection"):
"""template fuer content bei einbau und ECHO_Umgebung"""
@@ -132,12 +149,6 @@ class ECHO_basis:
else:
return self.decode(self.title)
-
- try:
- return self.title.encode('utf-8','ignore')
- except:
- self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
- return self.title.encode('utf-8','ignore')
def getLabel(self):
"""title"""
@@ -160,13 +171,7 @@ class ECHO_basis:
return ret
return self.decode(self.label)
- try:
- return self.label.encode('utf-8','ignore')
- except:
- self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
- return self.label.encode('utf-8','ignore')
-
-
+
def changeECHOEntriesForm(self):
"""change Entries for the ECHO Navigation environment"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHOEntriesForm')).__of__(self)
@@ -408,7 +413,7 @@ class ECHO_basis:
if hasattr(getattr(self,link),'link'):
cLink=getattr(self,link).link
# if existing delete virtuell path
- if self.REQUEST.hasattr('VirtualRootPhysicalPath'):
+ if hasattr(self.REQUEST,'VirtualRootPhysicalPath'):
cLink=cLink.replace('/'.join(self.REQUEST['VirtualRootPhysicalPath']),'')
if backLink and hasattr(getattr(self,link),'link') and backLink==self.REQUEST['SERVER_URL']+cLink.lstrip():
@@ -531,19 +536,19 @@ def checkOnlyOneInGroup(object):
return displayedObjects[0][1]
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):
return cmp(x[0],y[0])
def sortfnc(sortfield,x,y):
try:
- xa=x[1].getMDValue(sortfield)
+ xa=x[1].getMDValue(sortfield,generic=generic)
except:
xa=""
try:
- ya=y[1].getMDValue(sortfield)
+ ya=y[1].getMDValue(sortfield,generic=generic)
except:
ya=""
return cmp(xa,ya)
@@ -551,33 +556,29 @@ def getSubCols(self, sortfield=None, sub
sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y))
ids=[]
displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes)
-
-
- for entry in displayedObjects:
-
-
- object=entry[1]
- if searchMD and hasattr(object,'getMDValue'):
- flag=0
- for field in searchMD.keys():
- if object.getMDValue(field)==searchMD[field]:
- flag=1
- else:
- flag=0
- break
- if flag==1:
- ids.append(object)
- else:
- ids.append(object)
-
+ 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:
+ object=entry[1]
+ if searchMD and hasattr(object,'getMDValue'):
+ flag=0
+ for field in searchMD.keys():
+ #if object.getMDValue(field,generic=generic)==searchMD[field]:
+ if re.match(searchMD[field],object.getMDValue(field,generic=generic)):
+ flag=1
+ else:
+ flag=0
+ break
+ if flag==1:
+ ids.append(object)
+ else:
+ ids.append(object)
if not sortfield:
sortfield=getattr(self,'sortfield','weight')
-
-
tmplist=[]
-
for x in ids:
-
if hasattr(x,sortfield):
try:
tmp=int(getattr(x,sortfield))
@@ -594,7 +595,9 @@ def getSubCols(self, sortfield=None, sub
else:
tmplist.sort(sortWithMD(sortFieldMD))
- return [x for (key,x) in tmplist]
+ ret=[x for (key,x) in tmplist]
+
+ return ret
def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
"""Rerender all Links"""
@@ -608,7 +611,7 @@ def ECHO_rerenderLinksMD(self,obj=None,t
for entry in entries:
if entry[1].meta_type == 'ECHO_resource':
try:
- entry[1].ECHO_getResourceMD(template="no")
+ entry[1].ECHO_getResourceMD(template="no",overwrite="yes")
if "title" in types:
entry[1].generate_title()
if "label" in types:
@@ -626,14 +629,20 @@ def reloadMetaDataFromStorage(self,RESPO
"""copy metadata from the storage to ECHO"""
ret=""
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
-
+ if RESPONSE is not None:
+ RESPONSE.setHeader("Content-Type", type)
+ RESPONSE.write("\n")
+
for resource in resources:
x=str(resource[1].copyIndex_meta2echo_resource())+"
"
+ if RESPONSE is not None:
+ RESPONSE.write(x+"\n")
+
ret+=x
if RESPONSE is not None:
#RESPONSE.redirect('./manage_main')
- return ""+ret+""
+ RESPONSE.write( "")
return ret
@@ -737,7 +746,7 @@ def checkDiffs(self,metadict):
for field in tags[1]:
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
else:
@@ -754,7 +763,8 @@ def zptFile(self, path, orphaned=False):
# unusual case
pt=PageTemplateFile(os.path.join(package_home(globals()), path))
else:
- pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)
return pt
@@ -844,7 +854,7 @@ def writeMetadata(url,metadict,project=N
metanode.appendChild(node)
if xmlfrag:
- geturl="""
+ geturl="""
@@ -896,7 +906,7 @@ def writeMetadata(url,metadict,project=N
metanode.removeChild(nodeOld[0]).unlink()
metanodeneu=dom.createElement(metaData)
- metanodetext=dom.createTextNode(metadict[metaData])
+ metanodetext=dom.createTextNode(metadict[metaData].decode('utf-8'))
#try:
#metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8"))
#except:
@@ -928,11 +938,9 @@ def writeMetadata(url,metadict,project=N
updateTextToolNode('digiliburlprefix',digiliburlprefix)
try:
- return dom.toxml().encode('utf-8')
+ return dom.toxml(encoding='utf-8').encode('utf-8')
except:
- return dom.toxml('utf-8')
-
-
+ return dom.toxml(encoding='utf-8')
def readMetadata(url):
"""Methode zum Auslesen der Metadateninformation zu einer Resource
@@ -978,8 +986,7 @@ def readMetadata(url):
except:
"""nothing"""
-
- return metadict,""
+ return (metadict,"")
class MapArea(SimpleItem):