--- ECHO_content/ECHO_collection.py 2005/11/03 15:58:16 1.248
+++ ECHO_content/ECHO_collection.py 2005/12/13 12:45:21 1.260
@@ -15,7 +15,7 @@ try:
except:
print "PDF generation will not work"
-
+import urlparse
import string
import tempfile
import re
@@ -50,6 +50,7 @@ from Ft.Xml import EMPTY_NAMESPACE
import Ft.Xml.XPath
import cStringIO
import zLOG
+import sys
try:
from psycopg import libpq
@@ -68,7 +69,7 @@ from ECHO_helpers import *
from ECHO_language import *
from ECHO_movie import *
import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
-
+import xmlrpclib
def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""):
@@ -83,6 +84,90 @@ def setECHO_collectionInformation(self,t
self.credits=toList(credits)
self.weight=weight
+class ECHO_partner(Image,Persistent,ECHO_basis):
+ """ECHO Partner"""
+
+ meta_type="ECHO_partner"
+
+ def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
+ self.__name__=id
+ self.title=title
+ self.url=url
+ self.person=person
+ self.email=email
+ self.country=country
+ self.color=color
+ self.precondition=precondition
+ self.copyrightType=copyrightType
+ data, size = self._read_data(file)
+ content_type=self._get_content_type(file, data, id, content_type)
+ self.update_data(data, content_type, size)
+
+ manage_options = Image.manage_options+(
+ {'label':'Partner Information','action':'ECHO_partner_config'},
+ )
+
+
+ def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None):
+ """Change main information"""
+ self.url=url
+ self.person=person
+ self.email=email
+ self.country=country
+ self.color=color
+ self.copyrightType=copyrightType
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+
+
+ def ECHO_partner_config(self):
+ """Main configuration"""
+ if not hasattr(self,'url'):
+ self.url=""
+ pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt')
+ return pt()
+
+
+manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(),
+ Kind='ECHO_partner',kind='ECHO_partner')
+
+
+
+def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='',
+ REQUEST=None):
+ """
+ Add a new ECHO_partner object.
+
+ Creates a new ECHO_partner object 'id' with the contents of 'file'.
+ Based on Image.manage_addImage
+ """
+
+ id=str(id)
+ title=str(title)
+ content_type=str(content_type)
+ precondition=str(precondition)
+
+ id, title = OFS.Image.cookId(id, title, file)
+
+ self=self.this()
+
+ # First, we create the image without data:
+ self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, content_type, precondition))
+
+ # Now we "upload" the data. By doing this in two steps, we
+ # can use a database trick to make the upload more efficient.
+ if file:
+ self._getOb(id).manage_upload(file)
+ if content_type:
+ self._getOb(id).content_type=content_type
+
+ if REQUEST is not None:
+ try: url=self.DestinationURL()
+ except: url=REQUEST['URL1']
+ REQUEST.RESPONSE.redirect('%s/manage_main' % url)
+ return id
+
class ECHO_locale(ZopePageTemplate):
"""localisierung"""
@@ -314,7 +399,7 @@ class ECHO_resource(CatalogAware,Folder,
def reindex(self):
"""generate fields for indexing and reindex"""
- import urlparse
+
#TODO: korrigieren des metalink pfades konfigurierbar machen
splitted= [x for x in urlparse.urlparse(self.metalink)]
splitted[1]="foxridge.mpiwg-berlin.mpg.de"[0:]
@@ -427,72 +512,128 @@ class ECHO_resource(CatalogAware,Folder,
return ret+self.createSubElementRDF(urn=urn)
- def getAccessRightSelectorHTML(self,outlook="select"):
- """htmlselector"""
- values=['free','mpiwg']
+ def changeAccessRightForm(self,preselect=None):
+ """change the access rights"""
+
+ pt=zptFile(self, 'zpt/ChangeECHO_resourceAccessRight.zpt')
+ return pt(preselect=preselect)
+
+ def changeAccessRight(self):
+ """changeRights"""
+ argv=self.REQUEST.form
+ self.setAccessRightXML(argv["%s_xml"%self.getId()])
+ self.accessRight=argv["%s_echo"%self.getId()]
+
+ self.REQUEST.RESPONSE.redirect('manage_main')
+
+
+ def getAccessRightSelectorHTML(self,outlook="select",xmldominant=None,preselect=None):
+ """htmlselector, xmldominant= in der regel wird der wert des xmlfiles ausgegeben ausser er existiert nicht"""
+ values=['','free','MPIWG']
+ if preselect:#set all to the preselected
+ ar=(preselect,preselect)
+ else:#else set to actual value
+ ar=self.getAccessRightMD()
+
if outlook=="select":
- ret=""""
+ else:
+ if ar[0] is not None:
+ return ret+""
+ else:
+ return "
No xml file (only local selection):"+ret1
else:
ret=""
+ ret1=""
for value in values:
- if value==self.getAccessRightMD():
- ret+="""%s"""%(self.getId(),value,value)
+ if value==ar[0]:
+ ret+="""%s"""%(self.getId(),value,value)
else:
- ret+="""%s"""%(self.getId(),value,value)
- return ret
+ ret+="""%s"""%(self.getId(),value,value)
+
+ if value==ar[1]:
+ ret1+="""%s"""%(self.getId(),value,value)
+ else:
+ ret1+="""%s"""%(self.getId(),value,value)
+
+ if not xmldominant:
+ return ret,ret1
+ else:
+ if ar[0]:
+ return ret
+ else:
+ return "
No xml file (only local selection)
"+ret1
+
+ def copyAccessRightsFromMD(self):
+ """kopiere rechte aus den metadaten"""
+ self.accessRight=self.getAccessRightMD()[0]
+
+
+
+
def getAccessRightMD(self):
"""set accessright"""
url=self.metalink
try:
- geturl=""
- for line in ECHO_helpers.urlopen(url).readlines():
- geturl=geturl+line
-
-
+ urllib.urlopen(url)
except:
- return (None,"Cannot open: "+url)
+ zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ return None,getattr(self,'accessRight','')
+
+
try:
- dom=xml.dom.minidom.parseString(geturl)
- root=dom.getElementsByTagName('resource')[0]
+ dom = NonvalidatingReader.parseUri(url)
except:
- return (None,"Cannot parse: "+url+" "+geturl)
+ zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ return (None,"Cannot parse: "+url+" "+"%s (%s)"%sys.exc_info()[0:2])
- internal=dom.getElementsByTagName('internal')
- if internal:
- institution=dom.getElementsByTagName('institution')
- return getText(institution[0].childNodes)
-
- free=dom.getElementsByTagName('free')
- if free:
- return "free"
- return "free" #default free
+ accessright=dom.xpath("//meta/access-conditions/access/@type")
+ if accessright:
+ accessright=accessright[0].value
+ if str(accessright)=='institution':
+ tmp=dom.xpath("//meta/access-conditions/access/name")
+ if tmp:
+ accessright=getTextFromNode(tmp[0])
+
+ if not accessright:
+ accessright=""
+
+ return accessright,getattr(self,'accessRight','')
def changeAccessRightMD(self,accessright,RESPONSE=None):
- """change the rights"""
-
+ """change the rights - not user anymore"""
+ #TODO: check if method still needed
params="accessright=%s"%accessright
#print ECHO_helpers.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read()
- ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/setAccessRightXML'+urllib.quote('?'+params))).read()
+ ECHO_helpers.urlopen('http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/setAccessRightXML'+urllib.quote('?'+params))).read()
if RESPONSE is not None:
@@ -502,7 +643,13 @@ class ECHO_resource(CatalogAware,Folder,
def setAccessRightXML(self,accessright):
"""set accessright"""
url=self.metalink
-
+ accessrights=['MPIWG','free']#allowes rights
+
+ if accessright =='':
+ """do nothing"""
+ return ""
+
+
try:
geturl=""
for line in ECHO_helpers.urlopen(url).readlines():
@@ -518,48 +665,59 @@ class ECHO_resource(CatalogAware,Folder,
except:
return (None,"Cannot parse: "+url+" "+geturl)
- metanodes=dom.getElementsByTagName('access-conditions')
+ metamains=dom.getElementsByTagName('meta')
+
+ if not metamains:
+ nodenew=dom.createElement('meta')
+ root.appendChild(nodenew)
+ metamain=nodenew
+ else:
+ metamain=metamains[0]
+
+
+ metanodes=metamain.getElementsByTagName('access-conditions')
if not metanodes:
nodenew=dom.createElement('access-conditions')
- root.appendChild(nodenew)
+ metamain.appendChild(nodenew)
metanode=nodenew
else:
metanode=metanodes[0]
accesses=metanode.getElementsByTagName('access')
- if not accesses:
- nodenew2=dom.createElement('access')
- metanode.appendChild(nodenew2)
- metanode2=nodenew2
- else:
- metanode2=accesses[0]
-
- internal=metanode.getElementsByTagName('internal')
+ #delete old
+ if accesses:
+ metanode.removeChild(accesses[0]).unlink()
- if internal:
- metanode2.removeChild(internal[0]).unlink()
-
- free=metanode.getElementsByTagName('free')
+ #create new
+
+ nodenew2=dom.createElement('access')
+ metanode.appendChild(nodenew2)
+ metanode2=nodenew2
- if free:
- metanode2.removeChild(internal[0]).unlink()
-
-
- if accessright=='free':
- nodenew3=dom.createElement('free')
- metanode2.appendChild(nodenew3)
- elif accessright=='mpiwg':
- nodenew3=dom.createElement('internal')
- nodenew4=dom.createElement('institution')
- metanodetext=dom.createTextNode('mpiwg')
+ attribute=metanode2.getAttribute('type')
+
+ if accessright=="free":
+
+ metanode2.setAttribute('type','free')
+
+ elif accessright.upper()=='MPIWG':
+ metanode2.setAttribute('type','institution')
+ nodenew4=dom.createElement('name')
+ metanodetext=dom.createTextNode('MPIWG')
nodenew4.appendChild(metanodetext)
- nodenew3.appendChild(nodenew4)
- metanode2.appendChild(nodenew3)
-
- return dom.toxml().encode('utf-8')
+ nodenew2.appendChild(nodenew4)
+ #print dom.toxml().encode('utf-8')
+ string= encodeRPC(dom.toxml().encode('utf-8'))
+
+ #TODO: make server configurable
+ server=xmlrpclib.Server("http://foxridge.mpiwg-berlin.mpg.de/server")
+ path=urlparse.urlparse(self.metalink)[2]
+
+ server.writeMetaDataFile(path,string,"yes")
+
def setStartPageForm(self):
"""Form for changing the startpage"""
@@ -1029,7 +1187,7 @@ class ECHO_resource(CatalogAware,Folder,
self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]
self.OSAS_meta[self.getFieldTag(tags,field)]=self.REQUEST.form['OSAS_%s'%self.getFieldTag(tags,field)]
except:
- """nothing"""
+ zLOG.LOG("ECHO_collection (changeECHO_resource_metadata)",zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])
ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read()
@@ -1039,15 +1197,32 @@ class ECHO_resource(CatalogAware,Folder,
-
- def getMDValue(self,fieldName,empty=None,generic=None):
+ def getMDValueSimpleSearchField(self):
+ """returns value for simple search"""
+
+ try:
+ return " ".join([self.getMDValue('title',generic="yes"),
+ self.getMDValue('author',generic="yes"),
+ self.getMDValue('year',generic="yes"),self.getTitle()])
+ except:
+
+ #zLOG.LOG(" ECHO_collection(getMDSimpleSearchField)",zLOG.INFO," ".join([self.getMDValue('title',generic="yes"),
+ # self.getMDValue('author',generic="yes"),
+ # self.getMDValue('year',generic="yes"),'']))
+ return ""
+
+ def getMDValue(self,fieldNameTest,empty=None,generic=None):
"""get md values"""
#TODO: cache mappinghash
-
+ fieldName=None
if generic:
- ct=self.contentType.replace(" ","_").lower()
-
+ if self.contentType:
+ ct=self.contentType.replace(" ","_").lower()
+ else:
+ zLOG.LOG("ECHO_collection (getMDValue)", zLOG.INFO, "no_content type for %s"%self.getId())
+ ct=""
+
#caching
if not hasattr(self,'_v_mapHash'): #noch keine cachevariable
self._v_mapHash={}
@@ -1062,19 +1237,28 @@ class ECHO_resource(CatalogAware,Folder,
if not fieldName and hasattr(self.standardMD,ct):
fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0]
self._v_mapHash[ct][fieldNameTest]=fieldName
-
+ if not fieldName:
+ fieldName=fieldNameTest
if not empty:
- #FIXME: warum gibt es manchmal kein metadatahas
+ #FIXME: warum gibt es manchmal kein metadatahas
try:
- return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
+
+ ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
except:
zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId())
return ""
+
else:
- return self.metaDataHash.get(fieldName,empty)
-
+
+ ret= self.metaDataHash.get(fieldNameTest,empty)
+
+ if type(ret) is StringType:
+ return ret.decode('utf-8')
+ else:
+ return ret
+
getFieldValue=getMDValue #depricated
-
+
def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):
"""new index.meta"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
@@ -1147,6 +1331,7 @@ class ECHO_resource(CatalogAware,Folder,
{'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'},
{'label':'set/change startpage','action':'setStartPageForm'},
{'label':'Copy MD for indexing and search','action':'copySearchFields'},
+ {'label':'Change AccessRights','action':'changeAccessRightForm'},
)
@@ -1195,7 +1380,6 @@ class ECHO_resource(CatalogAware,Folder,
if not hasattr(self,'metaDataHash'):
setattr(self,'metaDataHash',{})
self.metaDataHash[field]=value[0:]
-
def copySearchFields(self):
"""copys metadatafields to the object"""
@@ -1309,33 +1493,33 @@ class ECHO_resource(CatalogAware,Folder,
def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"):
"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
(metadict, error)=readMetadata(self.metalink)
-
+
if back:
self.REQUEST.SESSION['back']=back
if not error=="": #Fehler beim Auslesen des Metafiles
return "ERROR:",error
-
+
if (not self.contentType) or (overwrite=="yes"):
- self.contentType=metadict['bib_type']
-
+ self.contentType=metadict['bib_type'].lower()
+
if not (metadict['bib_type'].lower()==self.contentType.lower()):
self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
self.REQUEST.SESSION['contentZope']=self.contentType
return zptFile(self, 'zpt/ECHO_getResourceMDErrorContentType.zpt')()
- self.REQUEST.SESSION['metadict']=metadict
-
+ #self.REQUEST.SESSION['metadict']=metadict
- self.REQUEST.SESSION['diffs']=checkDiffs(self,self.REQUEST.SESSION['metadict'])
+ self.REQUEST.SESSION['diffs']=checkDiffs(self,metadict)
-
if template=="yes":
+ #pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/ECHO_resourceMD.zpt'),metadict=metadict).__of__(self)
pt=zptFile(self, 'zpt/ECHO_resourceMD.zpt')
- return pt()
+
+ return pt(metadict=metadict)
@@ -1443,7 +1627,14 @@ class ECHO_externalLink(Folder,ECHO_basi
security.declarePublic('content_html')
def content_html(self):
"""template fuer content"""
- return ECHO_basis.content_html(self,'externalLink')
+ ret= ECHO_basis.content_html(self,'externalLink')
+
+ if type(ret) is StringType:
+ return ret.decode('utf-8')
+ else:
+ return ret
+
+
def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
@@ -1516,7 +1707,8 @@ class ECHO_link(ECHO_externalLink):
"""external_link"""
meta_type="ECHO_link"
- manage_options = ECHO_externalLink.manage_options+(
+
+ manage_options = ECHO_externalLink.manage_options+(
{'label':'add links config','action':'ECHO_link_addLinksForm'},
)
@@ -1534,16 +1726,29 @@ class ECHO_link(ECHO_externalLink):
def content_html(self):
"""template fuer link"""
-
+
+
if hasattr(self,"link_template"):
ret=ECHO_basis.content_html(self,'link')
+
else:
ret=ECHO_basis.content_html(self,'collection')
- try:
- return ret.decode('utf-8')
- except:
- return ret
+
+ #return ret
+ return ret
+#
+#
+# try:
+# return ret.decode('utf-8')
+# except:
+# try:
+# return ret.decode('latin-1')
+# except:
+#
+# return ret
+#
+
def index_html(self):
"""standard link"""
@@ -1588,16 +1793,23 @@ def manage_addECHO_link(self,id,title,la
RESPONSE.redirect('manage_main')
-class ECHO_collection(Folder, Persistent, Implicit, Cacheable,ECHO_basis):
+class ECHO_collection(CatalogAware, Folder, Persistent, Implicit, Cacheable,ECHO_basis):
"""ECHO Collection"""
+ management_page_charset="utf-8"
security=ClassSecurityInfo()
meta_type='ECHO_collection'
+ default_catalog='resourceCatalog'
+
# viewClassificationList=viewClassificationListMaster
displayTypes=displayTypes
path="/mpiwg/online/permanent/shipbuilding"
+ def getMDValueSimpleSearchField(self):
+ """returns value for simple search"""
+ return " ".join([self.title,self.description])
+
def getTitleAndLabel(self):
"""gibt title und label zurueck"""
return (getattr(self,'title',''),getattr(self,'label',''))
@@ -1706,6 +1918,15 @@ class ECHO_collection(Folder, Persistent
pt=zptFile(self, 'zpt/changeMetaDataLinkForm')
pt.content_type="text/html"
return pt()
+
+ def changeAccessRightsCollectionForm(self,preselect=None):
+ """change access rights of all resources in this collection"""
+
+ pt=zptFile(self, 'zpt/changeAccessRightsCollectionForm')
+ pt.content_type="text/html"
+ return pt(preselect=preselect)
+
+
def changeAccessRightsCollection(self):
"""change"""
ret=""
@@ -1714,11 +1935,15 @@ class ECHO_collection(Folder, Persistent
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
for resource in resources:
- try:
- ret+=resource[1].getId()+" "+argv[resource[1].getId()]+""
- resource[1].changeAccessRightMD(argv[resource[1].getId()])
- except:
- pass
+ if argv.has_key(resource[1].getId()+'_xml'):
+ ret+=resource[1].getId()+" "+argv[resource[1].getId()+'_xml']+""
+ resource[1].setAccessRightXML(argv[resource[1].getId()+'_xml'])
+ resource[1].accessRight=argv[resource[1].getId()+'_xml']
+ elif argv.has_key(resource[1].getId()+'_echo'):
+ ret+="only local:"+resource[1].getId()+" "+argv[resource[1].getId()+'_echo']+""
+ resource[1].accessRight=argv[resource[1].getId()+'_echo']
+ else:
+ ret+="ERROR:" +resource[0]
return ret
def changeMetaDataLinkInCollection(self):
@@ -1796,15 +2021,20 @@ class ECHO_collection(Folder, Persistent
pass
return ret
- def updateCollection(self,RESPONSE=None):
+ def importCollection(self,path=None,RESPONSE=None):
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
- files=os.listdir(self.path)
+
+ if path is None:
+ pt=zptFile(self, 'zpt/importCollection.zpt')
+ return pt()
+
+ files=os.listdir(path)
ret=""
for fileName in files:
if fileName:
- tempPath=re.sub("/mpiwg/online","",self.path)
+ tempPath=re.sub("/mpiwg/online","",path)
link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg"
metalink=self.path+"/"+fileName+"/index.meta"
@@ -1827,20 +2057,6 @@ class ECHO_collection(Folder, Persistent
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
- def updateCollectionMD(self,RESPONSE=None):
- """updateMD"""
- files=os.listdir(self.path)
- for fileName in files:
- if fileName:
- genObj=getattr(self,fileName)
- genObj.copyIndex_meta2echo_resource()
- genObj.generate_title()
-
- if RESPONSE is not None:
- RESPONSE.redirect('manage_main')
-
-
-
def changeViewerTemplateSetsForm(self):
"""change the viewer template set"""
pt=zptFile(self, 'zpt/changeViewerTemplateSet')
@@ -1931,7 +2147,7 @@ class ECHO_collection(Folder, Persistent
RESPONSE.redirect('manage_main')
def copySearchFields(self,RESPONSE=None):
- """copys import metadatafields to the object"""
+ """copys < metadatafields to the object"""
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
for resource in resources:
@@ -2087,14 +2303,19 @@ class ECHO_collection(Folder, Persistent
areas = self.getAllMapAreas()
return self.createJSAreas(areas)
+
+ emptyPartner=ECHO_partner("", "","", "", "", "", "", "", "")
+
security.declarePublic('getCreditObject')
def getCreditObject(self,name):
"""credit id to credititem"""
try:
return getattr(self.partners,name)
except:
- return ""
-
+
+ return self.emptyPartner
+
+
security.declarePublic('ECHO_generateNavBar')
def ECHO_generateNavBar(self):
"""Erzeuge Navigationsbar"""
@@ -2161,8 +2382,9 @@ class ECHO_collection(Folder, Persistent
{'label':'Set Startpage','action':'setStartpageFolderForm'},
{'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'},
{'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
- {'label':'ImportCollection','action':'updateCollection'},
+ {'label':'ImportCollection','action':'importCollection'},
{'label':'Copy MD for indexing and search','action':'copySearchFields'},
+ {'label':'Change access rights', 'action':'changeAccessRightsCollectionForm'},
)
@@ -2259,15 +2481,11 @@ class ECHO_collection(Folder, Persistent
#print "NN",argv
ret = ECHO_basis.content_html(self,'collection')
- try:
- return ret.encode('utf-8')
- except:
-
- try:
- return ret.decode('latin-1')
- except:
-
- return ret
+ if type(ret) is StringType:
+ return ret.decode('utf-8')
+ else:
+ return ret
+
def getCredits(self):
"""Ausgabe der credits"""
@@ -2326,7 +2544,13 @@ class ECHO_collection(Folder, Persistent
getSubCols = ECHO_helpers.getSubCols
-
+
+ def getSubcolsXMLRpc(self,searchSimple):
+ """simplesearch results suitable for xml rpc, gives back array objid,url"""
+
+ return [x.absolute_url() for x in self.getSubCols(searchSimple=searchSimple)]
+
+
Globals.InitializeClass(ECHO_collection)
def manage_addECHO_collectionForm(self):
@@ -2624,7 +2848,11 @@ class ECHO_root(Folder,Persistent,Implic
security=ClassSecurityInfo()
meta_type="ECHO_root"
-
+ management_page_charset="utf-8"
+
+ def mod_re_sub(self,pattern,replace,string):
+ """re.sub aus mod re zur Verfuegung stellen"""
+ return re.sub(pattern,replace,string)
def findObjectFromFulltext(self,existUri):
'''
@@ -2653,7 +2881,7 @@ class ECHO_root(Folder,Persistent,Implic
for resource in resources:
resource[1].reindex()
- print "
done %s
\n"
+ #print "
done %s
\n"
if RESPONSE:
RESPONSE.write("
done %s
\n"%resource[0])
@@ -2942,7 +3170,7 @@ class ECHO_root(Folder,Persistent,Implic
return ret
def getValueFromClass(self,field,found):
- """retattribute falss existing"""
+ """ret attribute if existing"""
try:
return getattr(found,field).decode('ascii','ignore')
@@ -3477,89 +3705,6 @@ def manage_addECHO_copyrightType(self,id
-class ECHO_partner(Image,Persistent,ECHO_basis):
- """ECHO Partner"""
-
- meta_type="ECHO_partner"
-
- def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
- self.__name__=id
- self.title=title
- self.url=url
- self.person=person
- self.email=email
- self.country=country
- self.color=color
- self.precondition=precondition
- self.copyrightType=copyrightType
- data, size = self._read_data(file)
- content_type=self._get_content_type(file, data, id, content_type)
- self.update_data(data, content_type, size)
-
- manage_options = Image.manage_options+(
- {'label':'Partner Information','action':'ECHO_partner_config'},
- )
-
-
- def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None):
- """Change main information"""
- self.url=url
- self.person=person
- self.email=email
- self.country=country
- self.color=color
- self.copyrightType=copyrightType
- if RESPONSE is not None:
- RESPONSE.redirect('manage_main')
-
-
-
- def ECHO_partner_config(self):
- """Main configuration"""
- if not hasattr(self,'url'):
- self.url=""
- pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt')
- return pt()
-
-
-manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(),
- Kind='ECHO_partner',kind='ECHO_partner')
-
-
-
-def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='',
- REQUEST=None):
- """
- Add a new ECHO_partner object.
-
- Creates a new ECHO_partner object 'id' with the contents of 'file'.
- Based on Image.manage_addImage
- """
-
- id=str(id)
- title=str(title)
- content_type=str(content_type)
- precondition=str(precondition)
-
- id, title = OFS.Image.cookId(id, title, file)
-
- self=self.this()
-
- # First, we create the image without data:
- self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, content_type, precondition))
-
- # Now we "upload" the data. By doing this in two steps, we
- # can use a database trick to make the upload more efficient.
- if file:
- self._getOb(id).manage_upload(file)
- if content_type:
- self._getOb(id).content_type=content_type
-
- if REQUEST is not None:
- try: url=self.DestinationURL()
- except: url=REQUEST['URL1']
- REQUEST.RESPONSE.redirect('%s/manage_main' % url)
- return id
class ECHO_linkList(ZopePageTemplate,ECHO_basis):
"""LinkList Objekt"""