--- ECHO_content/ECHO_collection.py 2006/07/27 16:18:16 1.273
+++ ECHO_content/ECHO_collection.py 2008/11/16 12:15:42 1.296
@@ -18,8 +18,9 @@ except:
import urlparse
import string
import tempfile
+import zipfile
import re
-import os
+import os,shutil
import OFS.Image
from types import *
from OFS.Cache import Cacheable
@@ -41,6 +42,7 @@ from Products.ZCatalog.CatalogPathAwaren
from Products.ZCTextIndex.ZCTextIndex import manage_addLexicon
import urllib
+import urllib2
import cgi
import smtplib
import time
@@ -50,7 +52,7 @@ from Ft.Xml import EMPTY_NAMESPACE
import Ft.Xml.XPath
import cStringIO
-import zLOG
+
import sys
try:
@@ -67,11 +69,30 @@ import urllib
import xml.dom.minidom
import ECHO_helpers
from ECHO_helpers import *
-from ECHO_language import *
+
+try:
+ from ECHO_language import *
+except:
+ print "no echo_language"
+ class ECHO_language:
+ """ leere Klasse"""
+ pass
+
from ECHO_movie import *
import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
import xmlrpclib
-
+
+import logging
+
+#ersetzt logging.info
+def logger(txt,method,txt2):
+ """logging"""
+ logging.info(txt+ txt2)
+
+def normalizeCt(str):
+ """normalizes content_type"""
+ #str= str.replace(" ","_")
+ return str.replace("-"," ").lower()
def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""):
@@ -175,12 +196,15 @@ class ECHO_locale(ZopePageTemplate):
meta_type="ECHO_locale"
def __init__(self,id,lang,title,label,text=None,content_type=None):
- self.lang=lang
- self.title=title
- self.label=label
- if text:
- self.pt_edit(text, content_type)
- self.id=id
+ self.lang=lang
+ self.title=title
+ self.label=label
+ # default content
+ if not text:
+ text = open(self._default_content_fn).read()
+ content_type = 'text/html'
+ self.pt_edit(text, content_type)
+ self.id=id
manage_options = ZopePageTemplate.manage_options+(
{'label':'Main Config','action':'change_ECHO_localeForm'},
@@ -197,6 +221,8 @@ class ECHO_locale(ZopePageTemplate):
self.title=title
self.label=label
if not text is None:
+ if content_type is None:
+ content_type = self.content_type
self.pt_edit(text, content_type)
if RESPONSE is not None:
@@ -286,6 +312,8 @@ class ECHO_layoutTemplate(ZopePageTempla
if text is None:
self._default_content_fn = os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%EchoType)
text = open(self._default_content_fn).read()
+ if content_type is None:
+ content_type = self.content_type
self.pt_edit(text, content_type)
@@ -343,7 +371,10 @@ class ECHO_fullText(ZopePageTemplate,ECH
def getPage(self,nr='1'):
"""get page n"""
#return self().encode('latin-1','ignore')
- dom=xml.dom.minidom.parseString(self())
+ try:
+ dom=xml.dom.minidom.parseString(self())
+ except:
+ dom=xml.dom.minidom.parseString(self().encode('latin-1'))
pages=dom.getElementsByTagName('page')
return pages[int(nr)-1].toxml()
@@ -391,7 +422,15 @@ class ECHO_resource(CatalogAware,Folder,
default_catalog='resourceCatalog'
# viewClassificationList=viewClassificationListMaster
-
+ def setPID(self,pid):
+ """set the pid"""
+ self.pid=pid
+ return True
+
+ def getPID(self):
+ """get the pid"""
+ return getattr(self,'pid',None)
+
def PrincipiaSearchSource(self):
"""Return cataloguable key for ourselves."""
return str(self)
@@ -600,7 +639,7 @@ class ECHO_resource(CatalogAware,Folder,
try:
urllib.urlopen(url)
except:
- zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_Resource (getAccessRightMD)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
return None,getattr(self,'accessRight','')
@@ -608,7 +647,7 @@ class ECHO_resource(CatalogAware,Folder,
try:
dom = NonvalidatingReader.parseUri(url)
except:
- zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_Resource (getAccessRightMD)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
return (None,"Cannot parse: "+url+"
"+"%s (%s)"%sys.exc_info()[0:2])
@@ -744,7 +783,7 @@ class ECHO_resource(CatalogAware,Folder,
if (not resourcepath) or (not digiliburlprefix) or (not images):
- zLOG.LOG("ECHO (createImageUrl)",zLOG.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())
+ logger("ECHO (createImageUrl)",logging.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())
return None
resourcepath=resourcepath.replace('/mpiwg/online','')
if not digiliburlprefix: digiliburlprefix="http://echo.mpiwg-berlin.mpg.de/zogilib?"
@@ -877,8 +916,8 @@ class ECHO_resource(CatalogAware,Folder,
break;
except:
- zLOG.LOG("ECHO_ressource (changeViewerTemplateSet)", zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])
- zLOG.LOG("ECHO_ressource (changeViewerTemplateSet)", zLOG.ERROR,'http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)))
+ logger("ECHO_ressource (changeViewerTemplateSet)", logging.ERROR,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_ressource (changeViewerTemplateSet)", logging.ERROR,'http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)))
#print self.absolute_url()+'/newMetaXML'+urllib.quote'?'+params)
# hack Pfad auf die Dokumente
path=self.metalink
@@ -894,8 +933,8 @@ class ECHO_resource(CatalogAware,Folder,
try:
return ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
except:
- zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
- zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.INFO,"http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)
+ logger("ECHO_Resource (changeViewerTemplateSet)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_Resource (changeViewerTemplateSet)", logging.INFO,"http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -917,17 +956,17 @@ class ECHO_resource(CatalogAware,Folder,
"""getFullTextXML; gives the FullText as an XML Document, and if somthing goes wrong."""
try:
- #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink)
+ #logger("ECHO Fulltext",logging.INFO,"open %s"%self.metalink)
fh=ECHO_helpers.urlopen(self.metalink)
- #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"opened %s"%self.metalink)
+ #logger("ECHO Fulltext",logging.INFO,"opened %s"%self.metalink)
dom=xml.dom.minidom.parse(fh)
texttools=dom.getElementsByTagName('texttool')
text=texttools[0].getElementsByTagName('text')
texturl=getText(text[0].childNodes)
- #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl)
+ #logger("ECHO Fulltext",logging.INFO,"found %s"%texturl)
fh.close()
- #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh")
+ #logger("ECHO Fulltext",logging.INFO,"closed fh")
#keine url
if not (texturl.split(":")[0] in ['http','ftp','file']):
if not noredirect:
@@ -937,7 +976,7 @@ class ECHO_resource(CatalogAware,Folder,
if not noredirect:
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
- zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl)
+ logger("ECHO Fulltext",logging.INFO,"redirect to:%s"%texturl)
self.REQUEST.RESPONSE.redirect(texturl)
else:
return texturl
@@ -1090,7 +1129,7 @@ class ECHO_resource(CatalogAware,Folder,
def getContentType(self):
try:
- return self.contentType
+ return normalizeCt(self.contentType)
except:
return ""
@@ -1148,8 +1187,60 @@ class ECHO_resource(CatalogAware,Folder,
+ def changeViewer(self,newViewer):
+ """set newViewer to the url of the new viewer
+ only if metalink is set, otherwise it gives false
+ """
+
+ texterUrl="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Texter?fn=/"
+
+ vl,msg=self.checkValidityOfMetaLink()
+
+ if not vl: #ungueltiger link, versuche neuen
+ newStr=re.match(".*/mpiwg/online/(.*)",self.metalink) # suche pfad hinter /mpiwg/online
+ oldLink=self.metalink
+
+ if newStr:
+ self.metalink=texterUrl+newStr.group(1)
+ vl,msg=self.checkValidityOfMetaLink()
+ else:
+ logging.error("change Viewer XX(mew Metadatafile) %s"%self.metalink)
+ vl=False
+
+ if not vl: # geht immer noch nicht, dann setzte wieder zurueck
+ self.metaLink=oldLink
+
+ logging.info("change Viewer (mew Metadatafile) %s"%self.metalink)
+
+ if vl:
+ self.newViewer=newViewer
+ return vl,msg
+ else:
+ return vl,msg
+
+ def checkValidityOfMetaLink(self):
+ """checks if the metalink is valid xml"""
+
+ ml=self.metalink
+
+ try:
+ txt=urllib.urlopen(ml)
- def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,RESPONSE=None):
+ except:
+ return False,"Cannot open: %s)"%ml
+
+ txt.close()
+ try:
+ dom = NonvalidatingReader.parseUri(ml)
+ except:
+ return False, "Connot parse: %s)"%ml
+
+ if len(dom.xpath("//texttool"))==0:
+ return False, "No texttools: %s)"%ml
+
+ return True,""
+
+ def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,newViewer='',RESPONSE=None):
"""Aenderung der Properties"""
self.resourceID=resourceID
self.title=title
@@ -1163,6 +1254,9 @@ class ECHO_resource(CatalogAware,Folder,
self.link=link
self.metalink=metalink
+ self.newViewer=newViewer
+
+
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -1205,7 +1299,7 @@ class ECHO_resource(CatalogAware,Folder,
def changeECHO_resource_metadata_local(self,RESPONSE=None):
"""change metadata"""
- tags=self.findTagsFromMapping(self.contentType)
+ tags=self.findTagsFromMapping(normalizeCt(self.contentType))
for field in tags[1]:
self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)][0:]
@@ -1216,14 +1310,14 @@ class ECHO_resource(CatalogAware,Folder,
def changeECHO_resource_metadata(self,RESPONSE=None):
"""change metadata"""
- tags=self.findTagsFromMapping(self.contentType)
+ tags=self.findTagsFromMapping(normalizeCt(self.contentType))
self.OSAS_meta={}
for field in tags[1]:
try:
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:
- zLOG.LOG("ECHO_collection (changeECHO_resource_metadata)",zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_collection (changeECHO_resource_metadata)",logging.ERROR,"%s (%s)"%sys.exc_info()[0:2])
print self.newMetaXML()
tries=0
@@ -1249,7 +1343,7 @@ class ECHO_resource(CatalogAware,Folder,
self.getMDValue('year',generic="yes"),self.getTitle()])
except:
- #zLOG.LOG(" ECHO_collection(getMDSimpleSearchField)",zLOG.INFO," ".join([self.getMDValue('title',generic="yes"),
+ #logger(" ECHO_collection(getMDSimpleSearchField)",logging.INFO," ".join([self.getMDValue('title',generic="yes"),
# self.getMDValue('author',generic="yes"),
# self.getMDValue('year',generic="yes"),'']))
return ""
@@ -1262,20 +1356,24 @@ class ECHO_resource(CatalogAware,Folder,
if generic:
if self.contentType:
ct=self.contentType.replace(" ","_").lower()
+ ct=self.contentType.replace("-","_").lower()
else:
- zLOG.LOG("ECHO_collection (getMDValue)", zLOG.INFO, "no_content type for %s"%self.getId())
+ logger("ECHO_collection (getMDValue)", logging.INFO, "no_content type for %s"%self.getId())
ct=""
#caching
if not hasattr(self,'_v_mapHash'): #noch keine cachevariable
self._v_mapHash={}
-
+
+
+
tmp=self._v_mapHash.get(ct,None)
if tmp: #teste ob type schon existiert
fieldName=tmp.get(fieldNameTest,None)
else:
self._v_mapHash[ct]={}
+
#noch nicht gecached
if not fieldName and hasattr(self.standardMD,ct):
fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0]
@@ -1286,20 +1384,17 @@ class ECHO_resource(CatalogAware,Folder,
#FIXME: warum gibt es manchmal kein metadatahas
try:
- ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
+ ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%normalizeCt(self.contentType))
except:
- zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId())
+ logger("ECHO (line 1069)",logging.ERROR,"no md hash for %s"%self.getId())
return ""
else:
ret= self.metaDataHash.get(fieldNameTest,empty)
-
- if type(ret) is StringType:
- return ret.decode('utf-8')
- else:
- return ret
+
+ return unicodify(ret)
getFieldValue=getMDValue #depricated
@@ -1452,11 +1547,12 @@ class ECHO_resource(CatalogAware,Folder,
fields=[]
fieldlist=self.standardMD.fieldList
- tags=self.findTagsFromMapping(self.contentType)
+ tags=self.findTagsFromMapping(normalizeCt(self.contentType))
self.referencetypes=tags[2]
for referenceTypeF in self.referencetypes:
-
- if referenceTypeF[1].title.lower() == referenceType.lower():
+
+
+ if normalizeCt(referenceTypeF[1].title) == normalizeCt(referenceType.lower()):
try:
bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
@@ -1494,7 +1590,7 @@ class ECHO_resource(CatalogAware,Folder,
for referenceTypeF in temp:
#print referenceType
- if referenceTypeF[1].title.lower() == referenceType.lower():
+ if normalizeCt(referenceTypeF[1].title) == normalizeCt(referenceType.lower()):
try:
bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
referenceType=referenceTypeF[1].title
@@ -1521,10 +1617,10 @@ class ECHO_resource(CatalogAware,Folder,
return "ERROR:",error,self.absolute_url()
- self.contentType=metadict['bib_type'][0:]
- fields=self.findTagsFromMapping(self.contentType)
+ self.contentType=normalizeCt(metadict['bib_type'])[0:]
+ fields=self.findTagsFromMapping(normalizeCt(self.contentType))
- #fields=self.findLabelsFromMapping(self.contentType)
+ #fields=self.findLabelsFromMapping(normalizeCt(self.contentType))
for field in fields[1]:
if self.isDefinedInThisSet(fields,field):
@@ -1536,7 +1632,7 @@ class ECHO_resource(CatalogAware,Folder,
if RESPONSE:
return RESPONSE.redirect('manage_main')
- return "OK:",self.absolute_url(),self.contentType
+ return "OK:",self.absolute_url(),normalizeCt(self.contentType)
def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"):
"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
@@ -1549,11 +1645,11 @@ class ECHO_resource(CatalogAware,Folder,
return "ERROR:",error
if (not self.contentType) or (overwrite=="yes"):
- self.contentType=metadict['bib_type'].lower()
+ self.contentType=normalizeCt(normalizeCt(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
+ if not (normalizeCt(metadict['bib_type']).lower()==normalizeCt(self.contentType).lower()):
+ self.REQUEST.SESSION['contentStorage']=normalizeCt(metadict['bib_type'])
+ self.REQUEST.SESSION['contentZope']=normalizeCt(self.contentType)
return zptFile(self, 'zpt/ECHO_getResourceMDErrorContentType.zpt')()
@@ -1600,6 +1696,11 @@ class ECHO_resource(CatalogAware,Folder,
self.REQUEST.RESPONSE.write(fh)
self.REQUEST.RESPONSE.close()
return
+
+ if getattr(self,'newViewer',''): #benutze den neuen viewer
+ url=self.newViewer+'url='+self.metalink+"&mode=texttool"
+ return self.REQUEST.RESPONSE.redirect(url)
+
return self.REQUEST.RESPONSE.redirect(self.link)
def startpage_html(self):
@@ -1634,7 +1735,7 @@ class ECHO_resource(CatalogAware,Folder,
def generate_label(self):
"""Erzeugt_standard_Label aus Template"""
- pt=getattr(self,"label_template_"+self.contentType.lower())
+ pt=getattr(self,"label_template_"+normalizeCt(self.contentType).lower())
self.label=pt()[0:]
return pt()
@@ -1643,7 +1744,7 @@ class ECHO_resource(CatalogAware,Folder,
def generate_title(self,RESPONSE=None):
"""Erzeugt_standard_Label aus Template"""
- pt=getattr(self,"label_template_"+self.contentType.lower())
+ pt=getattr(self,"label_template_"+normalizeCt(self.contentType).lower())
self.title=pt()[0:]
@@ -1686,7 +1787,7 @@ class ECHO_externalLink(Folder,ECHO_basi
- def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
+ def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType):
self.id = id
"""Festlegen der ID"""
@@ -1701,6 +1802,8 @@ class ECHO_externalLink(Folder,ECHO_basi
self.responsible=responsible
coordsnew=[ string.split(x,",") for x in coords]
self.coords=coordsnew
+ self.linkType = linkType # Linktypen 'otherPresentation','external'
+
def ECHO_externalLink_config(self):
"""Main configuration"""
@@ -1716,25 +1819,50 @@ class ECHO_externalLink(Folder,ECHO_basi
return pt()
- def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
+ def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'):
"""Aenderung der Properties"""
setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
self.link=link
+ self.linkType = linkType
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
+ def getLinkType(self):
+ """ return linkType """
+ if hasattr(self,"linkType"):
+ return self.linkType
+ else :
+ return 'otherPresentation'
+
+ def setLinkType(self,type):
+ """ set linkType """
+ self.linkType = type
+
+ def checkLink(self):
+ """ returns tuple (isWorking,Error) """
+ try:
+ urllib2.urlopen(self.link)
+ return (True, '')
+ except urllib2.HTTPError, e:
+ return (False, e.code)
+ except urllib2.URLError, e:
+ return (False, str(e.reason))
+ except:
+ return (False, 'unknown Error')
+
- manage_options = Folder.manage_options+(
+ manage_options = (
{'label':'Main Config','action':'ECHO_externalLink_config'},
{'label':'Graphic Coords','action':'ECHO_graphicEntry'},
- )
+ )+Folder.manage_options
def index_html(self):
"""standard page"""
return self.REQUEST.RESPONSE.redirect(self.link)
+
def manage_addECHO_externalLinkForm(self):
"""Form for external Links"""
@@ -1742,10 +1870,10 @@ def manage_addECHO_externalLinkForm(self
return pt()
-def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
+def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'):
"""Add an external Link"""
- newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords)
+ newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)
self._setObject(id,newObj)
@@ -1883,7 +2011,7 @@ class ECHO_link(ECHO_externalLink):
params['backLink']=self.aq_parent.absolute_url()
params['startLink']=splitted[0]+"?"+urllib.urlencode(params)
-
+
return self.REQUEST.RESPONSE.redirect(splitted[0]+"?"+urllib.urlencode(params))
else:
return ""
@@ -1894,10 +2022,10 @@ def manage_addECHO_linkForm(self):
return pt()
-def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):
+def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,linkType="external",RESPONSE=None):
"""Add an external Link"""
- newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
+ newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)
self._setObject(id,newObj)
@@ -1920,6 +2048,83 @@ class ECHO_collection(CatalogAware, Fold
path="/mpiwg/online/permanent/shipbuilding"
+
+ def exportImportObjects_html(self,RESPONSE):
+ """ImportObject"""
+ pt=zptFile(self, 'zpt/exportImportObjects.zpt')
+ pt.content_type="text/html"
+ return pt()
+
+ def importObjects_html(self,RESPONSE):
+ """ImportObject"""
+ pt=zptFile(self, 'zpt/importObjects.zpt')
+ pt.content_type="text/html"
+ return pt()
+
+ def importObjects(self,zfile,RESPONSE=None,REQUEST=None):
+ """import object from file"""
+
+ zf=zipfile.ZipFile(zfile,"r")
+ tmpdir=tempfile.mkdtemp() # create tempdir
+ ret=None
+
+ for name in zf.namelist():
+ fn=tempfile.mkstemp()[1]
+ tf=file(fn,"w")
+ x=zf.read(name)
+ tf.write(x)
+ tf.close()
+ try:
+ self._importObjectFromFile(fn,set_owner=1)
+ except:
+ if not ret:
+ ret=""
+ ret+="Cannot import: %s (Already existing?)
"%name
+ os.remove(fn)
+
+ if ret:
+ return """
%s"""%ret
+ if RESPONSE:
+ RESPONSE.redirect(self.absolute_url())
+
+ def exportObjects_html(self,RESPONSE):
+ """Export objects"""
+
+ pt=zptFile(self, 'zpt/exportObjects.zpt')
+ pt.content_type="text/html"
+ return pt()
+
+ def exportObjects(self,ids,RESPONSE=None):
+ """export objects with type id"""
+ if not (type(ids) is ListType):
+ ids=[ids]
+
+ tmpdir=tempfile.mkdtemp() # create tempdir
+ objs=self.ZopeFind(self,obj_ids=ids)
+ tmpfile=tempfile.mkstemp()[1]
+
+ zf=zipfile.ZipFile(tmpfile,"w")
+ for obj in objs:
+
+ f = os.path.join(tmpdir, '%s.zexp' %obj[0])
+ #print E.absolute_url()
+
+ obj[1]._p_jar.exportFile(obj[1]._p_oid, f)
+
+ zf.write(f,obj[0])
+
+ zf.close()
+ shutil.rmtree(tmpdir)
+ if RESPONSE:
+ RESPONSE.setHeader("Content-Type","application/octet-stream")
+ len=os.stat(tmpfile)[6]
+ RESPONSE.setHeader("Content-Length",len)
+ RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%"export.zip")
+ fh=file(tmpfile)
+ for x in fh.read():
+ RESPONSE.write(x)
+ fh.close()
+
def getMDValueSimpleSearchField(self):
"""returns value for simple search"""
return " ".join([self.title,self.description])
@@ -1971,16 +2176,16 @@ class ECHO_collection(CatalogAware, Fold
if obj.meta_type=="ECHO_mapText":
if splitted[1]=="en":
- obj.locale_en.pt_edit(REQUEST.form[key],None)
+ obj.locale_en.pt_edit(REQUEST.form[key],obj.locale_en.content_type)
else:
- obj.pt_edit(REQUEST.form[key],None)
+ obj.pt_edit(REQUEST.form[key],obj.content_type)
else:
text=obj.ZopeFind(obj,obj_metatypes=['ECHO_mapText'])
if splitted[1]=="en":
- text[0][1].locale_en.pt_edit(REQUEST.form[key],None)
+ text[0][1].locale_en.pt_edit(REQUEST.form[key],text[0][1].locale_en.content_type)
else:
- text[0][1].pt_edit(REQUEST.form[key],None)
+ text[0][1].pt_edit(REQUEST.form[key],text[0][1].content_type)
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -2205,6 +2410,28 @@ class ECHO_collection(CatalogAware, Fold
else:
return None
+ def changeViewer(self,newViewer,REQUEST=None,RESPONSE=None):
+ """changes all ressources to the newViewer"""
+
+ resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
+ if RESPONSE is not None:
+ RESPONSE.write("")
+
+ for resource in resources:
+
+ done,msg=resource[1].changeViewer(newViewer)
+ if done:
+ if RESPONSE is not None:
+ RESPONSE.write("OK: %s"%resource[0])
+ else:
+ if RESPONSE is not None:
+ RESPONSE.write("
ERROR: %s (%s)"%(resource[1].absolute_url()+'/ECHO_resource_config_main',resource[0],msg))
+
+
+
+ if RESPONSE is not None:
+ RESPONSE.write("
Done
")
+
def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None):
"""change the templates"""
@@ -2254,7 +2481,7 @@ class ECHO_collection(CatalogAware, Fold
if ret and RESPONSE:
RESPONSE.write("ok: %s\n"%txt)
- #zLOG.LOG("ECHO (copyTitleToInfoXMLFolder)",zLOG.INFO,txt)
+ #logger("ECHO (copyTitleToInfoXMLFolder)",logging.INFO,txt)
if RESPONSE is not None:
RESPONSE.write("done!\n")
RESPONSE.close()
@@ -2332,12 +2559,13 @@ class ECHO_collection(CatalogAware, Fold
for resource in dom.getElementsByTagName('resource'):
link=getText(resource.getElementsByTagName('link')[0].childNodes)
label=getText(resource.getElementsByTagName('label')[0].childNodes)
+ pageimglink=getText(resource.getElementsByTagName('pageimglink')[0].childNodes)
#splitted=link.split("?")[0].split("/")
#id=splitted[len(splitted)-1].encode('ascii')
id=re.sub(" ","_",label).encode('ascii')
ret+=""+label+"
"
- manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
+ manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","",pageimglink.encode('ascii'),link.encode('ascii'),"","")
return ret
security.declarePublic('getImageTag')
@@ -2371,8 +2599,24 @@ class ECHO_collection(CatalogAware, Fold
manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None)
return "done"
except:
- return None
+ logging.error("ECHOcollection: (AddResource): %s %s"%sys.exc_info()[0:2])
+ return None
+ def addResourceAndCreateLabelAndTitle(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
+ """SSS"""
+ ret = self.addResource(id,title,label,description,contentType,responsible,link,metalink,weight,credits,coords,RESPONSE)
+ if ret is None:
+ return None
+
+ try:
+ server2=getattr(self,id)
+ server2.copyIndex_meta2echo_resource()
+ server2.generate_label()
+ server2.generate_title()
+ except:
+ logging.error("An Error occured adding the resource A\n %s %s"%sys.exc_info()[0:2])
+ return None
+ return "done"
def getSecondaryLink(self):
"""secondary link"""
try:
@@ -2414,9 +2658,9 @@ class ECHO_collection(CatalogAware, Fold
ret=""""""
return ret+""+getCollection(self,pwstr=pwstr)+""
- def createAllJSAreas(self):
+ def createAllJSAreas(self,mapColTypes=None):
"""create area calls for JavaScript"""
- areas = self.getAllMapAreas()
+ areas = self.getAllMapAreas(mapColTypes=mapColTypes)
return self.createJSAreas(areas)
@@ -2466,7 +2710,7 @@ class ECHO_collection(CatalogAware, Fold
return ECHO_rerenderLinksMD(self,obj,types)
- def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""):
+ def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour="",isVisible=True):
self.id = id
"""Festlegen der ID"""
@@ -2484,6 +2728,7 @@ class ECHO_collection(CatalogAware, Fold
self.secondaryLinkTitle=secondaryLinkTitle
self.secondaryLink=secondaryLink
self.bgcolour=bgcolour
+ self.isVisible=isVisible
manage_options = Folder.manage_options+ Cacheable.manage_options+(
@@ -2493,6 +2738,7 @@ class ECHO_collection(CatalogAware, Fold
{'label':'Localize','action':'localizeObjects'},
{'label':'Change Weights','action':'changeWeights'},
{'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMDWarning'},
+ {'label':'Export/Import Objects','action':'exportImportObjects_html'},
{'label':'Graphic Coords','action':'ECHO_graphicEntry'},
{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
{'label':'Set Startpage','action':'setStartpageFolderForm'},
@@ -2527,7 +2773,7 @@ class ECHO_collection(CatalogAware, Fold
security.declarePublic('changeECHO_collection')
- def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix=""):
+ def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix="",isVisible=True):
"""Aenderung der Properties"""
self.secondaryLink=secondaryLink
@@ -2538,6 +2784,7 @@ class ECHO_collection(CatalogAware, Fold
self.isAlwaysClickable=isAlwaysClickable
self.prefix=prefix[0:]
self.suffix=suffix[0:]
+ self.setIsVisible(isVisible)
setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
@@ -2638,9 +2885,11 @@ class ECHO_collection(CatalogAware, Fold
"""javascript"""
return sendFile(self, 'js/hl_add.js', 'text/plain')
- def getAllMapAreas(self,mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']):
+ def getAllMapAreas(self,mapColTypes=None):
"""Give list of coordinates"""
-
+ if mapColTypes is None:
+ mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']
+
areas=[]
for entry in self.getSubCols(subColTypes=mapColTypes):
object=entry
@@ -2675,11 +2924,11 @@ def manage_addECHO_collectionForm(self):
return pt()
-def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
+def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour="",isVisible=True):
"""add a echo collection"""
- newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="")
+ newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="",isVisible=isVisible)
self._setObject(id,newObj)
@@ -2977,7 +3226,7 @@ class ECHO_root(Folder,Persistent,Implic
{'label':'Copy MD for indexing and search','action':'copySearchFields'},
)
-
+
def copySearchFields(self,RESPONSE=None):
"""copys < metadatafields to the object"""
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
@@ -3290,8 +3539,10 @@ class ECHO_root(Folder,Persistent,Implic
"""ret attribute if existing"""
try:
- return getattr(found,field).decode('ascii','ignore')
+ return getattr(found,field)#.decode('utf-8','ignore')
except:
+ logging.error("can't: decode: %s"%repr(field))
+ logging.error(" %s %s"%(sys.exc_info()[0],sys.exc_info()[1]))
return ""
security.declarePublic('getImageTag')
@@ -3528,7 +3779,10 @@ class ECHO_root(Folder,Persistent,Implic
def formatAscii(self,str,url=None):
"""ersetze ascii umbrueche durch
"""
- #url=None
+
+ if not str:
+ return ""
+
if url:
retStr=""
@@ -3540,11 +3794,13 @@ class ECHO_root(Folder,Persistent,Implic
retStr+="""%s
"""%(strUrl,word)
str=retStr
if str:
- return re.sub(r"[\n]","
",str)
+ str = re.sub(r"[\n]","
",str)
+ return unicodify(str)
else:
- return ""
+ return u""
link2html=vlp_xmlhelpers.link2html
+ related2html=vlp_xmlhelpers.related2html
xml2html=vlp_xmlhelpers.xml2html
@@ -3901,7 +4157,7 @@ class ECHO_linkList(ZopePageTemplate,ECH
def getcontentType(self):
"""get contentType"""
if hasattr(self,'contentType'):
- return self.contentType
+ return normalizeCt(self.contentType)
else:
return 0
@@ -3912,6 +4168,8 @@ class ECHO_linkList(ZopePageTemplate,ECH
self.ZBindings_edit(self._default_bindings)
if text is None:
text = ''
+ if content_type is None:
+ content_type = self.content_type
self.pt_edit(text, contentType)