ECHO_content/ECHO_collection.py - diff

Return to ECHO_collection.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.140 and 1.192

-version 1.140, 2004/07/16 17:55:43
+version 1.192, 2004/11/29 20:39:08
  Line 9  class ECHO_externalLink contains informa
  """
+ from reportlab.pdfgen import canvas
+ from reportlab.lib.pagesizes import A4
  import string
+ import tempfile
  import re
  import os
  import OFS.Image
  from types import *
+ from OFS.Cache import Cacheable
  from OFS.Image import Image
  from Globals import DTMLFile
  from OFS.Folder import Folder
- Line 28  from Products.PageTemplates.PageTemplate
+ Line 35  from Products.PageTemplates.PageTemplate
  from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
  from Globals import Persistent, package_home
  from Acquisition import Implicit
- from ECHO_helpers import displayTypes
+ import urllib
+ import smtplib
+ import time
+ from Ft.Xml.Domlette import NonvalidatingReader
+ from Ft.Xml.Domlette import PrettyPrint
+ from Ft.Xml import EMPTY_NAMESPACE
+ import Ft.Xml.XPath
+ import cStringIO
+ import zLOG
  try:
      from psycopg import libpq
- Line 45  import urllib
+ Line 61  import urllib
  import xml.dom.minidom
  from ECHO_graphicalOverview import javaHandler,javaScriptMain
  import ECHO_helpers
+ from ECHO_helpers import *
+ from ECHO_language import *
- def getCopyrightsFromForm(self,argv):
-     medias={}
-     partners={}
-     copyrights={}
-     copyrightsFinal=[]
-     for arg in argv.keys():
-         if arg[0:5]=='media':
-             nm=int(arg[5:])
-             medias[nm]=argv[arg]
-         elif arg[0:5]=='partn':
-             nm=int(arg[5:])
-             partners[nm]=argv[arg]
-         elif arg[0:5]=='copyr':
-             nm=int(arg[5:])
-             copyrights[nm]=argv[arg]
-     copyrightsList=[(medias[nm],partners[nm],copyrights[nm]) for nm in medias.keys()]
-     for copyright in copyrightsList:
-         if copyright[2]=='institution0000':
-             copyrightsFinal.append((copyright[0],copyright[1],self.getPartnerCopyright(copyright[1],'')))
-         else:
-             if not copyright[0]=='':
-                 copyrightsFinal.append(copyright)
-     return copyrightsFinal
- #List of different types for the graphical linking viewer
- viewClassificationListMaster=['view point','area']
- def checkDiffs(self,metadict):
-         """check differences"""
-         def NoneToEmpty(obj):
-             if obj:
-                 return obj
-             else:
-                 return ""
-         diffs={}
-         tags=self.findTagsFromMapping(self.contentType)
-         self.referencetypes=tags[2]
-         self.fields=tags[3]
-         for field in tags[1]:
-             try:
-                 if (NoneToEmpty(self.getFieldValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]):
-                     diffs[self.getFieldTag(tags,field)]=1
-                 else:
-                     diffs[self.getFieldTag(tags,field)]=0
-             except:
-                 diffs[self.getFieldTag(tags,field)]=0
-         return diffs
- def content_html(self,type):
-         """template fuer content"""
-         #templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])
-         #
-         #if templates:
-         #    return templates[0][1]()
-         if hasattr(self,type+"_template"):
-             obj=getattr(self,type+"_template")
-             return obj()
-         else:
-             pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_%s_template_standard.zpt'%type).__of__(self)
-             pt.content_type="text/html"
-             return pt()
- def toList(field):
-     """Einzelfeld in Liste umwandeln"""
-     if type(field)==StringType:
-         return [field]
-     else:
-         return field
- def getText(nodelist):
-     rc = ""
-     for node in nodelist:
-         if node.nodeType == node.TEXT_NODE:
-            rc = rc + node.data
-     return rc
- def sendFile(self, filename, type):
-     """sends an object or a local file (in the product) as response"""
-     paths = filename.split('/')
-     object = self
-     # look for an object called filename
-     for path in paths:
-         if hasattr(object, path):
-         object = getattr(object, path)
-     else:
-         object = None
-         break
-     if object:
-     # if the object exists then send it
-     return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE)
-     else:
-     # send a local file with the given content-type
-     fn = os.path.join(package_home(globals()), filename)
-     self.REQUEST.RESPONSE.setHeader("Content-Type", type)
-     self.REQUEST.RESPONSE.write(file(fn).read())
-     return
- class BrowserCheck:
-     """check the browsers request to find out the browser type"""
-     def __init__(self, zope):
-     self.ua = zope.REQUEST.get_header("HTTP_USER_AGENT")
-     self.isN4 = (string.find(self.ua, 'Mozilla/4.') > -1) and (string.find(self.ua, 'MSIE') < 0)
-     self.isIE = string.find(self.ua, 'MSIE') > -1
-     self.nav = self.ua[string.find(self.ua, '('):]
-     ie = string.split(self.nav, "; ")[1]
-     if string.find(ie, "MSIE") > -1:
-         self.versIE = string.split(ie, " ")[1]
-     self.isMac = string.find(self.ua, 'Macintosh') > -1
-     self.isWin = string.find(self.ua, 'Windows') > -1
-     self.isIEWin = self.isIE and self.isWin
-     self.isIEMac = self.isIE and self.isMac
- def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
-     """Einlesen der Metadaten und und erstellen des geaenderten XML file"""
-     def updateTextToolNode(tag,value):
-         #print dom,tag,value
-         metanode=dom.getElementsByTagName('texttool')[0]
-         try:
-             nodeOld=metanode.getElementsByTagName(tag)
-         except:
-             nodeOld=None
-         if nodeOld:
-             metanode.removeChild(nodeOld[0]).unlink()
-         node=dom.createElement(tag)
-         nodetext=dom.createTextNode(value)
-         node.appendChild(nodetext)
-         metanode.appendChild(node)
-     try:
-         geturl=""
-         for line in urllib.urlopen(url).readlines():
-             geturl=geturl+line
-     except:
-         return (None,"Cannot open: "+url)
-     try:
-         dom=xml.dom.minidom.parseString(geturl)
-     except:
-         return (None,"Cannot parse: "+url+"<br>"+geturl)
-     metanodes=dom.getElementsByTagName('bib')
-     if not metanodes:
-         metanodes=dom.getElementsByTagName('archimedes')
-     metanode=metanodes[0]
-     for metaData in metadict.keys():
-         try:
-             nodeOld=metanode.getElementsByTagName(metaData)
-         except:
-             nodeOld=None
-         if nodeOld:
-             metanode.removeChild(nodeOld[0]).unlink()
-         else:
-             # try also old writing rule - instead of _:
-             try:
-                 nodeOld=metanode.getElementsByTagName(re.sub('_','-',metaData))
-             except:
-                 nodeOld=None
-             if nodeOld:
-                 metanode.removeChild(nodeOld[0]).unlink()
-         metanodeneu=dom.createElement(metaData)
-         try:
-             metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8"))
-         except:
-             metanodetext=dom.createTextNode(metadict[metaData].encode('utf-8'))
-         metanodeneu.appendChild(metanodetext)
-         metanode.appendChild(metanodeneu)
-     if project:
-         updateTextToolNode('project',project)
-     if startpage:
-         updateTextToolNode('startpage',startpage)
-     if topbar:
+ #regexp for extracting elements from xml
-         updateTextToolNode('toptemplate',topbar)
+ patternTXT=r"<\s*txt.*?>(.*?)</txt>"
+ regexpTXT = re.compile(patternTXT, re.IGNORECASE + re.DOTALL)
+ patternPage=r"<\s*page.*?>(.*?)</page>"
+ regexpPage = re.compile(patternPage, re.IGNORECASE + re.DOTALL)
-     if thumbtemplate:
-         updateTextToolNode('thumbtemplate',thumbtemplate)
-     if xslt:
-         updateTextToolNode('xslt',xslt)
-     return dom.toxml().encode('utf-8')
- def readMetadata(url):
-     """Methode zum Auslesen der Metadateninformation zu einer Resource
-     Vorerst noch Typ bib"""
-     metadict={}
-     try:
-         geturl=""
-         for line in urllib.urlopen(url).readlines():
-             geturl=geturl+line
-     except:
-         return (None,"Cannot open: "+url)
-     try:
-         dom=xml.dom.minidom.parseString(geturl)
-     except:
-         return (None,"Cannot parse: "+url+"<br>"+geturl)
-     metanode=dom.getElementsByTagName('bib')
-     metadict['bib_type']='Book'
-     if len(metanode)==0:
-         metanode=dom.getElementsByTagName('archimedes')
-         metadict['bib_type']='Archimedes'
-     if not len(metanode)==0:
-         metacontent=metanode[0].childNodes
-         try:
-             metadict['bib_type']=getText(dom.getElementsByTagName('bib')[0].attributes['type'].childNodes)
-         except:
-             """nothing"""
-         for node in metacontent:
-             try:
-             #print urllib.unquote(getText(node.childNodes)),getText(node.childNodes)
-             metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
-             except:
-                 """nothing"""
-     return metadict,""
  def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs,viewClassification=""):
- Line 354  def setECHO_collectionInformation(self,t
+ Line 104  def setECHO_collectionInformation(self,t
          self.coords=coords[0:]
- class ECHO_copyright(Folder):
+ class ECHO_copyright(Folder,ECHO_basis):
      """Copyright informationen"""
      meta_type="ECHO_copyright"
- Line 374  class ECHO_copyright(Folder):
+ Line 124  class ECHO_copyright(Folder):
          {'label':'Main Config','action':'ECHO_copyright_configForm'},
          )
      def ECHO_copyright_configForm(self):
          """change form"""
          pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_copyright').__of__(self)
- Line 409  def manage_addECHO_copyright(self, id,ti
+ Line 160  def manage_addECHO_copyright(self, id,ti
      if RESPONSE is not None:
          RESPONSE.redirect('manage_main')
- class ECHO_layoutTemplate(ZopePageTemplate):
+ class ECHO_layoutTemplate(ZopePageTemplate,ECHO_basis):
      """Create a layout Template for different purposes"""
      meta_type="ECHO_layoutTemplate"
- Line 432  class ECHO_layoutTemplate(ZopePageTempla
+ Line 183  class ECHO_layoutTemplate(ZopePageTempla
  def manage_addECHO_layoutTemplateForm(self):
      """Form for adding"""
-     pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_layoutTemplate.zpt').__of__(self)
+     pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddECHO_layoutTemplate.zpt')).__of__(self)
      return pt()
  from urllib import quote
- Line 477  def manage_addECHO_layoutTemplate(self,
+ Line 228  def manage_addECHO_layoutTemplate(self,
      REQUEST.RESPONSE.redirect(u+'/manage_main')
      return ''
- class ECHO_resource(Folder,Persistent):
+ class ECHO_fullText(ZopePageTemplate,ECHO_basis,ECHO_language):
+     """echo fulltext in xml"""
+     meta_type="ECHO_fullText"
+     def getPage(self,nr='1'):
+         """get page n"""
+         dom=xml.dom.minidom.parseString(self())
+         pages=dom.getElementsByTagName('page')
+         return pages[int(nr)-1].toxml('utf-8')
+ # Product registration and Add support
+ manage_addECHO_fullTextForm = PageTemplateFile(
+     'zpt/AddECHO_fullText.zpt', globals())
+ from urllib import quote
+ def manage_addECHO_fullText(self, id, title=None, text=None,
+                            REQUEST=None, submit=None):
+     "Add a Page Template with optional file content."
+     id = str(id)
+     if REQUEST is None:
+         self._setObject(id, ECHO_fullText(id, text))
+         ob = getattr(self, id)
+         if title:
+             ob.pt_setTitle(title)
+         return ob
+     else:
+         file = REQUEST.form.get('file')
+         headers = getattr(file, 'headers', None)
+         if headers is None or not file.filename:
+             zpt = ECHO_fullText(id)
+         else:
+             zpt = ECHO_fullText(id, file, headers.get('content_type'))
+         self._setObject(id, zpt)
+         try:
+             u = self.DestinationURL()
+         except AttributeError:
+             u = REQUEST['URL1']
+         if submit == " Add and Edit ":
+             u = "%s/%s" % (u, quote(id))
+         REQUEST.RESPONSE.redirect(u+'/manage_main')
+     return ''
+ class ECHO_resource(Folder,Persistent,ECHO_basis):
      """ECHO Ressource"""
      security=ClassSecurityInfo()
      meta_type='ECHO_resource'
- Line 487  class ECHO_resource(Folder,Persistent):
+ Line 289  class ECHO_resource(Folder,Persistent):
      getSubCols = ECHO_helpers.getSubCols
      security.declareProtected('View','index_html')
-     def getRDF(self):
-         """rdf"""
-         ret=""
-         about="""<RDF:Description about="%s">"""
-         name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
-         link="""<ECHONAVIGATION:link>%s</ECHONAVIGATION:link>"""
-         urn="urn:"+re.sub('/',':',self.absolute_url())
-         about2=about%urn
-         name2=name%self.getId()
-         link2=link%self.link
-         ret=about2+"\n"+name2+"\n"+link2+"\n"+"</RDF:description>"
-         return ret
+     security.declareProtected('View','createPDF')
+     def createPDF(self,RESPONSE=None,local=None,dpi=150):
+         """erzeuge pdf file"""
+         pages=1
+         imagePath=self.getImagePath().replace("/mpiwg/online","")
+         image="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Scaler?fn="+imagePath+"&dw=%i&dh=%i&pn=%i"
+         xmlInfo="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/dlInfo-xml.jsp?fn="+imagePath
+         dom=xml.dom.minidom.parse(urllib.urlopen(xmlInfo))
+         for parameter in dom.getElementsByTagName('parameter'):
+             if parameter.getAttribute('name')=="pt":
+                 pages=int(parameter.getAttribute('value'))
+                 break
+         tempfile.tempdir="/tmp/archivesImageServer"
+         tmpPath=tempfile.mktemp()
+         tmpZip=tempfile.mktemp()+".pdf"
+         tmpFn=os.path.split(tmpZip)[1]
+         if not os.path.exists(tempfile.tempdir):
+             os.mkdir(tempfile.tempdir)
+         if not os.path.exists(tmpPath):
+             os.mkdir(tmpPath)
+         if RESPONSE:
+             RESPONSE.setHeader("Content-Type","text/html")
+             RESPONSE.write("<h1>I am creating  the pdf</h1>")
+             txt="<h3>1. step: getting the images( %i pages)</h3>"%pages
+             RESPONSE.write(txt)
+         c=canvas.Canvas(tmpZip)
+         for i in range(1,pages):
+             if RESPONSE:
+                 RESPONSE.write(str("<p>Get Page: %i<br>\n"%i))
+             faktor=dpi/72.0
+             fn=tmpPath+"/%i.png"%i
+             width,height=A4
+             #print image%(width*faktor,height*faktor,i)
+             url=urllib.urlopen(image%(width*faktor,height*faktor,i)).read()
+             fh=file(fn,"w")
+             fh.write(url)
+             fh.close()
+             c.drawImage(fn,0,0,width=width,height=height)
+             c.showPage()
+         c.save()
+         if RESPONSE:
+             RESPONSE.write("<p>finished<br>\n")
+         if RESPONSE:
+             len=os.stat(tmpZip)[6]
+             downloadUrl=self.absolute_url()+"/downloadPDF"
+             RESPONSE.write("""<h1><a href="downloadPDF?fn=%s">Click here for download ( %i Byte)</a></h1>\n"""%(tmpFn,len))
+             RESPONSE.write("""<p>The file will be stored for a while, you can download it later, the URL is:</p>
+             <p><a href="downloadPDF?fn=%s">%s?fn=%s</a></h1>\n"""%(tmpFn,downloadUrl,tmpFn))
+             RESPONSE.close()
+     def downloadPDF(self,fn):
+         """download prepared set"""
+         filename="/tmp/archivesImageServer/"+fn
+         namePDF=self.getId()+".pdf"
+         self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%namePDF)
+         self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
+         len=os.stat(filename)[6]
+         self.REQUEST.RESPONSE.setHeader("Content-Length",len)
+         images=file(filename).read()
+         self.REQUEST.RESPONSE.write(images)
+         self.REQUEST.RESPONSE.close()
+     def getRDF(self,urn=None):
+         """rdf"""
+         ret=getRDFDescription(self,self.link,urn=urn)
+         return ret+self.createSubElementRDF(urn=urn)
      def getAccessRightSelectorHTML(self,outlook="select"):
- Line 520  class ECHO_resource(Folder,Persistent):
+ Line 397  class ECHO_resource(Folder,Persistent):
          else:
              ret=""
              for value in values:
-                 print
                  if value==self.getAccessRightMD():
                      ret+="""<input type="radio" name="%s" value="%s" checked>%s"""%(self.getId(),value,value)
                  else:
- Line 535  class ECHO_resource(Folder,Persistent):
+ Line 412  class ECHO_resource(Folder,Persistent):
          try:
              geturl=""
-             for line in urllib.urlopen(url).readlines():
+             for line in ECHO_helpers.urlopen(url).readlines():
                  geturl=geturl+line
- Line 565  class ECHO_resource(Folder,Persistent):
+ Line 442  class ECHO_resource(Folder,Persistent):
          params="accessright=%s"%accessright
-         #print urllib.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read()
+         #print ECHO_helpers.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read()
-         urllib.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://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()
          if RESPONSE is not None:
- Line 581  class ECHO_resource(Folder,Persistent):
+ Line 458  class ECHO_resource(Folder,Persistent):
          try:
              geturl=""
-             for line in urllib.urlopen(url).readlines():
+             for line in ECHO_helpers.urlopen(url).readlines():
                  geturl=geturl+line
- Line 645  class ECHO_resource(Folder,Persistent):
+ Line 522  class ECHO_resource(Folder,Persistent):
              return pt()
+     def createImageUrl(self,pn=1):
+         """create ImageUrl"""
+         resourcepath=readFieldFromXML(self.metalink,'resource','archive-path')
+         digiliburlprefix=readFieldFromXML(self.metalink,'texttool','digiliburlprefix')
+         images=readFieldFromXML(self.metalink,'texttool','image')
+         if (not resourcepath) or (not digiliburlprefix) or (not images):
+             zLOG.LOG("ECHO (createImageUrl)",zLOG.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?"
+         if (not images) or (not resourcepath): return None
+         return "%sfn=%s&pn=%i"%(digiliburlprefix,resourcepath+"/"+images,pn)
+     def copyTitleToInfoXML(self,RESPONSE=None):
+         """copy title from the resource"""
+         presentationXML=readFieldFromXML(self.metalink,'texttool','presentation')
+         resourcepath=readFieldFromXML(self.metalink,'resource','archive-path')
+         if (not presentationXML) or (not resourcepath):
+         if RESPONSE:
+             RESPONSE.write("Error: %s\n"%self.getId())
+         else:
+             return None,self.absolute_url()
+         try:
+             fh=file(os.path.join(resourcepath,presentationXML),'w')
+             fh.write("""<info>
+             <author></author>
+             <title>%s</title>
+             <date></date>
+             <display>yes</display>
+             </info>"""%self.title)
+             fh.close()
+             return 1,self.getId()
+         except:
+             if RESPONSE:
+                 RESPONSE.write("Error: %s\n"%self.getId())
+             else:
+                 return None,self.absolute_url()
      def setStartPage(self,startpage=None,RESPONSE=None):
          """set start page, if no startpage defined use the generic one of the resource"""
-         if (not (type(startpage)==StringType)) and ("__generic" in startpage): # checke ob generic in der liste
+         if (not (type(startpage)==StringType)):
+             if ("__generic" in startpage): # checke ob generic in der liste
              startpage=self.absolute_url()+"/startpage_html"
+             elif ("__firstPage" in startpage): # checke ob generic in der liste
+                 startpage=self.createImageUrl()
-         if (not startpage) or (startpage=="__generic"):
+         if (not startpage):
               startpage=self.absolute_url()+"/startpage_html"
+         elif (startpage=="__generic"):
+             startpage=self.absolute_url()+"/startpage_html"
+         elif (startpage=="__firstPage"):
+                 startpage=self.createImageUrl()
          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))
-         urllib.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()
+         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()
          path=self.metalink
- Line 668  class ECHO_resource(Folder,Persistent):
+ Line 599  class ECHO_resource(Folder,Persistent):
          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://content.mpiwg-berlin.mpg.de','',path) # falls content als server
          path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
+         path=re.sub('http://vision.mpiwg-berlin.mpg.de','',path) # falls vision als server
+         path=re.sub('http://xserve02.mpiwg-berlin.mpg.de:18880','',path) # falls vision als server
+         path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo
          path=re.sub('/index.meta','',path)
-         urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+         ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
          if RESPONSE is not None:
              RESPONSE.redirect('manage_main')
- Line 683  class ECHO_resource(Folder,Persistent):
+ Line 618  class ECHO_resource(Folder,Persistent):
              return pt()
      def getTextToolsField(self,name,default=''):
          """Lese Textoolsfelder aus index.meta im path aus"""
- Line 701  class ECHO_resource(Folder,Persistent):
+ Line 637  class ECHO_resource(Folder,Persistent):
              return default
-     def changeViewerTemplateSet(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,RESPONSE=None):
+     def changeViewerTemplateSet(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None):
          """changeit"""
-         paramList=['project','startpage','xslt','thumbtemplate','topbar','digiLibTemplate']
+         paramList=['project','startpage','xslt','thumbtemplate','topbar','digiLibTemplate','digiliburlprefix']
          #writeMetadata(self.metalink,self.metaDataHash,project,None,xslt,thumbtemplate,topbar,digiLibTemplate)
-         params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate)
+         params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s&digiliburlprefix=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)
-         urllib.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()
+         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()
+         #print self.absolute_url()+'/newMetaXML'+urllib.quote'?'+params)
          # hack Pfad auf die Dokumente
          path=self.metalink
- Line 730  class ECHO_resource(Folder,Persistent):
+ Line 667  class ECHO_resource(Folder,Persistent):
          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()
-         return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
          if RESPONSE is not None:
              RESPONSE.redirect('manage_main')
-     def getTitle(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"""
-     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 content_html(self):
          """template fuer content"""
