--- ECHO_content/ECHO_collection.py 2005/12/04 09:10:55 1.259
+++ ECHO_content/ECHO_collection.py 2006/09/10 11:03:07 1.274
@@ -34,10 +34,11 @@ from Globals import DTMLFile
import Globals
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.PageTemplate import PageTemplate
-from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
+from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate,manage_addPageTemplate
from Globals import Persistent, package_home
from Acquisition import Implicit
from Products.ZCatalog.CatalogPathAwareness import CatalogAware
+from Products.ZCTextIndex.ZCTextIndex import manage_addLexicon
import urllib
import cgi
@@ -70,7 +71,8 @@ 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=""):
@@ -342,7 +344,7 @@ 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().encode('utf-8','ignore'))
+ dom=xml.dom.minidom.parseString(self())
pages=dom.getElementsByTagName('page')
return pages[int(nr)-1].toxml()
@@ -632,9 +634,14 @@ class ECHO_resource(CatalogAware,Folder,
#print ECHO_helpers.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read()
+ tries=0
+ for i in range(10):
+ x=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 x=="ok":
+
+ break;
+
- 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:
RESPONSE.redirect('manage_main')
@@ -792,9 +799,14 @@ class ECHO_resource(CatalogAware,Folder,
params="startpage=%s"%startpage
#print 'http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))
-
- 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'+urllib.quote('?'+params))).read()
-
+
+ tries=0
+ for i in range(10):
+ x=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'+urllib.quote('?'+params))).read()
+ if x=="ok":
+
+ break;
+
path=self.metalink
@@ -823,6 +835,11 @@ class ECHO_resource(CatalogAware,Folder,
return pt()
+ def setLink(self, link=None):
+ """change link field"""
+ if link is not None:
+ self.link = link
+
def getTextToolsField(self,name,default=''):
"""Lese Textoolsfelder aus index.meta im path aus"""
@@ -852,9 +869,17 @@ class ECHO_resource(CatalogAware,Folder,
params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s&digiliburlprefix=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)
-
- 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()+'/newMetaXML'+urllib.quote('?'+params))).read()
-
+ try:
+ tries=0
+ for i in range(10):
+ x=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()+'/newMetaXML'+urllib.quote('?'+params))).read()
+ if x=="ok":
+
+ 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)))
#print self.absolute_url()+'/newMetaXML'+urllib.quote'?'+params)
# hack Pfad auf die Dokumente
path=self.metalink
@@ -863,22 +888,15 @@ class ECHO_resource(CatalogAware,Folder,
path=re.sub('/index.meta','',path)
- path=re.sub(self.REQUEST['SERVER_URL'],'',path)
- path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)
-
- path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
- path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
- path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server
-
- path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server
- path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
- path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
- path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo
-
- path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server
-
- return ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+ #TODO: direct access to the file system necessary, fix that also xmlrpc to the server where the index file is stored is possible
+ parsedUrl=urlparse.urlparse(path)
+ path=parsedUrl[2]
+ 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)
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -1014,6 +1032,25 @@ class ECHO_resource(CatalogAware,Folder,
else:
return ''
+ def getOwnerOriginalsHTML(self):
+ """gibt Liste der foerdernden Institutionen aus"""
+
+ if hasattr(self,'ownerOriginal'):
+ obj=self.ownerOriginal
+ ret=obj.getOwner()
+ return ret
+ else:
+ return ''
+
+ def getDigiCopyByHTML(self):
+ """gibt Liste der foerdernden Institutionen aus"""
+
+ if hasattr(self,'digiCopyBy'):
+ obj=self.digiCopyBy
+ ret=obj.getDigiCopyBy()
+ return ret
+ else:
+ return ''
def getCredits(self):
"""Ausgabe der credits"""
@@ -1187,10 +1224,17 @@ 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"""
-
- 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()
+ zLOG.LOG("ECHO_collection (changeECHO_resource_metadata)",zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])
+ print self.newMetaXML()
+ tries=0
+ for i in range(10):
+ x=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()
+ if x=="ok":
+
+ break;
+
+
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -1199,14 +1243,22 @@ class ECHO_resource(CatalogAware,Folder,
def getMDValueSimpleSearchField(self):
"""returns value for simple search"""
- return " ".join([self.getMDValue('title',generic="yes"),
+
+ try:
+ return " ".join([self.getMDValue('title',generic="yes"),
self.getMDValue('author',generic="yes"),
- self.getMDValue('year',generic="yes"),self.title])
+ 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:
if self.contentType:
@@ -1232,16 +1284,23 @@ class ECHO_resource(CatalogAware,Folder,
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(fieldNameTest,empty)
+
+ ret= self.metaDataHash.get(fieldNameTest,empty)
+
+ if type(ret) is StringType:
+ return ret.decode('utf-8')
+ else:
+ return ret
getFieldValue=getMDValue #depricated
@@ -1253,8 +1312,12 @@ class ECHO_resource(CatalogAware,Folder,
self.copyIndex_meta2echo_resource()
try:
+
+
return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix=digiliburlprefix)
except:
+ #print self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix
+
return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix=digiliburlprefix)
def showMetaDataXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
@@ -1366,7 +1429,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"""
@@ -1480,7 +1542,7 @@ 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
@@ -1496,17 +1558,19 @@ class ECHO_resource(CatalogAware,Folder,
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)
@@ -1616,16 +1680,12 @@ class ECHO_externalLink(Folder,ECHO_basi
"""template fuer content"""
ret= ECHO_basis.content_html(self,'externalLink')
+ if type(ret) is StringType:
+ return ret.decode('utf-8')
+ else:
+ return ret
- try:
- return ret.encode('utf-8')
- except:
- try:
- return ret.decode('latin-1')
- except:
-
- return ret
def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
@@ -1700,7 +1760,7 @@ class ECHO_link(ECHO_externalLink):
meta_type="ECHO_link"
manage_options = ECHO_externalLink.manage_options+(
- {'label':'add links config','action':'ECHO_link_addLinksForm'},
+ {'label':'add links config','action':'ECHO_link_addLinksForm'},
)
def ECHO_link_addLinksForm(self):
@@ -1739,7 +1799,71 @@ class ECHO_link(ECHO_externalLink):
#
# return ret
#
-
+ def getCopyrightsHTML(self):
+ """gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""
+
+ if hasattr(self,'copyrightModel'):
+ obj=self.copyrightModel
+
+ else:
+ return "ERROR"
+ ret=[]
+
+ for copyright in obj.getCopyrights(): #copyright - media / partner / copyrightID
+
+
+ try:
+ if hasattr(self.copyrightTypes,copyright[2]):
+ copyrightTypeObj=getattr(self.copyrightTypes,copyright[2])
+ link="copyrightTypes/"+copyright[2]+'/copyright.html'
+ else:
+ copyrightTypeObj=getattr(obj,copyright[2])
+ link="copyrightModel/"+copyright[2]+'/copyright.html'
+
+ label=copyrightTypeObj.label
+ url=getattr(copyrightTypeObj, 'url', '')
+
+ if url!='':
+ ret.append((url,copyright[0],copyright[1],copyright[2],label))
+ else:
+ if hasattr(copyrightTypeObj, 'copyright.html'):
+ ret.append(("""%s?partner=%s"""%(link,copyright[1]),copyright[0],copyright[1],copyright[2],label))
+ else:
+ ret.append(('empty',copyright[0],copyright[1],copyright[2],label))
+ except:
+ """nothing"""
+
+ return ret
+
+ def getInstitutionsHTML(self):
+ """gibt Liste der foerdernden Institutionen aus"""
+
+ if hasattr(self,'support'):
+ obj=self.support
+ ret=obj.getSupporter()
+ return ret
+ else:
+ return ''
+
+ def getOwnerOriginalsHTML(self):
+ """gibt Liste der foerdernden Institutionen aus"""
+
+ if hasattr(self,'ownerOriginal'):
+ obj=self.ownerOriginal
+ ret=obj.getOwner()
+ return ret
+ else:
+ return ''
+
+ def getDigiCopyByHTML(self):
+ """gibt Liste der foerdernden Institutionen aus"""
+
+ if hasattr(self,'digiCopyBy'):
+ obj=self.digiCopyBy
+ ret=obj.getDigiCopyBy()
+ return ret
+ else:
+ return ''
def index_html(self):
"""standard link"""
@@ -1787,6 +1911,7 @@ def manage_addECHO_link(self,id,title,la
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'
@@ -2178,11 +2303,13 @@ class ECHO_collection(CatalogAware, Fold
retStr="