--- ECHO_content/ECHO_collection.py 2005/12/13 12:45:21 1.260
+++ ECHO_content/ECHO_collection.py 2006/07/27 15:27:34 1.272
@@ -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
@@ -342,7 +343,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()
@@ -823,6 +824,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 +858,11 @@ 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:
+ 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()
+ 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 +871,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 +1015,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"""
@@ -1189,6 +1209,7 @@ class ECHO_resource(CatalogAware,Folder,
except:
zLOG.LOG("ECHO_collection (changeECHO_resource_metadata)",zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])
+ print self.newMetaXML()
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()
@@ -1249,6 +1270,7 @@ class ECHO_resource(CatalogAware,Folder,
return ""
else:
+
ret= self.metaDataHash.get(fieldNameTest,empty)
@@ -1256,7 +1278,7 @@ class ECHO_resource(CatalogAware,Folder,
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):
@@ -1267,8 +1289,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):
@@ -1513,8 +1539,10 @@ class ECHO_resource(CatalogAware,Folder,
+
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')
@@ -1748,7 +1776,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"""
@@ -2188,11 +2280,13 @@ class ECHO_collection(CatalogAware, Fold
retStr="