-         return content_html(self,'resource')
+         return ECHO_basis.content_html(self,'resource')
      def getViewClassification(self):
          if hasattr(self,'viewClassification'):
- Line 765  class ECHO_resource(Folder,Persistent):
+ Line 693  class ECHO_resource(Folder,Persistent):
      def getFullTextXML(self,noredirect=None):
          """getFullTextXML; gives the FullText as an XML Document, and <error></error> if somthing goes wrong."""
          try:
-             fh=urllib.urlopen(self.metalink)
+             #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink)
+             fh=ECHO_helpers.urlopen(self.metalink)
+             #zLOG.LOG("ECHO Fulltext",zLOG.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)
+                     fh.close()
+             #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh")
+             #keine url
+             if not (texturl.split(":")[0] in ['http','ftp','file']):
+             if not noredirect:
+                 return file(texturl).read()
+                         else:
+                 return texturl
              if not noredirect:
                              self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+                     zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl)
                  self.REQUEST.RESPONSE.redirect(texturl)
              else:
                  return texturl
- Line 785  class ECHO_resource(Folder,Persistent):
+ Line 727  class ECHO_resource(Folder,Persistent):
              else:
                  return "<error>no fulltext available</error>"
+     def getImagePath(self):
+         """gibt pfad zum image aus"""
+         return self.getImageView(noredirect="yes",onlyPath="yes")
+     def getImageView(self,noredirect=None,onlyPath=None):
+         """getImages; give Imageviewr  and <error></error> if somthing goes wrong."""
+         try:
+             fh=ECHO_helpers.urlopen(self.metalink)
+             dom=xml.dom.minidom.parse(fh)
+             texttools=dom.getElementsByTagName('texttool')
+             text=texttools[0].getElementsByTagName('image')
+             imagetemp=getText(text[0].childNodes)
+             text=dom.getElementsByTagName('archive-path')
+             archivepath=getText(text[0].childNodes)
+             archivepath=re.sub('/mpiwg/online/','',archivepath)
+             imageurl="http://echo.mpiwg-berlin.mpg.de/zogilib?fn="+archivepath+"/"+imagetemp
+             fh.close()
+             if not noredirect:
+                             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+                 self.REQUEST.RESPONSE.redirect(imageurl)
+             else:
+                 if not onlyPath:
+                     return imageurl
+                 else:
+                     return archivepath+"/"+imagetemp
+         except:
+             if not noredirect:
+                 self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+                 self.REQUEST.RESPONSE.write("<error>no fulltext available</error>")
+             else:
+                 return "<error>no images available</error>"
      def getCopyrightsHTML(self):
          """gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""
- Line 795  class ECHO_resource(Folder,Persistent):
+ Line 773  class ECHO_resource(Folder,Persistent):
              return "ERROR"
          ret=[]
-         for copyright in obj.getCopyrights():
+         for copyright in obj.getCopyrights(): #copyright - media / partner / copyrightID
-             link="copyrightTypes/"+copyright[2]+'/copyright.html'
              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=copyrightTypeObj.url
+                 url=getattr(copyrightTypeObj, 'url', '')
                  if url!='':
                       ret.append((url,copyright[0],copyright[1],copyright[2],label))
- Line 816  class ECHO_resource(Folder,Persistent):
+ Line 799  class ECHO_resource(Folder,Persistent):
          return ret
+     def getInstitutionsHTML(self):
+         """gibt Liste der frdernden Institutionen aus"""
+         if hasattr(self,'support'):
+             obj=self.support
+             ret=obj.getSupporter()
+             return ret
+         else:
+             return ''
      def getCredits(self):
          """Ausgabe der credits"""
          if self.credits:
- Line 850  class ECHO_resource(Folder,Persistent):
+ Line 844  class ECHO_resource(Folder,Persistent):
      def getCoords(self):
-         """gibt coordinaten als String zur�ck und l�scht zugleich eintr�ge die keine Koordinaten sind, letzteres zur korrektur der Eingabe der alten version"""
+         """gibt coordinaten als String zurück und löscht zugleich einträge die keine Koordinaten sind, letzteres zur korrektur der Eingabe der alten version"""
          retList=[]
          if hasattr(self,'coords'):
              for x in self.coords:
- Line 928  class ECHO_resource(Folder,Persistent):
+ Line 922  class ECHO_resource(Folder,Persistent):
      def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,RESPONSE=None):
-         """�nderung der Properties"""
+         """Änderung der Properties"""
      self.resourceID=resourceID
      self.title=title
      self.label=label
- Line 946  class ECHO_resource(Folder,Persistent):
+ Line 940  class ECHO_resource(Folder,Persistent):
      def changeECHO_resource_coords(self,coords,viewClassification,RESPONSE=None):
-         """�nderung der Properties - coords"""
+         """Änderung der Properties - coords"""
      if type(coords)==StringType:
              coords=[coords]
- Line 963  class ECHO_resource(Folder,Persistent):
+ Line 957  class ECHO_resource(Folder,Persistent):
              RESPONSE.redirect('manage_main')
      def changeECHO_resource_credits(self,credits,responsible,copyrightType,RESPONSE=None):
-         """�nderung der Properties"""
+         """Änderung der Properties"""
      self.credits=credits
      self.responsible=responsible
      self.copyrightType=copyrightType
- Line 994  class ECHO_resource(Folder,Persistent):
+ Line 988  class ECHO_resource(Folder,Persistent):
              except:
                  """nothing"""
-         urllib.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()
+         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 RESPONSE is not None:
              RESPONSE.redirect('manage_main')
-     def getMDValue(self,fieldName):
+     def getMDValue(self,fieldName,empty=None):
+         if empty:
          return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
-     def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
+         else:
+             return self.metaDataHash.get(fieldName,empty)
+     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')
- Line 1012  class ECHO_resource(Folder,Persistent):
+ Line 1010  class ECHO_resource(Folder,Persistent):
              self.copyIndex_meta2echo_resource()
          try:
-             return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
+             return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix=digiliburlprefix)
          except:
-             return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
+             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):
+         """schreibe md"""
+         try:
+             return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,xmlfrag="yes")
+         except:
+             return "<error> no metadata stored</error>"
      def getMetaDataXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
          """prints out metadata as stored in the echo environment, format is the index.meta format"""
- Line 1022  class ECHO_resource(Folder,Persistent):
+ Line 1029  class ECHO_resource(Folder,Persistent):
          return writeMetadata(self.metalink,self.metaDataHash)
      def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None):
-         """�nderung der Properties"""
+         """Änderung der Properties"""
      try:
              coordsnew=[ string.split(x,",") for x in coords]
- Line 1045  class ECHO_resource(Folder,Persistent):
+ Line 1052  class ECHO_resource(Folder,Persistent):
      {'label':'Change Coords','action':'ECHO_resource_config_coords'},
      {'label':'Add coords','action':'ECHO_graphicEntry'},
          {'label':'Sync Metadata','action':'ECHO_getResourceMD'},
-     {'label':'Change TemplateSets','action':'changeViewerTemplateSetForm'},
+     {'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'},
      {'label':'set/change startpage','action':'setStartPageForm'},
      {'label':'Copy MD for indexing and search','action':'copySearchFields'},
      )
- Line 1225  class ECHO_resource(Folder,Persistent):
+ Line 1232  class ECHO_resource(Folder,Persistent):
          self.metaDataHash={}
          if not error=="": #Fehler beim Auslesen des Metafiles
-             return "ERROR:",error
+             return "ERROR:",error,self.absolute_url()
          self.contentType=metadict['bib_type'][0:]
          fields=self.findTagsFromMapping(self.contentType)
- Line 1279  class ECHO_resource(Folder,Persistent):
+ Line 1286  class ECHO_resource(Folder,Persistent):
          """Ausgabe der MD"""
          return getattr(self,item)
+     def checkRDF(self,path):
+         """check if pdf in the path"""
+         try:
+             for fileName in os.listdir(path):
+                 if os.path.splitext(fileName)[1]==".pdf":
+                     return os.path.join(path,fileName)
+             return None
+         except:
+             return None
      def index_html(self):
          """standard page"""
+         pdf=self.checkRDF(self.link)
+     if pdf:
+         fh=file(pdf,'r').read()
+         self.REQUEST.RESPONSE.setHeader('Content-Type','x-Application/pdf')
+         self.REQUEST.RESPONSE.write(fh)
+         self.REQUEST.RESPONSE.close()
+         return
          return self.REQUEST.RESPONSE.redirect(self.link)
      def startpage_html(self):
- Line 1294  class ECHO_resource(Folder,Persistent):
+ Line 1318  class ECHO_resource(Folder,Persistent):
          if sp:
              return sp[1]()
-             #pr�fen ob irgendwo ein template
+             #prüfen ob irgendwo ein template
          if hasattr(self,'startpage_index_template'):
              return self.startpage_index_template()
- Line 1351  def manage_addECHO_resource(self,id,titl
+ Line 1375  def manage_addECHO_resource(self,id,titl
          RESPONSE.redirect('manage_main')
- class ECHO_externalLink(Folder):
+ class ECHO_externalLink(Folder,ECHO_basis):
      """Link zu einer externen Ressource"""
      security=ClassSecurityInfo()
      meta_type='ECHO_externalLink'
-     def getTitle(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"""
-     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 content_html(self):
          """template fuer content"""
-         return content_html(self,'externalLink')
+         return ECHO_basis.content_html(self,'externalLink')
      def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
- Line 1408  class ECHO_externalLink(Folder):
+ Line 1417  class ECHO_externalLink(Folder):
      def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
-         """�nderung der Properties"""
+         """Änderung der Properties"""
      try:
          coordsnew=[ string.split(x,",") for x in coords]
      except:
- Line 1458  class ECHO_link(ECHO_externalLink):
+ Line 1467  class ECHO_link(ECHO_externalLink):
      def content_html(self):
          """template fuer link"""
          if hasattr(self,"link_template"):
-             return content_html(self,'link')
+             return ECHO_basis.content_html(self,'link')
          else:
-             return content_html(self,'collection')
+             return ECHO_basis.content_html(self,'collection')
  def manage_addECHO_linkForm(self):
          """Form for external Links"""
- Line 1479  def manage_addECHO_link(self,id,title,la
+ Line 1488  def manage_addECHO_link(self,id,title,la
          RESPONSE.redirect('manage_main')
- class ECHO_collection(Folder, Persistent, Implicit):
+ class ECHO_collection(Folder, Persistent, Implicit, Cacheable,ECHO_basis):
      """ECHO Collection"""
      security=ClassSecurityInfo()
- Line 1489  class ECHO_collection(Folder, Persistent
+ Line 1498  class ECHO_collection(Folder, Persistent
      path="/mpiwg/online/permanent/shipbuilding"
-     def showRDF(self):
+     def getRDF(self,urn=None):
-         ret="""<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
-         ret+=self.getRDF()+"\n"
-         ret+="""</RDF:RDF>"""
-     def getRDF(self):
          """rdf of the collection"""
-         contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
-         about="""<RDF:Description about="%s">"""
-         name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
-         urn="urn:"+re.sub('/',':',self.absolute_url())
+         contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
-         about2=about%urn
+         ret=getRDFDescription(self,self.absolute_url(),urn=urn)
-         name2=name%self.getId()
+         if not urn:
+             urn=self.absolute_url()
-         ret=about2+"\n"+name2+"\n"+"</RDF:description>"
+         li="""<RDF:li RDF:resource="%s" />\n"""
-         urn="urn:"+re.sub('/',':',self.absolute_url())
-         li="""<RDF:li resource="%s" />\n"""
          for content in contents:
              ret+=content[1].getRDF()+"\n"
-         ret+="""<RDF:Seq about="%s"/>\n"""%urn
+         ret+="""<RDF:Seq RDF:about="%s">\n"""%urn
          for content in contents:
-             nurn="urn:"+re.sub('/',':',content[1].absolute_url())
+             nurn=content[1].absolute_url()
              ret+=li%nurn
-         return ret+"</rdf:Seq>"
+         return ret+"</RDF:Seq>"
      def changeLabels(self):
  Line 1534  class ECHO_collection(Folder, Persistent
          pt.content_type="text/html"
          return pt()
+     def changeWeights(self):
+         """change form"""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/changeWeightForm').__of__(self)
+         pt.content_type="text/html"
+         return pt()
+     def changeMetaDataLinks(self):
+         """change form"""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/changeMetaDataLinkForm').__of__(self)
+         pt.content_type="text/html"
+         return pt()
      def changeAccessRightsCollection(self):
          """change"""
          ret=""
- Line 1549  class ECHO_collection(Folder, Persistent
+ Line 1560  class ECHO_collection(Folder, Persistent
                  """not"""
          return ret
-     def changeLabelsInCollection(self):
+     def changeMetaDataLinkInCollection(self):
          """change all lables of a collection"""
          ret=""
          argv=self.REQUEST.form
- Line 1559  class ECHO_collection(Folder, Persistent
+ Line 1570  class ECHO_collection(Folder, Persistent
              try:
                  ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
-                             resource[1].label=argv[resource[1].getId()][0:]
+                             resource[1].metalink=argv[resource[1].getId()][0:]
+             except:
+                 """not"""
+         return ret
+     def changeMetaDataLinkInCollection(self):
+         """change all lables of a collection"""
+         ret=""
+         argv=self.REQUEST.form
+         resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+         for resource in resources:
+             try:
+                 ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
+                             resource[1].metalink=argv[resource[1].getId()][0:]
+             except:
+                 """not"""
+         return ret
+     def changeWeightsInCollection(self):
+         """change all lables of a collection"""
+         ret=""
+         argv=self.REQUEST.form
+         resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
+         for resource in resources:
+             try:
+                 ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
+                             resource[1].weight=argv[resource[1].getId()][0:]
              except:
                  """not"""
          return ret
- Line 1629  class ECHO_collection(Folder, Persistent
+ Line 1670  class ECHO_collection(Folder, Persistent
          pt=PageTemplateFile('Products/ECHO_content/zpt/changeViewerTemplateSet').__of__(self)
              return pt()
-     def getViewerTemplateSets(self,obj_ids=None):
+     def getViewerTemplateSets(self,obj_ids=None,RESPONSE=None):
          """Get the ViewerTemplateSet title for configuration"""
          ret=[]
- Line 1651  class ECHO_collection(Folder, Persistent
+ Line 1692  class ECHO_collection(Folder, Persistent
      def isSelectedViewerTemplateSet(self,obj,id):
-         """is ausgew�hlt"""
+         """is ausgewählt"""
          if self.REQUEST['viewerTemplateSet']==id:
              return 1
          else:
              return None
-     def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,RESPONSE=None):
+     def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None):
          """change the templates"""
-         resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+         resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
+         for resource in resources:
+             resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)
+         if RESPONSE is not None:
+             RESPONSE.redirect('manage_main')
+     def setStartpageFolderForm(self):
+         """Form for changing the startpage"""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resourceStartPageFolder.zpt').__of__(self)
+             pt.content_type="text/html"
+             return pt()
+     def setStartpageFolder(self,startpage=None,RESPONSE=None):
+         """change the templates"""
+         resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
          for resource in resources:
-             resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate)
+             resource[1].setStartPage(startpage)
          if RESPONSE is not None:
              RESPONSE.redirect('manage_main')
+     def copyTitleToInfoXMLFolder(self,RESPONSE=None):
+         """copy title into the title field of info.xml
+         author and date werden leer!!!
+         """
+         resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
+         for resource in resources:
+             ret,txt=resource[1].copyTitleToInfoXML()
+             if (not ret) and RESPONSE:
+                 RESPONSE.write("error: %s\n"%txt)
+             if ret and RESPONSE:
+                 RESPONSE.write("ok: %s\n"%txt)
+             #zLOG.LOG("ECHO (copyTitleToInfoXMLFolder)",zLOG.INFO,txt)
+         if RESPONSE is not None:
+             RESPONSE.write("done!\n")
+             RESPONSE.close()
+             RESPONSE.redirect('manage_main')
      def copySearchFields(self,RESPONSE=None):
          """copys import metadatafields to the object"""
- Line 1682  class ECHO_collection(Folder, Persistent
+ Line 1765  class ECHO_collection(Folder, Persistent
          if RESPONSE is not None:
              RESPONSE.redirect('manage_main')
+     def reloadMetaDataFromStorageWarning(self,RESPONSE=None):
+         """warning"""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/reloadMetaDataFromStorageWarning.zpt').__of__(self)
+             pt.content_type="text/html"
+             return pt()
      def reloadMetaDataFromStorage(self,RESPONSE=None):
          """copy metadata from the storage to ECHO"""
-         ret=""
-         resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
-         for resource in resources:
+         return reloadMetaDataFromStorage(self,RESPONSE=None)
-             ret+=str(resource[1].copyIndex_meta2echo_resource())+"<br>"
-         if RESPONSE is not None:
-             #           RESPONSE.redirect('manage_main')
-             return ret
      def getPartnerCopyright(self,name,sonst="generic"):
          """gibt generisches copyright eines partners aus, sonst behalte jetzige einsteillung"""
- Line 1730  class ECHO_collection(Folder, Persistent
+ Line 1811  class ECHO_collection(Folder, Persistent
          else:
              return ""
-     def getTitle(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"""
-     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 createRessourcesFromXMLForm(self):
          """form"""
- Line 1798  class ECHO_collection(Folder, Persistent
+ Line 1864  class ECHO_collection(Folder, Persistent
      def getCollectionTreeXML(self):
          """Tree as XML"""
+     def addPassWd(str):
+         """adds a user/passwd to an url"""
+         txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str)
+         return txt2
          def getCollection(object,depth=0):
              depth+=1
              collections=""
- Line 1805  class ECHO_collection(Folder, Persistent
+ Line 1876  class ECHO_collection(Folder, Persistent
                  element=getattr(object,entry)
                  try:
                      if element.meta_type in ["ECHO_collection","ECHO_group"]:
-                         collections+="<element name=\""+quote(element.title)+"\" url=\""+element.absolute_url()+"\">"
+                         collections+="<element name=\""+quote(element.title)+"\" url=\""+addPassWd(element.absolute_url())+"\">"
                          collections+=getCollection(element,depth)+"</element>\n"
                  except:
                      """nothing"""
- Line 1943  class ECHO_collection(Folder, Persistent
+ Line 2014  class ECHO_collection(Folder, Persistent
      security.declarePublic('ECHO_rerenderLinksMD')
-     def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
-         """Rerender all Links"""
-     ret=""
-         if not obj:
-             obj = self
-         entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource','ECHO_collection'])
-         for entry in entries:
+     def ECHO_rerenderLinksMDWarning(self):
-         if entry[1].meta_type == 'ECHO_resource':
+         """change form"""
-             try:
+         pt=PageTemplateFile('Products/ECHO_content/zpt/rerenderLinksWarning').__of__(self)
-                 entry[1].ECHO_getResourceMD(template="no")
+         pt.content_type="text/html"
-                                 if "title" in types:
+         return pt()
-                                     entry[1].generate_title()
-                                 if "label" in types:
-                                     entry[1].generate_label()
-                 ret+="OK:"+entry[0]+"-- "+entry[1].getTitle().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"<br>"
-             except:
-                 ret+="Error:"+entry[0]+"<br>"
-         else:
-            self.ECHO_rerenderLinksMD(entry[1])
+     def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
+         """Rerender all Links"""
+     return ECHO_rerenderLinksMD(self,obj,types)
-         return ret+"Rerenderd all links to resources in: "+self.title
      security.declarePublic('ECHO_newViewerLink')
- Line 2005  class ECHO_collection(Folder, Persistent
+ Line 2062  class ECHO_collection(Folder, Persistent
      self.bgcolour=bgcolour
-     manage_options = Folder.manage_options+(
+     manage_options = Folder.manage_options+ Cacheable.manage_options+(
          {'label':'Main Config','action':'ECHO_collection_config'},
          {'label':'Change Labels','action':'changeLabels'},
          {'label':'Change Titles','action':'changeTitles'},
-         {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMD'},
+     {'label':'Change Weights','action':'changeWeights'},
+         {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMDWarning'},
          {'label':'Graphics','action':'ECHO_graphicEntry'},
      {'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
-         {'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'},
+     {'label':'Set Startpage','action':'setStartpageFolderForm'},
-     {'label':'Reload Metadata','action':'reloadMetaDataFromStorage'},
+         {'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'},
+     {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
      {'label':'ImportCollection','action':'updateCollection'},
      {'label':'Copy MD for indexing and search','action':'copySearchFields'},
          )
- Line 2074  class ECHO_collection(Folder, Persistent
+ Line 2133  class ECHO_collection(Folder, Persistent
          else:
              return "#dddddd"
-     def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",viewClassification=None,location=None):
+     def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",viewClassification=None,location=None,isAlwaysClickable=None):
          """Aenderung der Properties"""
          self.secondaryLink=secondaryLink
- Line 2083  class ECHO_collection(Folder, Persistent
+ Line 2142  class ECHO_collection(Folder, Persistent
      self.bgcolour=bgcolour
          self.viewClassification=viewClassification
          self.location=location
+     self.isAlwaysClickable=isAlwaysClickable
          if coords:
              coordsnew=[ string.split(x,",") for x in coords]
- Line 2102  class ECHO_collection(Folder, Persistent
+ Line 2162  class ECHO_collection(Folder, Persistent
          if RESPONSE is not None:
              RESPONSE.redirect('manage_main')
+     def setAlwaysClickable(self,flag="yes"):
+         """set clickable"""
+         if flag=="yes":
+             self.isAlwaysClickable="yes"
+         else:
+             self.isAlwaysClickable=None
+         return flag
      def showOverview(self):
          """overview"""
- Line 2114  class ECHO_collection(Folder, Persistent
+ Line 2182  class ECHO_collection(Folder, Persistent
      def index_html(self):
          """standard page"""
+         if self.ZCacheable_isCachingEnabled():
+             result = self.ZCacheable_get()
+             if result is not None:
+                 # Got a cached value.
+                 return result
          if 'index.html' in self.__dict__.keys():
-             return getattr(self,'index.html')()
+             ret=getattr(self,'index.html')()
          elif 'overview' in self.__dict__.keys():
-             return self.showOverview()
+             ret=self.showOverview()
          elif hasattr(self,'collection_index_template'):
-             return self.collection_index_template()
+             ret=self.collection_index_template()
          elif hasattr(self,'main_index_template'):
-             return self.main_index_template()
+             ret=self.main_index_template()
+         else:
          pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
          pt.content_type="text/html"
-         return pt()
+         ret=pt.render()
-     def content_html(self):
+     self.ZCacheable_set(ret)
+         return ret
+     def content_html(self,**argv):
          """template fuer content"""
-         return content_html(self,'collection')
+     #print "NN",argv
+         return ECHO_basis.content_html(self,'collection')
      def getCredits(self):
          """Ausgabe der credits"""
- Line 2219  class ECHO_group(ECHO_collection):
+ Line 2297  class ECHO_group(ECHO_collection):
      manage_options = Folder.manage_options+(
          {'label':'Main Config','action':'ECHO_group_config'},
-         {'label':'Rerender Links','action':'ECHO_rerenderLinksMD'},
+         {'label':'Rerender Links','action':'ECHO_rerenderLinksMDWarning'},
          {'label':'Graphics','action':'ECHO_graphicEntry'},
          )
      security.declareProtected('View','index_html')
-     def getRDF(self):
+     def getRDF(self,urn=None):
          """rdf of the collection"""
          contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
-         urn="urn:"+re.sub('/',':',self.absolute_url())
+         ret=getRDFDescription(self,self.absolute_url(),urn=urn)
-         li="""<RDF:li resource="%s" />\n"""
-         ret=""
+         if not urn:
+             urn=self.absolute_url()
+         li="""<RDF:li RDF:resource="%s" />\n"""
          for content in contents:
              ret+=content[1].getRDF()+"\n"
-         ret+="""<RDF:Seq about="%s"/>\n"""%urn
+         ret+="""<RDF:Seq RDF:about="%s">\n"""%urn
          for content in contents:
-             nurn="urn:"+re.sub('/',':',content[1].absolute_url())
+             nurn=content[1].absolute_url()
              ret+=li%nurn
-         return ret+"</rdf:Seq>"
+         return ret+"</RDF:Seq>"
      def index_html(self):
          """standard page"""
- Line 2280  class ECHO_group(ECHO_collection):
+ Line 2363  class ECHO_group(ECHO_collection):
          return pt()
      def changeECHO_group(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",logo=""):
-         """�nderung der Properties"""
+         """Änderung der Properties"""
          self.secondaryLink=secondaryLink
          self.secondaryLinkTitle=secondaryLinkTitle
- Line 2313  class ECHO_group(ECHO_collection):
+ Line 2396  class ECHO_group(ECHO_collection):
      def content_html(self):
          """template fuer content"""
-         return content_html(self,'group')
+         return ECHO_basis.content_html(self,'group')
- Line 2451  def manage_addECHO_userFolderForm(self):
+ Line 2534  def manage_addECHO_userFolderForm(self):
      """add a user folder form"""
      return manage_addECHO_userFolder(self)
+ def createNode(self,descrs,node):
+     name=descrs[node]['name']
+     type=descrs[node]['type']
+     urn=node
+     #print "    will create",node.encode('utf-8')
+     id=re.sub('[^a-zA-Z0-9]','',name).encode('ascii','ignore')
+     #print "id",id
+     #print type
+     #self.REQUEST.RESPONSE.write("<p>%s<p>\n"%id)
+     if type=="CDLI_group":
+         try:
+             manage_addECHO_collection(self,id,name,name,"","","","","")
+         except:
+             self.REQUEST.RESPONSE.write("<p>Error%s</p>\n"%id)
+         self.REQUEST.RESPONSE.write("<p>Creates:%s</p>\n"%getattr(self,id).absolute_url())
+         return type,getattr(self,id),urn
+     if type=="CDLI_item":
+         try:
+             manage_addECHO_resource(self,id,name,name,"","",urn,"","")
+         except:
+             self.REQUEST.RESPONSE.write("<p>Error%s</p>\n"%id)
+         self.REQUEST.RESPONSE.write("<p>Creates:%s</p>\n"%getattr(self,id).absolute_url())
+     return "XX"
  class ECHO_root(Folder,Persistent,Implicit):
      """ECHO Root Folder"""
- Line 2458  class ECHO_root(Folder,Persistent,Implic
+ Line 2575  class ECHO_root(Folder,Persistent,Implic
      meta_type="ECHO_root"
+     ###CDLI adds -> have to be removed
+     def getTablet(self,item):
+         #print "getTablet"
+     try:
+         read=urllib.urlopen("http://enlil.museum.upenn.edu/cgi-bin/cdlget.plx?item=%s&project=ncdl"%item).read()
+                 read=re.sub("\[search\]","search",read)
+         return read[read.find("<body>")+6:read.rfind("</body>")]
+     except:
+         return "<h1>Sorry no connection to the data server enlil.museum.upenn.edu</h1>"
+     #return "http://enlil.museum.upenn.edu/cgi-bin/cdlget.plx?item=%s&project=ncdl"
+     ###END CDLI add
+     def checkResource(self,id):
+         """checks if a resource is in the tree, gives back none or list of resources"""
+         if hasattr(self,"_v_checkResource") and self._v_checkResource.has_key(id): #existiert ein cache und id ist bereits drin?
+                 return self._v_checkResource[id]
+         else:
+             resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],obj_ids=[id],search_sub=1)
+             if not hasattr(self,"_v_checkResource"): self._v_checkResource={}#lege cache an falls nicht existent
+             if resources:
+                 self._v_checkResource[id]=resources[0:] # slicing to be sure that data is stabil
+             else:
+                 self._v_checkResource[id]=None
+             return self._v_checkResource[id]
+     def sendForm(self,fromaddr,content,server='mail.mpiwg-berlin.mpg.de'):
+         """sendform"""
+         toaddrs=["dwinter@mpiwg-berlin.mpg.de"]
+         msg = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n"
+            % (fromaddr, ", ".join(toaddrs),"testsub"))
+         server = smtplib.SMTP(server)
+         #server.set_debuglevel(1)
+         msg=msg+content
+         server.sendmail(fromaddr, toaddrs, msg)
+         server.quit()
+     def generateFromRDFForm(self):
+         """change form"""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/generateFromRDFForm').__of__(self)
+         pt.content_type="text/html"
+         return pt()
+     def generateFromRDF(self,file,startNode="/Cuneiform Corpus"):
+         """generate from RDF"""
+         global seqs
+         seqs={}
+         global descrs
+         descrs={}
+         global key
+         key=""
+         global value
+         value=""
+         def getEdges(seqs,urn):
+             """edges"""
+             ret=[]
+             return seqs[urn]
+         def createSubs(self,seqs,descrs,urn,level=0):
+             """create subs"""
+             for edge in getEdges(seqs,urn):
+                 cn=createNode(self,descrs,edge)
+                 if cn[0]=="CDLI_group":
+                     createSubs(cn[1],seqs,descrs,cn[2],level+1)
+             return
+         def start_element(name,attrs):
+             global seqs
+             global descrs
+             global key
+             global value
+             seq=""
+             if name=="RDF:Seq":
+                 key=attrs.get('RDF:about')
+                 try: # teste ob liste
+                     x=seqs[key][0]
+                 except:
+                     seqs[key]=[]
+             elif name=="RDF:Description":
+                 key=attrs.get('RDF:about')
+             elif name=="RDF:li":
+                 name=attrs.get('RDF:resource')
+                 seqs[key].append(name)
+             elif name=="ECHONAVIGATION:type":
+                 value="type"
+             elif name=="ECHONAVIGATION:name":
+                 value="name"
+             elif name=="ECHONAVIGATION:linkClickable":
+                 value="linkClickable"
+         def end_element(name):
+                 """nothing"""
+                 key=""
+                 value=""
+         def char_data(data):
+             """nothing"""
+             data=re.sub("\n","",data)
+             try:
+                 if descrs[key].has_key(value):
+                     descrs[key][value]+=data
+                 else:
+                     descrs[key][value]=data
+             except:
+                 descrs[key]={}
+                 descrs[key][value]=data
+         p = xml.parsers.expat.ParserCreate()
+         p.StartElementHandler = start_element
+         p.EndElementHandler = end_element
+         p.CharacterDataHandler = char_data
+         p.ParseFile(file)
+         self.REQUEST.RESPONSE.write("<html><body><h1>Start</h1>")
+         createSubs(self,seqs,descrs,startNode)
+         self.REQUEST.RESPONSE.write("<h1>done</h1></body></html>")
+         #print "done"
+         return "done"
+     def changeWeightsInCollection(self):
+         """change all lables of a collection"""
+         ret=""
+         argv=self.REQUEST.form
+         resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
+         for resource in resources:
+             try:
+                 ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
+                             resource[1].weight=argv[resource[1].getId()][0:]
+             except:
+                 """not"""
+         return ret
+     def changeWeights(self):
+         """change form"""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/changeWeightForm').__of__(self)
+         pt.content_type="text/html"
+         return pt()
+     getSubCols = ECHO_helpers.getSubCols
+     manage_options=Folder.manage_options+(
+         {'label':'Main Config','action':'ECHO_copyright_configForm'},
+         {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
+         {'label':'Change Weights','action':'changeWeights'},
+         {'label':'Generate from RDF','action':'generateFromRDFForm'},
+ )
+     def reloadMetaDataFromStorageWarning(self,RESPONSE=None):
+         """warning"""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/reloadMetaDataFromStorageWarning.zpt').__of__(self)
+             pt.content_type="text/html"
+             return pt()
+     def reloadMetaDataFromStorage(self,RESPONSE=None):
+         """reload MD from Storage"""
+         return reloadMetaDataFromStorage(self,RESPONSE)
+     def getRDF(self,urn=None):
+         """rdf of the collection"""
+         contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
+         ret=getRDFDescription(self,self.absolute_url(),urn=urn)
+         li="""<RDF:li RDF:resource="%s" />\n"""
+         for content in contents:
+             ret+=content[1].getRDF()+"\n"
+         ret+="""<RDF:Seq RDF:about="%s">\n"""%urn
+         for content in contents:
+             nurn=content[1].absolute_url()
+             ret+=li%nurn
+         return ret+"</RDF:Seq>"
      def showContent(self,path):
          """return content/html"""
-         return urllib.urlopen(path+"/content_html").read()
+         return ECHO_helpers.urlopen(path+"/content_html").read()
      def getImageViewers(self):
          """images"""
- Line 2470  class ECHO_root(Folder,Persistent,Implic
+ Line 2793  class ECHO_root(Folder,Persistent,Implic
      def getBibTag(self,tag,content):
-         """get field tag f�r index-meta-generation"""
+         """get field tag für index-meta-generation"""
          if not content or content=="":
              return ""
          ret="<%s>"%tag
- Line 2558  class ECHO_root(Folder,Persistent,Implic
+ Line 2881  class ECHO_root(Folder,Persistent,Implic
       return retStr
-     def copyrightTypeSelector_HTML(self,selected=None,first=None):
+     def copyrightTypeSelector_HTML(self, object=None, selected=None,first=None):
           """give type selector"""
       if not first:
- Line 2579  class ECHO_root(Folder,Persistent,Implic
+ Line 2902  class ECHO_root(Folder,Persistent,Implic
                   retStr+="""<option selected value="%s">%s\n"""%(copyrightType[0],copyrightType[0])
               else:
                   retStr+="""<option value="%s">%s\n"""%(copyrightType[0],copyrightType[0])
+          for copyrightTypeSelf in self.ZopeFind(object,obj_metatypes=["ECHO_copyrightType"],search_sub=1):
+              if selected and (copyrightTypeSelf[0]==selected):
+                  retStr+="""<option selected value="%s">%s\n"""%(copyrightTypeSelf[0],copyrightTypeSelf[0])
+              else:
+                  retStr+="""<option value="%s">%s\n"""%(copyrightTypeSelf[0],copyrightTypeSelf[0])
       except:
           """nothing"""
       return retStr
      def partnerSelector_HTML(self,selected=None):
- Line 2600  class ECHO_root(Folder,Persistent,Implic
+ Line 2931  class ECHO_root(Folder,Persistent,Implic
           """nothing"""
       return retStr
-     mediaTypes=['all','text','images','sound','video'] # konfigurierbar in neuer version �ber echoroot??
+     mediaTypes=['all','text','images','sound','video'] # konfigurierbar in neuer version über echoroot??
      def mediaTypeSelector_HTML(self,selected=None):
           """give type selector"""
- Line 2672  class ECHO_root(Folder,Persistent,Implic
+ Line 3003  class ECHO_root(Folder,Persistent,Implic
          return "changed all contenttypes in: "+self.title
+     def deleteCache(self,obj=None,RESPONSE=None):
+         """setze alle collections auf cache = CacheManager"""
+         if not obj:
+             obj = self
+         entries=obj.ZopeFind(obj,search_sub=1)
+         for entry in entries:
+         if hasattr(entry[1],'_v_hash'):
+             entry[1]._v_hash=None
+         return "changed all CM in: "+self.title
      def ECHO_newViewerLink(self,obj=None):
          """change links (:86 faellt weg)"""
- Line 2738  class ECHO_root(Folder,Persistent,Implic
+ Line 3089  class ECHO_root(Folder,Persistent,Implic
              for link in links:
                  link.tagName="a"
                  ref=link.getAttribute("ref")
+         pn=link.getAttribute("page")
                  if self.checkRef(ref):
-                     link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
+             if pn:
+                 link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref+"&p="+pn)
+             else:
+                 link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref)
              newxml=dom.toxml('utf-8')
-         match=re.sub(r'<\?xml version=\"1.0\" encoding=\"utf-8\"\?>\n<txt>','',newxml)
-         match=re.sub(r'</txt>','',match)
-         return match
+         retStr=regexpTXT.search(newxml)
+         return retStr.group(1)
          return ""
-     def xml2html(self,str):
+     def xml2html(self,str,quote="yes"):
          """link2html fuer VLP muss hier noch raus"""
-         if str:
+         if str:
+             if quote=="yes2":
              str=re.sub("\&","&amp;",str)
-             dom=xml.dom.minidom.parseString(str)
+             #dom=xml.dom.minidom.parseString(str)
-             links=dom.getElementsByTagName("link")
+         dom = NonvalidatingReader.parseString(str,"http://www.mpiwg-berlin.mpg.de/")
+             #links=dom.getElementsByTagName("link")
+             links=Ft.Xml.XPath.Evaluate(".//link", contextNode=dom)
+             for link in links:
+                 #link.tagName="a"
+                 ref=link.getAttributeNS(EMPTY_NAMESPACE,"ref")
+         pn=link.getAttributeNS(EMPTY_NAMESPACE,"page")
-             for link in links:
+         cns=link.childNodes[0:]
-                 link.tagName="a"
-                 ref=link.getAttribute("ref")
+         newLink=dom.createElementNS(EMPTY_NAMESPACE,"a")
+         for x in cns:
+             newLink.appendChild(x)
+         link.parentNode.replaceChild(newLink,link)
                  if self.checkRef(ref):
-                     link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
+             if pn:
+                 newLink.setAttributeNS(EMPTY_NAMESPACE,"href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref+"&p="+pn)
+             else:
+                 newLink.setAttributeNS(EMPTY_NAMESPACE,"href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
-             return dom.toxml('utf-8')
+             #str= dom.toxml('utf-8')
+         buf = cStringIO.StringIO()
+         PrettyPrint(dom, stream=buf, encoding='UTF-8')
+         str = buf.getvalue()
+         buf.close()
+         #str=PrettyPrint(dom.documentElement,encoding='UTF-8')
+         #print link.toxml('utf-8')
+         #print type(str)
+         retStr=regexpPage.search(str)
+         try: # hack warum fehtl manchmal page??
+             return retStr.group(1)
+         except:
+             return str
          return ""
      def checkRef(self,ref):
-         dbs={'vl_literature':'AND CD LIKE \'%lise%\'','vl_technology':'','vl_people':''}
+         if ref[0:3]=='lit':
+             if len(self.library_data({ 'id':ref}))>0:
+                 return 1
+         try:
+             if ref[0:7]=="tec_cat":
+                 return 1
+         except:
+             """nothing"""
+         dbs={'vl_technology':'','vl_people':'','vl_sites':''}
          res=None
          for db in dbs.keys():
              res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db])))
          return res
- Line 2784  class ECHO_root(Folder,Persistent,Implic
+ Line 3178  class ECHO_root(Folder,Persistent,Implic
      def getPartners(self):
          """Get list of Partners. Presently only from a subfolder partners"""
+     if hasattr(self,'partners'):
          return [ item[1] for item in self.partners.ZopeFind(self.partners,obj_metatypes=['ECHO_partner'])]
+     else:
+         return []
+     def getInstitutions(self):
+         """Get list of Partners. Presently only from a subfolder partners"""
+         return [ item[1] for item in self.institutions.ZopeFind(self.institutions,obj_metatypes=['ECHO_institution'])]
      def getPartnersXML(self):
- Line 2798  class ECHO_root(Folder,Persistent,Implic
+ Line 3196  class ECHO_root(Folder,Persistent,Implic
      <partners>"""
      for partner in partners:
-             ret+="""<partner id="%s" title="%s"/>\n"""%(partner.getId(),unicode(partner.title,'utf-8','replace'))
+             ret+="""<partner id="%s" title="%s"/>\n"""%(partner.getId(),partner.title)
          return ret+"\n</partners>"
- Line 2905  class ECHO_root(Folder,Persistent,Implic
+ Line 3303  class ECHO_root(Folder,Persistent,Implic
      def getMetaDatasXML(self,viewerType=None,filter=None):
          """gebe all ressourcen aus"""
+         # check if the request's host part was OK
+         http_host = self.REQUEST['HTTP_HOST']
+         host_port = self.REQUEST['SERVER_PORT']
+         fix_host = None
+         if http_host and http_host.rfind(host_port) == -1:
+             print "HTTP_HOST needs fixing!"
+             fix_host = http_host + ":" + host_port
          ret="""<?xml version="1.0" ?>
                   <index>"""
          for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
              echo_url=resource[1].absolute_url()
+             if fix_host:
+                 #print "replacing ", http_host, " by ", fix_host
+                 echo_url = string.replace(echo_url, http_host, fix_host, 1)
              if hasattr(resource[1],'link'):
                  meta_url=echo_url+"/getMetaDataXML"
- Line 2919  class ECHO_root(Folder,Persistent,Implic
+ Line 3328  class ECHO_root(Folder,Persistent,Implic
              if filter and not re.search(filter,viewer_url):
                  continue
-             ret+="""\n<resource resourceLink="%s" metaLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(meta_url,safe='/:?'))
+             #modificationDate=time.strptime(str(resource[1].bobobase_modification_time()),"%Y/%m/%d %H:%M:%S %Z")
+             modificationDate=resource[1].bobobase_modification_time().strftime("%Y/%m/%d %H:%M:%S")
+             ret+="""\n<resource resourceLink="%s" metaLink="%s" modificationDate="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(meta_url,safe='/:?'),modificationDate)
-         ret +="""\n</index>"""
+         ret +="""\n</index>"""
          self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
          self.REQUEST.RESPONSE.write(ret)
- Line 2944  class ECHO_root(Folder,Persistent,Implic
+ Line 3357  class ECHO_root(Folder,Persistent,Implic
          par=self.ZopeFind(self.partners, obj_ids=[id])
          return par
+     def getInstitutionFromID(self,id):
+         """ find institution from id """
+         inst=self.ZopeFind(self.institutions, obj_ids=[id])
+         return inst
  def manage_addECHO_root(self,id,title,RESPONSE=None):
- Line 2958  def manage_addECHO_rootForm(self):
+ Line 3375  def manage_addECHO_rootForm(self):
          pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_root.zpt').__of__(self)
          return pt()
- class ECHO_copyrightType(Folder):
+ class ECHO_copyrightType(Folder,ECHO_basis):
      """copyright typ"""
      meta_type="ECHO_copyrightType"
- Line 3007  def manage_addECHO_copyrightType(self,id
+ Line 3424  def manage_addECHO_copyrightType(self,id
- class ECHO_partner(Image,Persistent):
+ class ECHO_partner(Image,Persistent,ECHO_basis):
      """ECHO Partner"""
      meta_type="ECHO_partner"
- Line 3091  def manage_addECHO_partner(self, id, url
+ Line 3508  def manage_addECHO_partner(self, id, url
          REQUEST.RESPONSE.redirect('%s/manage_main' % url)
      return id
+ class ECHO_linkList(ZopePageTemplate,ECHO_basis):
+     """LinkList Objekt"""
+     meta_type="ECHO_linkList"
+     _default_content_fn = os.path.join(package_home(globals()), 'html/ECHO_pageTemplateDefault.html')
+     manage_options = ZopePageTemplate.manage_options+(
+         {'label':'Main Config','action':'changeECHO_linkListWeightForm'},
+         )
+     def content_html(self):
+     """content_html"""
+     return ECHO_basis.content_html(self,'pageTemplate')
+     def changeECHO_linkListWeightForm(self):
+         """change"""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_linkListTemplate.zpt').__of__(self)
+         return pt()
+     def changeECHO_linkListWeight(self,contentType,label,RESPONSE=None):
+         """change"""
+         self.contentType=contentType
+         self.label=label
+         if RESPONSE is not None:
+             RESPONSE.redirect('manage_main')
+     def getLabel(self):
+         if hasattr(self,'label'):
+             return self.label.encode('utf-8')
+         else:
+             return 0
+     def getcontentType(self):
+         """get contentType"""
+         if hasattr(self,'contentType'):
+             return self.contentType
+         else:
+             return 0
+     def __init__(self, id, label, title=None, text=None, contentType=None):
+          self.id = str(id)
+          self.title=title
+          self.label=label
+          self.ZBindings_edit(self._default_bindings)
+          if text is None:
+              text = ''
+          self.pt_edit(text, contentType)
+ def manage_addECHO_linkListForm(self):
+     """Form for adding"""
+     pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_linkListTemplate.zpt').__of__(self)
+     return pt()
+ from urllib import quote
+ def manage_addECHO_linkList(self, id, label,contentType=0,title=None, text=None,
+                            REQUEST=None, submit=None):
+     """Add a LinkList with optional file content."""
+     id = str(id)
+     if REQUEST is None:
+         self._setObject(id, ECHO_linkList(id, label, text))
+         ob = getattr(self, id)
+         setattr(ob,'contentType',contentType)
+         if title:
+             ob.pt_setTitle(title)
+         return ob
+     else:
+         file = REQUEST.form.get('file')
+         headers = getattr(file, 'headers', None)
+         if (headers is None) or (not file.filename):
+             zpt = ECHO_linkList(id, file)
+         else:
+             zpt = ECHO_linkList(id, label,'', file, headers.get('contentType'))
+         self._setObject(id, zpt)
+         ob = getattr(self, id)
+         if title:
+             ob.pt_setTitle(title)
+         try:
+             u = self.DestinationURL()
+         except AttributeError:
+             u = REQUEST['URL1']
+         if submit == " Add and Edit ":
+             u = "%s/%s" % (u, quote(id))
+         REQUEST.RESPONSE.redirect(u+'/manage_main')
+     return ''
+ class ECHO_support(Folder,ECHO_basis):
+     """gefoerdert durch"""
+     meta_type="ECHO_support"
+     def __init__(self,id,institutions=None):
+         """init"""
+         self.id=id
+         self.title=''
+         self.institutions=toList(institutions)
+     def getSupporter(self):
+         """return institutions"""
+         if self.institutions:
+             return self.institutions
+         else:
+             return []
+     manage_options = Folder.manage_options+(
+         {'label':'Main Config','action':'ECHO_support_configForm'},
+         )
+     def ECHO_support_configForm(self):
+         """change form"""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_support').__of__(self)
+         pt.content_type="text/html"
+         return pt()
+     def ECHO_support_config(self,institutions=None,RESPONSE=None):
+         """change"""
+         self.institutions=toList(institutions)
+         if RESPONSE is not None:
+             RESPONSE.redirect('manage_main')
+ def manage_addECHO_supportForm(self):
+     """Form for adding"""
+     pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_support.zpt').__of__(self)
+     return pt()
+ def manage_addECHO_support(self, id,institutions=None,RESPONSE=None):
+     """add the copyright"""
+     meta_type="ECHO_support"
+     self._setObject(id, ECHO_support(id,institutions))
+     if RESPONSE is not None:
+         RESPONSE.redirect('manage_main')
+ class ECHO_institution(Image,Persistent,ECHO_basis):
+     """ECHO Institution"""
+     meta_type="ECHO_institution"
+     def __init__(self, id, title,url, file, person, email, country, content_type='', precondition=''):
+         self.__name__=id
+         self.title=title
+         self.url=url
+         self.person=person
+         self.email=email
+         self.country=country
+         self.precondition=precondition
+         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':'Institution Information','action':'ECHO_institution_config'},
+         )
+     def changeECHO_institution(self,url,person, email, country,RESPONSE=None):
+         """Change main information"""
+         self.url=url
+         self.person=person
+         self.email=email
+         self.country=country
+         if RESPONSE is not None:
+             RESPONSE.redirect('manage_main')
+     def ECHO_institution_config(self):
+         """Main configuration"""
+         if not hasattr(self,'url'):
+             self.url=""
+         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_institution.zpt').__of__(self)
+         return pt()
+ manage_addECHO_institutionForm=DTMLFile('dtml/ECHO_institutionAdd',globals(),
+                              Kind='ECHO_institution',kind='ECHO_institution')
+ def manage_addECHO_institution(self, id, url, person, email, country, file=None, title='', precondition='', content_type='',
+                     REQUEST=None):
+     """
+     Add a new ECHO_institution object.
+     Creates a new ECHO_institution 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_institution(id,title,url,'', person, email, country, 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

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.140
changed lines
	Added in v.1.192