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.201 and 1.270

-version 1.201, 2004/12/10 13:48:13
+version 1.270, 2006/07/03 17:28:28
  Line 15  try:
  except:
      print "PDF generation will not work"
+ import urlparse
  import string
  import tempfile
  import re
  Line 34  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
  import smtplib
  import time
  from Ft.Xml.Domlette import NonvalidatingReader
- from Ft.Xml.Domlette import PrettyPrint
+ from Ft.Xml.Domlette import PrettyPrint, Print
  from Ft.Xml import EMPTY_NAMESPACE
  import Ft.Xml.XPath
  import cStringIO
  import zLOG
+ import sys
  try:
      from psycopg import libpq
- Line 64  import xml.dom.minidom
+ Line 68  import xml.dom.minidom
  import ECHO_helpers
  from ECHO_helpers import *
  from ECHO_language import *
+ from ECHO_movie import *
+ import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
+ import xmlrpclib
- #regexp for extracting elements from xml
+ def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""):
- 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)
- def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs="",viewClassification=""):
          """Allegemeine Informationen zu einer ECHO Collection"""
- Line 86  def setECHO_collectionInformation(self,t
+ Line 85  def setECHO_collectionInformation(self,t
          self.credits=toList(credits)
          self.weight=weight
+ class ECHO_partner(Image,Persistent,ECHO_basis):
+     """ECHO Partner"""
+     meta_type="ECHO_partner"
+     def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
+         self.__name__=id
+         self.title=title
+         self.url=url
+         self.person=person
+         self.email=email
+         self.country=country
+         self.color=color
+         self.precondition=precondition
+         self.copyrightType=copyrightType
+         data, size = self._read_data(file)
+         content_type=self._get_content_type(file, data, id, content_type)
+         self.update_data(data, content_type, size)
+     manage_options = Image.manage_options+(
+         {'label':'Partner Information','action':'ECHO_partner_config'},
+         )
+     def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None):
+         """Change main information"""
+         self.url=url
+         self.person=person
+         self.email=email
+         self.country=country
+         self.color=color
+         self.copyrightType=copyrightType
+         if RESPONSE is not None:
+             RESPONSE.redirect('manage_main')
+     def ECHO_partner_config(self):
+         """Main configuration"""
+         if not hasattr(self,'url'):
+             self.url=""
+         pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt')
+         return pt()
+ manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(),
+                              Kind='ECHO_partner',kind='ECHO_partner')
+ def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='',
+                     REQUEST=None):
+     """
+     Add a new ECHO_partner object.
+     Creates a new ECHO_partner object 'id' with the contents of 'file'.
+     Based on Image.manage_addImage
+     """
+     id=str(id)
+     title=str(title)
+     content_type=str(content_type)
+     precondition=str(precondition)
+     id, title = OFS.Image.cookId(id, title, file)
+     self=self.this()
+     # First, we create the image without data:
+     self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, content_type, precondition))
+     # Now we "upload" the data.  By doing this in two steps, we
+     # can use a database trick to make the upload more efficient.
+     if file:
+         self._getOb(id).manage_upload(file)
+     if content_type:
+         self._getOb(id).content_type=content_type
+     if REQUEST is not None:
+         try:    url=self.DestinationURL()
+         except: url=REQUEST['URL1']
+         REQUEST.RESPONSE.redirect('%s/manage_main' % url)
+     return id
+ class ECHO_locale(ZopePageTemplate):
+         """localisierung"""
+         meta_type="ECHO_locale"
+         def __init__(self,id,lang,title,label,text=None,content_type=None):
+                 self.lang=lang
+                 self.title=title
+                 self.label=label
+                 if text:
+                         self.pt_edit(text, content_type)
+                 self.id=id
+         manage_options = ZopePageTemplate.manage_options+(
+                 {'label':'Main Config','action':'change_ECHO_localeForm'},
+                 )
+         def change_ECHO_localeForm(self):
+                 """change form"""
+                 pt=zptFile(self, 'zpt/ChangeECHO_localeForm.zpt')
+                 return pt()
+         def change_ECHO_locale(self,lang,title,label,text=None,content_type=None,RESPONSE=None):
+                 """change echo locale"""
+                 self.lang=lang
+                 self.title=title
+                 self.label=label
+                 if not text is None:
+                         self.pt_edit(text, content_type)
+                 if RESPONSE is not None:
+                         RESPONSE.redirect('manage_main')
+ def manage_addECHO_localeForm(self):
+          """Form for adding"""
+          pt=zptFile(self, 'zpt/AddECHO_localeForm.zpt')
+          return pt()
+ def manage_addECHO_locale(self,lang,title,label,text=None,content_type=None,RESPONSE=None):
+         """add echo locale"""
+         id="locale_"+lang
+         self._setObject(id, ECHO_locale(id,lang,title,label,text,content_type))
+         if RESPONSE is not None:
+                 RESPONSE.redirect('manage_main')
  class ECHO_copyright(Folder,ECHO_basis):
      """Copyright informationen"""
- Line 153  class ECHO_layoutTemplate(ZopePageTempla
+ Line 284  class ECHO_layoutTemplate(ZopePageTempla
          self.ZBindings_edit(self._default_bindings)
          if text is None:
-             self._default_content_fn = os.path.join(package_home(globals()),
+             self._default_content_fn = os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%EchoType)
-                                                'zpt/ECHO_%s_template_standard.zpt'%EchoType)
              text = open(self._default_content_fn).read()
          self.pt_edit(text, content_type)
- Line 212  class ECHO_fullText(ZopePageTemplate,ECH
+ Line 342  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())
          pages=dom.getElementsByTagName('page')
-         return pages[int(nr)-1].toxml('utf-8')
+                 return pages[int(nr)-1].toxml()
  # Product registration and Add support
  manage_addECHO_fullTextForm = PageTemplateFile(
- Line 253  def manage_addECHO_fullText(self, id, ti
+ Line 384  def manage_addECHO_fullText(self, id, ti
      return ''
- class ECHO_resource(Folder,Persistent,ECHO_basis):
+ class ECHO_resource(CatalogAware,Folder,Persistent,ECHO_basis):
      """ECHO Ressource"""
      security=ClassSecurityInfo()
      meta_type='ECHO_resource'
+     default_catalog='resourceCatalog'
+ #    viewClassificationList=viewClassificationListMaster
-     viewClassificationList=viewClassificationListMaster
+     def PrincipiaSearchSource(self):
+            """Return cataloguable key for ourselves."""
+            return str(self)
      getSubCols = ECHO_helpers.getSubCols
-     security.declareProtected('View','index_html')
+     def reindex(self):
+         """generate fields for indexing and reindex"""
+         #TODO: korrigieren des metalink pfades konfigurierbar machen
+         splitted= [x for x in urlparse.urlparse(self.metalink)]
+         splitted[1]="foxridge.mpiwg-berlin.mpg.de"[0:]
+         if splitted[0]=="http":
+             self.metalink=urlparse.urlunparse(splitted)
+         self.fullTextUrl=self.getFullTextXML(noredirect="yes")
+         #TODO: korrigieren relative url to absoluter url volltexten, konfigurierbar?
+         splitted= [x for x in urlparse.urlparse(self.fullTextUrl)]
+         if splitted[0]=="":
+             splitted[0]="http"
+             splitted[1]="foxridge.mpiwg-berlin.mpg.de"[0:]
+             self.fullTextUrl=urlparse.urlunparse(splitted)
+         self.imagePath=self.getImagePath()
+         self.reindex_object()
      security.declareProtected('View','createPDF')
- Line 355  class ECHO_resource(Folder,Persistent,EC
+ Line 513  class ECHO_resource(Folder,Persistent,EC
          return ret+self.createSubElementRDF(urn=urn)
-     def getAccessRightSelectorHTML(self,outlook="select"):
+     def changeAccessRightForm(self,preselect=None):
-         """htmlselector"""
+         """change the access rights"""
-         values=['free','mpiwg']
+         pt=zptFile(self, 'zpt/ChangeECHO_resourceAccessRight.zpt')
+         return pt(preselect=preselect)
+     def changeAccessRight(self):
+         """changeRights"""
+         argv=self.REQUEST.form
+         self.setAccessRightXML(argv["%s_xml"%self.getId()])
+         self.accessRight=argv["%s_echo"%self.getId()]
+         self.REQUEST.RESPONSE.redirect('manage_main')
-         if outlook=="select":
-             ret="""<select name="%s">"""%self.getId()
+     def getAccessRightSelectorHTML(self,outlook="select",xmldominant=None,preselect=None):
+             """htmlselector, xmldominant= in der regel wird der wert des xmlfiles ausgegeben ausser er existiert nicht"""
+             values=['','free','MPIWG']
+             if preselect:#set all to the preselected
+                 ar=(preselect,preselect)
+             else:#else set to actual value
+                 ar=self.getAccessRightMD()
+             if outlook=="select":
+                     ret="""<select name="%s_xml">"""%self.getId()
+                     ret1="""<select name="%s_echo">"""%self.getId()
              for value in values:
-                 if value==self.getAccessRightMD():
+                             if value==ar[0]:
                      ret+="<option selected>%s</option>"%value
                  else:
                      ret+="<option>%s</option>"%value
+                             if value==ar[1]:
+                                     ret1+="<option selected>%s</option>"%value
+                             else:
+                                     ret1+="<option>%s</option>"%value
+                     if not xmldominant:
+                         return ret+"</select>",ret1+"</select>"
+                     else:
+                         if ar[0] is not None:
              return ret+"</select>"
+                         else:
+                             return "<p>No xml file (only local selection):"+ret1
          else:
              ret=""
+                     ret1=""
              for value in values:
-                 if value==self.getAccessRightMD():
+                             if value==ar[0]:
-                     ret+="""<input type="radio" name="%s" value="%s" checked>%s"""%(self.getId(),value,value)
+                                     ret+="""<input type="radio" name="%s_xml" value="%s" checked>%s"""%(self.getId(),value,value)
                  else:
-                     ret+="""<input type="radio" name="%s" value="%s">%s"""%(self.getId(),value,value)
+                                     ret+="""<input type="radio" name="%s_xml" value="%s">%s"""%(self.getId(),value,value)
+                             if value==ar[1]:
+                                     ret1+="""<input type="radio" name="%s_echo" value="%s" checked>%s"""%(self.getId(),value,value)
+                             else:
+                                     ret1+="""<input type="radio" name="%s_echo" value="%s">%s"""%(self.getId(),value,value)
+                     if not xmldominant:
+                         return ret,ret1
+                     else:
+                         if ar[0]:
              return ret
+                         else:
+                             return "<p>No xml file (only local selection)</p>"+ret1
+     def copyAccessRightsFromMD(self):
+             """kopiere rechte aus den metadaten"""
+             self.accessRight=self.getAccessRightMD()[0]
- Line 386  class ECHO_resource(Folder,Persistent,EC
+ Line 598  class ECHO_resource(Folder,Persistent,EC
          url=self.metalink
          try:
-             geturl=""
+                     urllib.urlopen(url)
-             for line in ECHO_helpers.urlopen(url).readlines():
+                 except:
-                 geturl=geturl+line
+                     zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+                     return None,getattr(self,'accessRight','')
-         except:
-             return (None,"Cannot open: "+url)
          try:
-             dom=xml.dom.minidom.parseString(geturl)
+                         dom = NonvalidatingReader.parseUri(url)
-             root=dom.getElementsByTagName('resource')[0]
          except:
-             return (None,"Cannot parse: "+url+"<br>"+geturl)
+                         zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+                         return (None,"Cannot parse: "+url+"<br>"+"%s (%s)"%sys.exc_info()[0:2])
-         internal=dom.getElementsByTagName('internal')
-         if internal:
-             institution=dom.getElementsByTagName('institution')
-             return getText(institution[0].childNodes)
-         free=dom.getElementsByTagName('free')
-         if free:
-             return "free"
-         return "free" #default free
+                 accessright=dom.xpath("//meta/access-conditions/access/@type")
+                 if accessright:
+                     accessright=accessright[0].value
+                 if str(accessright)=='institution':
+                     tmp=dom.xpath("//meta/access-conditions/access/name")
+                     if tmp:
+                         accessright=getTextFromNode(tmp[0])
-     def changeAccessRightMD(self,accessright,RESPONSE=None):
+                 if not accessright:
-         """change the rights"""
+                     accessright=""
+                 return accessright,getattr(self,'accessRight','')
+     def changeAccessRightMD(self,accessright,RESPONSE=None):
+             """change the rights - not user anymore"""
+             #TODO: check if method still needed
          params="accessright=%s"%accessright
          #print ECHO_helpers.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read()
-         ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/setAccessRightXML'+urllib.quote('?'+params))).read()
+             ECHO_helpers.urlopen('http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/setAccessRightXML'+urllib.quote('?'+params))).read()
          if RESPONSE is not None:
- Line 430  class ECHO_resource(Folder,Persistent,EC
+ Line 644  class ECHO_resource(Folder,Persistent,EC
      def setAccessRightXML(self,accessright):
          """set accessright"""
          url=self.metalink
+                 accessrights=['MPIWG','free']#allowes rights
+                 if accessright =='':
+                     """do nothing"""
+                     return ""
          try:
              geturl=""
- Line 446  class ECHO_resource(Folder,Persistent,EC
+ Line 666  class ECHO_resource(Folder,Persistent,EC
          except:
              return (None,"Cannot parse: "+url+"<br>"+geturl)
-         metanodes=dom.getElementsByTagName('access-conditions')
+                 metamains=dom.getElementsByTagName('meta')
+                 if not metamains:
+                         nodenew=dom.createElement('meta')
+                         root.appendChild(nodenew)
+                         metamain=nodenew
+                 else:
+                         metamain=metamains[0]
+                 metanodes=metamain.getElementsByTagName('access-conditions')
          if not metanodes:
              nodenew=dom.createElement('access-conditions')
-             root.appendChild(nodenew)
+                         metamain.appendChild(nodenew)
              metanode=nodenew
          else:
              metanode=metanodes[0]
          accesses=metanode.getElementsByTagName('access')
-         if not accesses:
+                 #delete old
+                 if accesses:
+                      metanode.removeChild(accesses[0]).unlink()
+                 #create new
              nodenew2=dom.createElement('access')
              metanode.appendChild(nodenew2)
              metanode2=nodenew2
-         else:
-             metanode2=accesses[0]
-         internal=metanode.getElementsByTagName('internal')
+                 attribute=metanode2.getAttribute('type')
-         if internal:
+                 if accessright=="free":
-             metanode2.removeChild(internal[0]).unlink()
-         free=metanode.getElementsByTagName('free')
+                      metanode2.setAttribute('type','free')
-         if free:
+                 elif accessright.upper()=='MPIWG':
-             metanode2.removeChild(internal[0]).unlink()
+                         metanode2.setAttribute('type','institution')
+                         nodenew4=dom.createElement('name')
+                         metanodetext=dom.createTextNode('MPIWG')
+                         nodenew4.appendChild(metanodetext)
+                         nodenew2.appendChild(nodenew4)
+                 #print dom.toxml().encode('utf-8')
+                 string= encodeRPC(dom.toxml().encode('utf-8'))
+                 #TODO: make server configurable
+                 server=xmlrpclib.Server("http://foxridge.mpiwg-berlin.mpg.de/server")
-         if accessright=='free':
+                 path=urlparse.urlparse(self.metalink)[2]
-             nodenew3=dom.createElement('free')
-             metanode2.appendChild(nodenew3)
-         elif accessright=='mpiwg':
-             nodenew3=dom.createElement('internal')
-             nodenew4=dom.createElement('institution')
-             metanodetext=dom.createTextNode('mpiwg')
-             nodenew4.appendChild(metanodetext)
-             nodenew3.appendChild(nodenew4)
-             metanode2.appendChild(nodenew3)
-         return dom.toxml().encode('utf-8')
+                 server.writeMetaDataFile(path,string,"yes")
      def setStartPageForm(self):
          """Form for changing the startpage"""
- Line 561  class ECHO_resource(Folder,Persistent,EC
+ Line 792  class ECHO_resource(Folder,Persistent,EC
                  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))
+             #print 'http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))
          ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read()
- Line 593  class ECHO_resource(Folder,Persistent,EC
+ Line 824  class ECHO_resource(Folder,Persistent,EC
              return pt()
+     def setMetaLink(self, link=None):
+         """change metalink field"""
+         if link is not None:
+             self.metalink = link
      def getTextToolsField(self,name,default=''):
          """Lese Textoolsfelder aus index.meta im path aus"""
- Line 622  class ECHO_resource(Folder,Persistent,EC
+ Line 858  class ECHO_resource(Folder,Persistent,EC
          params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s&digiliburlprefix=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)
+         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
- Line 633  class ECHO_resource(Folder,Persistent,EC
+ Line 871  class ECHO_resource(Folder,Persistent,EC
          path=re.sub('/index.meta','',path)
-         path=re.sub(self.REQUEST['SERVER_URL'],'',path)
+         #TODO: direct access to the file system necessary, fix that also xmlrpc to the server where the index file is stored is possible
-         path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)
+         parsedUrl=urlparse.urlparse(path)
+         path=parsedUrl[2]
-         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
+         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')
+     security.declarePublic('content_html')
      def content_html(self):
          """template fuer content"""
          return ECHO_basis.content_html(self,'resource')
-     def getViewClassification(self):
+ #    def getViewClassification(self):
-         if hasattr(self,'viewClassification'):
+ #        if hasattr(self,'viewClassification'):
-             return self.viewClassification
+ #            return self.viewClassification
-         else:
+ #        else:
-             return ""
+ #            return ""
      def getFullTextXML(self,noredirect=None):
          """getFullTextXML; gives the FullText as an XML Document, and <error></error> if somthing goes wrong."""
- Line 818  class ECHO_resource(Folder,Persistent,EC
+ Line 1049  class ECHO_resource(Folder,Persistent,EC
              coordsnew=[]
          self.coords=coordsnew
-     self.viewClassification=""
+ #       self.viewClassification=""
- Line 874  class ECHO_resource(Folder,Persistent,EC
+ Line 1105  class ECHO_resource(Folder,Persistent,EC
          self.contentType=self.bib_type
          for data in self.metadata:
              data_neu=re.sub('-','_',data)
-             self.meta
+                         self.metaDataHash[data_neu]=getattr(self,data)[0:]
-                         DataHash[data_neu]=getattr(self,data)[0:]
          pt=zptFile(self, 'zpt/ChangeECHO_resource_metadata.zpt')
- Line 958  class ECHO_resource(Folder,Persistent,EC
+ Line 1188  class ECHO_resource(Folder,Persistent,EC
                  self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]
                  self.OSAS_meta[self.getFieldTag(tags,field)]=self.REQUEST.form['OSAS_%s'%self.getFieldTag(tags,field)]
              except:
-                 """nothing"""
+                             zLOG.LOG("ECHO_collection (changeECHO_resource_metadata)",zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])
+             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()
- Line 967  class ECHO_resource(Folder,Persistent,EC
+ Line 1198  class ECHO_resource(Folder,Persistent,EC
              RESPONSE.redirect('manage_main')
-     def getMDValue(self,fieldName,empty=None):
-         if empty:
-             return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
+     def getMDValueSimpleSearchField(self):
+             """returns value for simple search"""
+             try:
+                 return " ".join([self.getMDValue('title',generic="yes"),
+                              self.getMDValue('author',generic="yes"),
+                              self.getMDValue('year',generic="yes"),self.getTitle()])
+             except:
+                 #zLOG.LOG(" ECHO_collection(getMDSimpleSearchField)",zLOG.INFO," ".join([self.getMDValue('title',generic="yes"),
+                  #            self.getMDValue('author',generic="yes"),
+                   #           self.getMDValue('year',generic="yes"),'']))
+                 return ""
+     def getMDValue(self,fieldNameTest,empty=None,generic=None):
+             """get md values"""
+             #TODO: cache mappinghash
+             fieldName=None
+             if generic:
+                 if self.contentType:
+                     ct=self.contentType.replace(" ","_").lower()
+                 else:
+                     zLOG.LOG("ECHO_collection (getMDValue)", zLOG.INFO, "no_content type for %s"%self.getId())
+                     ct=""
+                 #caching
+                 if not hasattr(self,'_v_mapHash'): #noch keine cachevariable
+                     self._v_mapHash={}
+                 tmp=self._v_mapHash.get(ct,None)
+                 if tmp: #teste ob type schon existiert
+                     fieldName=tmp.get(fieldNameTest,None)
+                 else:
+                     self._v_mapHash[ct]={}
+                 #noch nicht gecached
+                 if not fieldName and hasattr(self.standardMD,ct):
+                     fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0]
+                     self._v_mapHash[ct][fieldNameTest]=fieldName
+             if not fieldName:
+                 fieldName=fieldNameTest
+             if not empty:
+                #FIXME: warum gibt es manchmal kein metadatahas
+                 try:
+                     ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
+                 except:
+                     zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId())
+                     return ""
+             else:
+                    ret= self.metaDataHash.get(fieldNameTest,empty)
+             if type(ret) is StringType:
+                return ret.decode('utf-8')
          else:
-             return self.metaDataHash.get(fieldName,empty)
+                return ret
+     getFieldValue=getMDValue #depricated
      def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):
          """new index.meta"""
- Line 987  class ECHO_resource(Folder,Persistent,EC
+ Line 1275  class ECHO_resource(Folder,Persistent,EC
              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"""
+             """return bibliographical metadata as stored in the object"""
          try:
- Line 995  class ECHO_resource(Folder,Persistent,EC
+ Line 1283  class ECHO_resource(Folder,Persistent,EC
          except:
              return "<error> no metadata stored</error>"
+     def getXQueryMetaData(self,xquery):
+                 '''
+                 execute an xquery on the metadata and returns a list of tuples,
+                 each tuple represent the content of the node as text and the whole node as xml-fragment
+                 @param xquery: xquery auf den metadaten
+                 '''
+                 try:
+                         md=writeMetadata(self.metalink,self.metaDataHash,xmlfrag="yes")
+                 except:
+                         return None
+                 dom = NonvalidatingReader.parseString(md,"http://www.mpiwg-berlin.mpg.de/")
+                 results=Ft.Xml.XPath.Evaluate(xquery, contextNode=dom)
+                 ret=[]
+                 for result in results:
+                     buf = cStringIO.StringIO()
+                     PrettyPrint(result, stream=buf)
+                     str = buf.getvalue()[0:]
+                     buf.close()
+                     ret.append((getTextFromNode(result),str))
+                 return ret
      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"""
          self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
          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):
+     def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
          """Aenderung der Properties"""
          setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
- Line 1019  class ECHO_resource(Folder,Persistent,EC
+ Line 1334  class ECHO_resource(Folder,Persistent,EC
      {'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'},
      {'label':'set/change startpage','action':'setStartPageForm'},
      {'label':'Copy MD for indexing and search','action':'copySearchFields'},
+         {'label':'Change AccessRights','action':'changeAccessRightForm'},
      )
- Line 1056  class ECHO_resource(Folder,Persistent,EC
+ Line 1372  class ECHO_resource(Folder,Persistent,EC
-     def getFieldValue(self,field):
-         """get value"""
-         try:
-             ret=self.metaDataHash[field]
-             if ret == "":
-                 return None
-             else:
-                 return ret
-         except:
-             return None
      def getMetaDataHash(self):
          """md hash"""
          return self.metaDataHash
      def setFieldValue(self,field,value):
          """get value"""
+         #TODO: remove setFieldValue
      if not hasattr(self,'metaDataHash'):
          setattr(self,'metaDataHash',{})
      self.metaDataHash[field]=value[0:]
      def copySearchFields(self):
          """copys metadatafields to the object"""
          fields=['author','title','year']
          for field in fields:
-             setattr(self,'MD_'+field,self.getFieldValue(field))
+                     setattr(self,'MD_'+field,self.getMDValue(field,generic="yes"))
      def findLabelsFromMapping(self,referenceType):
- Line 1103  class ECHO_resource(Folder,Persistent,EC
+ Line 1407  class ECHO_resource(Folder,Persistent,EC
      fields=[]
          fieldlist=self.standardMD.fieldList
+         tags=self.findTagsFromMapping(self.contentType)
+         self.referencetypes=tags[2]
      for referenceTypeF in self.referencetypes:
          if referenceTypeF[1].title.lower() == referenceType.lower():
- Line 1136  class ECHO_resource(Folder,Persistent,EC
+ Line 1442  class ECHO_resource(Folder,Persistent,EC
          bibdata={}
          retdata={}
          fieldlist=self.standardMD.fieldList
- Line 1187  class ECHO_resource(Folder,Persistent,EC
+ Line 1491  class ECHO_resource(Folder,Persistent,EC
          if RESPONSE:
              return RESPONSE.redirect('manage_main')
-     def ECHO_getResourceMD(self,template="yes",back=None):
+             return "OK:",self.absolute_url(),self.contentType
+     def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"):
          """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
          (metadict, error)=readMetadata(self.metalink)
- Line 1197  class ECHO_resource(Folder,Persistent,EC
+ Line 1503  class ECHO_resource(Folder,Persistent,EC
          if not error=="": #Fehler beim Auslesen des Metafiles
          return "ERROR:",error
+         if (not self.contentType) or (overwrite=="yes"):
+                 self.contentType=metadict['bib_type'].lower()
      if not (metadict['bib_type'].lower()==self.contentType.lower()):
          self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
- Line 1204  class ECHO_resource(Folder,Persistent,EC
+ Line 1512  class ECHO_resource(Folder,Persistent,EC
          return zptFile(self, 'zpt/ECHO_getResourceMDErrorContentType.zpt')()
-     self.REQUEST.SESSION['metadict']=metadict
+         #self.REQUEST.SESSION['metadict']=metadict
-     self.REQUEST.SESSION['diffs']=checkDiffs(self,self.REQUEST.SESSION['metadict'])
+         self.REQUEST.SESSION['diffs']=checkDiffs(self,metadict)
          if template=="yes":
+                 #pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/ECHO_resourceMD.zpt'),metadict=metadict).__of__(self)
          pt=zptFile(self, 'zpt/ECHO_resourceMD.zpt')
-         return pt()
+                 return pt(metadict=metadict)
- Line 1235  class ECHO_resource(Folder,Persistent,EC
+ Line 1545  class ECHO_resource(Folder,Persistent,EC
              return None
+     security.declareProtected('View','index_html')
      def index_html(self):
          """standard page"""
          pdf=self.checkRDF(self.link)
- Line 1302  def manage_addECHO_resourceForm(self):
+ Line 1613  def manage_addECHO_resourceForm(self):
- def manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
+ def manage_addECHO_resource(self,id,title,label,description="",responsible="",link="",metalink="",weight="",copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
-     """addaresource"""
+     """addresource"""
      newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
- Line 1318  class ECHO_externalLink(Folder,ECHO_basi
+ Line 1629  class ECHO_externalLink(Folder,ECHO_basi
      security=ClassSecurityInfo()
      meta_type='ECHO_externalLink'
+     security.declarePublic('content_html')
      def content_html(self):
          """template fuer content"""
-         return ECHO_basis.content_html(self,'externalLink')
+         ret= ECHO_basis.content_html(self,'externalLink')
+         if type(ret) is StringType:
+             return ret.decode('utf-8')
+         else:
+            return ret
      def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
- Line 1364  class ECHO_externalLink(Folder,ECHO_basi
+ Line 1682  class ECHO_externalLink(Folder,ECHO_basi
      manage_options = Folder.manage_options+(
          {'label':'Main Config','action':'ECHO_externalLink_config'},
+         {'label':'Graphic Coords','action':'ECHO_graphicEntry'},
          )
- Line 1394  class ECHO_link(ECHO_externalLink):
+ Line 1713  class ECHO_link(ECHO_externalLink):
      meta_type="ECHO_link"
+         manage_options = ECHO_externalLink.manage_options+(
+             {'label':'add links config','action':'ECHO_link_addLinksForm'},
+                 )
+         def ECHO_link_addLinksForm(self):
+             """Main configuration"""
+             pt=zptFile(self, 'zpt/ChangeECHO_link_addLinks.zpt')
+             return pt()
+         def ECHO_link_addLinks(self,addLinks,RESPONSE):
+             """add links"""
+             self.addLinks=addLinks
+             if RESPONSE is not None:
+                 RESPONSE.redirect('manage_main')
      def content_html(self):
          """template fuer link"""
          if hasattr(self,"link_template"):
-             return ECHO_basis.content_html(self,'link')
+                         ret=ECHO_basis.content_html(self,'link')
+                 else:
+                         ret=ECHO_basis.content_html(self,'collection')
+                 #return ret
+                 return ret
+ #
+ #
+ #                try:
+ #                    return ret.decode('utf-8')
+ #                except:
+ #                    try:
+ #                        return ret.decode('latin-1')
+ #                    except:
+ #
+ #                        return ret
+ #
+         def index_html(self):
+                 """standard link"""
+                 if self.link:
+                  splitted=self.link.split("?")
+                  if len(splitted)>1:
+                         params=cgi.parse_qs(splitted[1])
+                         for x in params.keys():
+                                 if type(params[x]) is ListType:
+                                         params[x]=params[x][0]
+                  else:
+                         params={}
+                  if getattr(self,'addLinks','yes')=="yes":
+                      params['backLink']=self.aq_parent.absolute_url()
+                      params['startLink']=splitted[0]+"?"+urllib.urlencode(params)
+                  return self.REQUEST.RESPONSE.redirect(splitted[0]+"?"+urllib.urlencode(params))
          else:
-             return ECHO_basis.content_html(self,'collection')
+                  return ""
  def manage_addECHO_linkForm(self):
          """Form for external Links"""
- Line 1408  def manage_addECHO_linkForm(self):
+ Line 1785  def manage_addECHO_linkForm(self):
          return pt()
- def manage_addECHO_link(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
+ def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):
      """Add an external Link"""
      newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
      self._setObject(id,newObj)
+     getattr(self,id).addLinks='no'
      if RESPONSE is not None:
          RESPONSE.redirect('manage_main')
- class ECHO_collection(Folder, Persistent, Implicit, Cacheable,ECHO_basis):
+ class ECHO_collection(CatalogAware, Folder, Persistent, Implicit, Cacheable,ECHO_basis):
      """ECHO Collection"""
+     management_page_charset="utf-8"
      security=ClassSecurityInfo()
      meta_type='ECHO_collection'
-     viewClassificationList=viewClassificationListMaster
+     default_catalog='resourceCatalog'
+ #    viewClassificationList=viewClassificationListMaster
      displayTypes=displayTypes
      path="/mpiwg/online/permanent/shipbuilding"
+     def getMDValueSimpleSearchField(self):
+           """returns value for simple search"""
+           return " ".join([self.title,self.description])
+     def getTitleAndLabel(self):
+         """gibt title und label zurueck"""
+         return (getattr(self,'title',''),getattr(self,'label',''))
+     def localizeObjects(self):
+             """localize all objects"""
+             contents=self.ZopeFind(self,obj_metatypes=['ECHO_externalLink','ECHO_link','ECHO_mapText'])
+             find=self.ZopeFind(self,obj_ids=('locale_en'))
+             if not find:
+                 self.manage_addECHO_locale("en",'','')
+             for content in contents:
+                     if content[1].meta_type in ['ECHO_link','ECHO_externalLink']:
+                             find=content[1].ZopeFind(content[1],obj_metatypes=('ECHO_mapText'))
+                             if find:
+                                     root=find[0][1]
+                                     locale=find[0][1].ZopeFind(find[0][1],obj_ids=('locale_en'))
+                             else:
+                                     root=None
+                     else:
+                             root=content[1]
+                             locale=content[1].ZopeFind(content[1],obj_ids=('locale_en'))
+                     if root and not locale:
+                             root.manage_addECHO_locale("en",'','')
+             pt=zptFile(self, 'zpt/localizeObjects.zpt')
+             return pt()
+     def localize(self,REQUEST,RESPONSE):
+             """localize"""
+             for key in REQUEST.form.keys():
+                     splitted=key.split("!")
+                     if splitted[0]=="" or splitted[0]=="en" or splitted[0]=="title" or splitted[0]=="label":
+                             if splitted[0]=="en":
+                                     setattr(self.locale_en,splitted[1],REQUEST.form[key])
+                             else:
+                                     setattr(self,splitted[0],REQUEST.form[key])
+                     else:
+                             obj=getattr(self,splitted[0])
+                             if obj.meta_type=="ECHO_mapText":
+                                     if splitted[1]=="en":
+                                             obj.locale_en.pt_edit(REQUEST.form[key],None)
+                                     else:
+                                             obj.pt_edit(REQUEST.form[key],None)
+                             else:
+                                     text=obj.ZopeFind(obj,obj_metatypes=['ECHO_mapText'])
+                                     if splitted[1]=="en":
+                                             text[0][1].locale_en.pt_edit(REQUEST.form[key],None)
+                                     else:
+                                             text[0][1].pt_edit(REQUEST.form[key],None)
+             if RESPONSE is not None:
+                         RESPONSE.redirect('manage_main')
      def getRDF(self,urn=None):
          """rdf of the collection"""
- Line 1476  class ECHO_collection(Folder, Persistent
+ Line 1923  class ECHO_collection(Folder, Persistent
          pt=zptFile(self, 'zpt/changeMetaDataLinkForm')
          pt.content_type="text/html"
          return pt()
+     def changeAccessRightsCollectionForm(self,preselect=None):
+         """change access rights of all resources in this collection"""
+         pt=zptFile(self, 'zpt/changeAccessRightsCollectionForm')
+         pt.content_type="text/html"
+         return pt(preselect=preselect)
      def changeAccessRightsCollection(self):
          """change"""
          ret=""
- Line 1484  class ECHO_collection(Folder, Persistent
+ Line 1940  class ECHO_collection(Folder, Persistent
          resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
          for resource in resources:
-             try:
+                     if argv.has_key(resource[1].getId()+'_xml'):
-                 ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
+                             ret+=resource[1].getId()+"   "+argv[resource[1].getId()+'_xml']+"</br>"
-                 resource[1].changeAccessRightMD(argv[resource[1].getId()])
+                             resource[1].setAccessRightXML(argv[resource[1].getId()+'_xml'])
-             except:
+                             resource[1].accessRight=argv[resource[1].getId()+'_xml']
-                 pass
+                     elif argv.has_key(resource[1].getId()+'_echo'):
+                             ret+="only local:"+resource[1].getId()+"   "+argv[resource[1].getId()+'_echo']+"</br>"
+                             resource[1].accessRight=argv[resource[1].getId()+'_echo']
+                     else:
+                             ret+="ERROR:" +resource[0]
          return ret
      def changeMetaDataLinkInCollection(self):
- Line 1526  class ECHO_collection(Folder, Persistent
+ Line 1986  class ECHO_collection(Folder, Persistent
          ret=""
          argv=self.REQUEST.form
-         resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
+             resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
          for resource in resources:
              try:
- Line 1541  class ECHO_collection(Folder, Persistent
+ Line 2001  class ECHO_collection(Folder, Persistent
          ret=""
          argv=self.REQUEST.form
-         resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+             resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
          for resource in resources:
              try:
- Line 1551  class ECHO_collection(Folder, Persistent
+ Line 2011  class ECHO_collection(Folder, Persistent
                  pass
          return ret
-     def updateCollection(self,RESPONSE=None):
+     def changeLabelsInCollection(self):
+             """change all lables of a collection"""
+             ret=""
+             argv=self.REQUEST.form
+             resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
+             for resource in resources:
+                     try:
+                             ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
+                             resource[1].label=argv[resource[1].getId()][0:]
+                     except:
+                             pass
+             return ret
+     def importCollection(self,path=None,RESPONSE=None):
          """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
-         files=os.listdir(self.path)
+         if path is None:
+                 pt=zptFile(self, 'zpt/importCollection.zpt')
+                 return pt()
+         files=os.listdir(path)
      ret=""
          for fileName in files:
              if fileName:
-         tempPath=re.sub("/mpiwg/online","",self.path)
+                 tempPath=re.sub("/mpiwg/online","",path)
          link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg"
          metalink=self.path+"/"+fileName+"/index.meta"
- Line 1582  class ECHO_collection(Folder, Persistent
+ Line 2062  class ECHO_collection(Folder, Persistent
          if RESPONSE is not None:
              RESPONSE.redirect('manage_main')
-     def updateCollectionMD(self,RESPONSE=None):
-         """updateMD"""
-         files=os.listdir(self.path)
-         for fileName in files:
-             if fileName:
-                 genObj=getattr(self,fileName)
-                 genObj.copyIndex_meta2echo_resource()
-                 genObj.generate_title()
-         if RESPONSE is not None:
-             RESPONSE.redirect('manage_main')
      def changeViewerTemplateSetsForm(self):
          """change the viewer template set"""
          pt=zptFile(self, 'zpt/changeViewerTemplateSet')
- Line 1686  class ECHO_collection(Folder, Persistent
+ Line 2152  class ECHO_collection(Folder, Persistent
              RESPONSE.redirect('manage_main')
      def copySearchFields(self,RESPONSE=None):
-         """copys import metadatafields to the object"""
+             """copys < metadatafields to the object"""
-         resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+             resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
          for resource in resources:
- Line 1705  class ECHO_collection(Folder, Persistent
+ Line 2171  class ECHO_collection(Folder, Persistent
      def reloadMetaDataFromStorage(self,RESPONSE=None):
          """copy metadata from the storage to ECHO"""
-         return reloadMetaDataFromStorage(self,RESPONSE=None)
+             return reloadMetaDataFromStorage(self,RESPONSE)
      def getPartnerCopyright(self,name,sonst="generic"):
- Line 1736  class ECHO_collection(Folder, Persistent
+ Line 2202  class ECHO_collection(Folder, Persistent
           """nothing"""
       return retStr
-     def getViewClassification(self):
+ #    def getViewClassification(self):
-         if hasattr(self,'viewClassification'):
+ #        if hasattr(self,'viewClassification'):
-             return self.viewClassification
+ #            return self.viewClassification
-         else:
+ #        else:
-             return ""
+ #            return ""
      def createRessourcesFromXMLForm(self):
- Line 1763  class ECHO_collection(Folder, Persistent
+ Line 2229  class ECHO_collection(Folder, Persistent
              manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
          return ret
+     security.declarePublic('getImageTag')
      def getImageTag(self):
          """GetTag"""
          try:
- Line 1770  class ECHO_collection(Folder, Persistent
+ Line 2237  class ECHO_collection(Folder, Persistent
          except:
              return ""
+     def addMovie(self,id,title,label,description,contentType,responsible,link,thumbUrl,rawFile,lowresFile,metalink,weight,credits=None,coords=None,RESPONSE=None):
+         """SSS"""
+         #manage_addECHO_movie(self,id,title,label,description,responsible,link,thumbUrl,rawFile,metalink,weight,credits=None,coords=None,RESPONSE=None)
+         if not hasattr(self,id):
+                 try:
+                         manage_addECHO_movie(self,id,title,label,description,responsible,link,thumbUrl,rawFile,lowresFile,metalink,weight,credits=None,coords=None,RESPONSE=None)
+                         return "done"
+                 except:
+                         return None
+         else:
+                 obj=getattr(self,id)
+                 obj.changeECHO_movie_main(metalink,link,rawFile,lowresFile,thumbUrl,title,label,description,contentType,weight=weight)
+         return "changed"
      def addResource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
          """SSS"""
          try:
- Line 1792  class ECHO_collection(Folder, Persistent
+ Line 2276  class ECHO_collection(Folder, Persistent
          except:
              return ""
-     def getCollectionTreeXML(self):
+     def getCollectionTreeXML(self,pwstr=None):
          """Tree as XML"""
-     def addPassWd(str):
+         def addPassWd(str,pwstr=None):
          """adds a user/passwd to an url"""
+                 if pwstr:
+                         txt2=re.sub(r"(http://)(.*?)","\g<1>%s@\g<2>"%pwstr,str)
+                 else:
          txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str)
          return txt2
-         def getCollection(object,depth=0):
+         def getCollection(object,depth=0,pwstr=None):
              depth+=1
              collections=""
              for entry in object.__dict__.keys():
                  element=getattr(object,entry)
                  try:
                      if element.meta_type in ["ECHO_collection","ECHO_group"]:
-                         collections+="<element name=\""+urllib.quote(element.title)+"\" url=\""+addPassWd(element.absolute_url())+"\">"
+                         collections+="<element name=\""+urllib.quote(element.title)+"\" url=\""+addPassWd(element.absolute_url(),pwstr=pwstr)+"\">"
                          collections+=getCollection(element,depth)+"</element>\n"
                  except:
                      """nothing"""
              return collections
      ret="""<?xml version="1.0" encoding="utf-8" ?>"""
-         return ret+"<collection>"+getCollection(self)+"</collection>"
+         return ret+"<collection>"+getCollection(self,pwstr=pwstr)+"</collection>"
      def createAllJSAreas(self):
          """create area calls for JavaScript"""
          areas = self.getAllMapAreas()
      return self.createJSAreas(areas)
+     emptyPartner=ECHO_partner("", "","", "", "", "", "", "", "")
      security.declarePublic('getCreditObject')
      def getCreditObject(self,name):
          """credit id to credititem"""
          try:
              return getattr(self.partners,name)
          except:
-             return ""
+             return self.emptyPartner
      security.declarePublic('ECHO_generateNavBar')
      def ECHO_generateNavBar(self):
- Line 1863  class ECHO_collection(Folder, Persistent
+ Line 2355  class ECHO_collection(Folder, Persistent
      return ECHO_rerenderLinksMD(self,obj,types)
-     def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""):
+     def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""):
          self.id = id
          """Festlegen der ID"""
- Line 1887  class ECHO_collection(Folder, Persistent
+ Line 2379  class ECHO_collection(Folder, Persistent
          {'label':'Main Config','action':'ECHO_collection_config'},
          {'label':'Change Labels','action':'changeLabels'},
          {'label':'Change Titles','action':'changeTitles'},
+         {'label':'Localize','action':'localizeObjects'},
      {'label':'Change Weights','action':'changeWeights'},
          {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMDWarning'},
          {'label':'Graphic Coords','action':'ECHO_graphicEntry'},
- Line 1894  class ECHO_collection(Folder, Persistent
+ Line 2387  class ECHO_collection(Folder, Persistent
      {'label':'Set Startpage','action':'setStartpageFolderForm'},
          {'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'},
      {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
-     {'label':'ImportCollection','action':'updateCollection'},
+         {'label':'ImportCollection','action':'importCollection'},
      {'label':'Copy MD for indexing and search','action':'copySearchFields'},
+         {'label':'Change access rights',  'action':'changeAccessRightsCollectionForm'},
          )
- Line 1922  class ECHO_collection(Folder, Persistent
+ Line 2416  class ECHO_collection(Folder, Persistent
      security.declarePublic('changeECHO_collection')
-     def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",viewClassification=None,location=None,isAlwaysClickable=None):
+     def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix=""):
          """Aenderung der Properties"""
          self.secondaryLink=secondaryLink
- Line 1931  class ECHO_collection(Folder, Persistent
+ Line 2425  class ECHO_collection(Folder, Persistent
      self.bgcolour=bgcolour
          self.location=location
      self.isAlwaysClickable=isAlwaysClickable
+         self.prefix=prefix[0:]
+         self.suffix=suffix[0:]
          setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
- Line 1955  class ECHO_collection(Folder, Persistent
+ Line 2451  class ECHO_collection(Folder, Persistent
          pt=zptFile(self, 'zpt/ECHO_content_overview.zpt')
          return pt()
-     security.declareProtected('View','index_html')
+     security.declareProtected('View','index_html')
      def index_html(self):
          """standard page"""
          if self.ZCacheable_isCachingEnabled():
- Line 1974  class ECHO_collection(Folder, Persistent
+ Line 2470  class ECHO_collection(Folder, Persistent
          elif hasattr(self,'collection_index_template'):
              ret=self.collection_index_template()
          elif hasattr(self,'main_index_template'):
-             ret=self.main_index_template()
+             ret=self.main_index_template.__of__(self)(self.main_template)
          else:
          pt=zptFile(self, 'zpt/ECHO_main_index_template_standard.zpt')
          pt.content_type="text/html"
- Line 1983  class ECHO_collection(Folder, Persistent
+ Line 2480  class ECHO_collection(Folder, Persistent
      self.ZCacheable_set(ret)
          return ret
+     security.declarePublic('content_html')
      def content_html(self,**argv):
          """template fuer content"""
      #print "NN",argv
-         return ECHO_basis.content_html(self,'collection')
+         ret = ECHO_basis.content_html(self,'collection')
+         if type(ret) is StringType:
+                return ret.decode('utf-8')
+         else:
+                return ret
      def getCredits(self):
          """Ausgabe der credits"""
- Line 2023  class ECHO_collection(Folder, Persistent
+ Line 2527  class ECHO_collection(Folder, Persistent
          """javascript"""
          return sendFile(self, 'js/hl_add.js', 'text/plain')
-     def getAllMapAreas(self):
+     def getAllMapAreas(self,mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']):
          """Give list of coordinates"""
-         subColTypes=['ECHO_collection','ECHO_resource']
          areas=[]
-         for entrySearch in self.ZopeFind(self,obj_metatypes=subColTypes):
+         for entry in self.getSubCols(subColTypes=mapColTypes):
-             object=entrySearch[1]
+             object=entry
          areas.extend(object.getMapAreas())
          return areas
- Line 2046  class ECHO_collection(Folder, Persistent
+ Line 2550  class ECHO_collection(Folder, Persistent
      getSubCols = ECHO_helpers.getSubCols
+     def getSubcolsXMLRpc(self,searchSimple):
+         """simplesearch results suitable for xml rpc, gives back array objid,url"""
+         return [x.absolute_url() for x in self.getSubCols(searchSimple=searchSimple)]
  Globals.InitializeClass(ECHO_collection)
  def manage_addECHO_collectionForm(self):
- Line 2054  def manage_addECHO_collectionForm(self):
+ Line 2564  def manage_addECHO_collectionForm(self):
          return pt()
- def manage_addECHO_collection(self,id,title,label,description,contentType,responsible,weight,sortfield,coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
+ def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
      """add a echo collection"""
- Line 2162  class ECHO_group(ECHO_collection):
+ Line 2672  class ECHO_group(ECHO_collection):
                  except:
                      return "ECHO_groups"
+         security.declarePublic('content_html')
      def content_html(self):
          """template fuer content"""
          return ECHO_basis.content_html(self,'group')
- Line 2342  class ECHO_root(Folder,Persistent,Implic
+ Line 2853  class ECHO_root(Folder,Persistent,Implic
      security=ClassSecurityInfo()
      meta_type="ECHO_root"
+     management_page_charset="utf-8"
+     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'},
+                 {'label':'update Resource Catalog','action':'updateResourceCatalog'},
+                 {'label':'Copy MD for indexing and search','action':'copySearchFields'},
+ )
+     def copySearchFields(self,RESPONSE=None):
+             """copys < metadatafields to the object"""
+             resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
+             for resource in resources:
+                     resource[1].copySearchFields()
+             if RESPONSE is not None:
+                     RESPONSE.redirect('manage_main')
+     def mod_re_sub(self,pattern,replace,string):
+         """re.sub aus mod re zur Verfuegung stellen"""
+         return re.sub(pattern,replace,string)
+     def findObjectFromFulltext(self,existUri):
+         '''
+         @param url:
+         @param existUri:
+         '''
+         if existUri:
+             #TODO: at the moment assume that the filename is unique, the whole has to changed to a system of ids.
+             filename=existUri.split("/")[-1]
+         founds=self.resourceCatalog.search({'fullTextUrl':os.path.splitext(filename)[0]})
+         ret=[(found.title,found.getObject().absolute_url(),found.getObject().aq_parent.absolute_url()) for found in founds]
+         return ret
+     def reindex(self,RESPONSE=None):
+         """indiziere alle Objecte neu"""
+         if RESPONSE:
+             RESPONSE.write("<html><body>")
+         resources=self.ZopeFind(self,obj_metatypes=["ECHO_resource"], search_sub=1)
+         for resource in resources:
+             resource[1].reindex()
+             #print "<p> done %s </p>\n"
+             if RESPONSE:
+                 RESPONSE.write("<p> done %s </p>\n"%resource[0])
+         if RESPONSE:
+             RESPONSE.write("<p> ok </p></html></body>\n")
+     def setLanguage(self,lang):
+             """Set language cookie"""
+             self.REQUEST.RESPONSE.setCookie('lang_exhibition',lang,path="/")
-     def content_overview_main_t(self):
+     def switchLanguage(self):
-         """template for map overview page"""
+             """Set language cookie"""
-     pt = zptFile(self, 'zpt/ECHO_content_overview_main')
+             if self.getLanguage()=="en":
+                     lang="de"
+             else:
+                     lang="en"
+             self.REQUEST.RESPONSE.setCookie('lang_exhibition',lang,path="/")
+             self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1'])
+     def getLanguage(self):
+             """get language cookie"""
+             lang= self.REQUEST.cookies.get('lang_exhibition','de')
+             if lang == '':
+                     lang="de"
+             return lang
+     def getContentOverviewTemplate(self):
+         """produces overview template with macro"""
+         pt = zptObjectOrFile(self, 'content_overview_template')
      return pt
-     ###CDLI adds -> have to be removed
+     def mapstyle_css(self):
+         """send mapstyle.css"""
+         sendFile(self, 'html/ECHO_mapstyle.css', 'text/css')
+     ###Cdli adds -> have to be removed
      def getTablet(self,item):
          #print "getTablet"
      try:
- Line 2368  class ECHO_root(Folder,Persistent,Implic
+ Line 2968  class ECHO_root(Folder,Persistent,Implic
      def checkResource(self,id):
          """checks if a resource is in the tree, gives back none or list of resources"""
+             if not id:
+                 id=""
+             splitted=id.split("/")
+             id=splitted[len(splitted)-1]
          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]
- Line 2516  class ECHO_root(Folder,Persistent,Implic
+ Line 3120  class ECHO_root(Folder,Persistent,Implic
          pt=zptFile(self, 'zpt/changeWeightForm')
          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):
- Line 2582  class ECHO_root(Folder,Persistent,Implic
+ Line 3176  class ECHO_root(Folder,Persistent,Implic
          return ret
      def getValueFromClass(self,field,found):
-         """retattribute falss existing"""
+             """ret attribute if existing"""
          try:
              return getattr(found,field).decode('ascii','ignore')
          except:
              return ""
+     security.declarePublic('getImageTag')
      def getImageTag(self):
          """needed by main_template"""
          return ""
      secondaryLink="" #needed by main_template
      secondaryLinkTitle="" #needed by main_template
- Line 2599  class ECHO_root(Folder,Persistent,Implic
+ Line 3195  class ECHO_root(Folder,Persistent,Implic
      """hack"""
      return "#dddddd"
+     security.declareProtected('View','contentTypeSelector_HTML')
      def contentTypeSelector_HTML(self,selected=None):
          """give type selector"""
          if not selected:
- Line 2641  class ECHO_root(Folder,Persistent,Implic
+ Line 3238  class ECHO_root(Folder,Persistent,Implic
           """nothing"""
       return retStr
-     def renderingTypeSelector_HTML(self,selected=None):
-          """give type selector"""
-      if not selected:
-          retStr="<option selected>\n"
-      else:
-          retStr="<option>\n"
-      try: # erste version renderingTypes exists
-          for renderingType in self.ZopeFind(self.renderingTypes,obj_metatypes=["ECHO_renderingType"]):
-              if selected and (renderingType[0]==selected):
-                  retStr+="""<option selected value="%s">%s\n"""%(renderingType[0],renderingType[0])
-              else:
-                  retStr+="""<option value="%s">%s\n"""%(renderingType[0],renderingType[0])
-      except:
-          """nothing"""
-      return retStr
      def copyrightTypeSelector_HTML(self, object=None, selected=None,first=None):
           """give type selector"""
- Line 2853  class ECHO_root(Folder,Persistent,Implic
+ Line 3433  class ECHO_root(Folder,Persistent,Implic
          else:
              return ""
-     def link2html(self,str):
+     link2html=vlp_xmlhelpers.link2html
-         """link2html fuer VLP muss hier noch raus"""
-         if str:
-             str=re.sub("\&","&amp;",str)
-             dom=xml.dom.minidom.parseString("<?xml version='1.0' encoding='utf-8'?><txt>"+str+"</txt>")
-             links=dom.getElementsByTagName("link")
+     xml2html=vlp_xmlhelpers.xml2html
-             for link in links:
+     checkRef=vlp_xmlhelpers.checkRef
-                 link.tagName="a"
-         ref=link.getAttribute("ref")
-         pn=link.getAttribute("page")
-                 if self.checkRef(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)
+ #    def checkRef(self,ref):
-             newxml=dom.toxml('utf-8')
+ #            if ref[0:3]=='lit':
+ #                    if len(self.library_data({ 'id':ref}))>0:
-         retStr=regexpTXT.search(newxml)
+ #                            return 1
+ #            try:
-         return retStr.group(1)
+ #                    if ref[0:7]=="tec_cat":
+ #                            return 1
+ #            except:
-         return ""
+ #                    """nothing"""
+ #
-     def xml2html(self,str,quote="yes"):
+ #            dbs={'vl_technology':'','vl_people':" AND complete='yes'",'vl_sites':''}
-         """link2html fuer VLP muss hier noch raus"""
+ #            res=None
+ #            for db in dbs.keys():
-         if str:
+ #                    res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db])))
-             if quote=="yes2":
+ #            return res
-                 str=re.sub("\&","&amp;",str)
+ #
-             #dom=xml.dom.minidom.parseString(str)
+ #    #Ende Methode fuer vlp
-         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")
-         cns=link.childNodes[0:]
-         newLink=dom.createElementNS(EMPTY_NAMESPACE,"a")
-         for x in cns:
-             newLink.appendChild(x)
-         link.parentNode.replaceChild(newLink,link)
-                 if self.checkRef(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)
-             #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):
-         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
-     #Ende Methode fuer vlp
      def PgQuoteString(self,string):
          """Quote string"""
          return libpq.PgQuoteString(string)
+     security.declareProtected('View','getPartners')
      def getPartners(self):
          """Get list of Partners. Presently only from a subfolder partners"""
      if hasattr(self,'partners'):
- Line 3138  class ECHO_root(Folder,Persistent,Implic
+ Line 3649  class ECHO_root(Folder,Persistent,Implic
          inst=self.ZopeFind(self.institutions, obj_ids=[id])
          return inst
+     def updateResourceCatalog(self,REQUEST,RESPONSE):
+         """update ressource catalog"""
+         catalog=getattr(self,'resourceCatalog',None)
+         if not catalog:
+             return """<html><body><h3>No resourceCatalog available</h3></body></html>"""
+         else:
+             class element:
+                 def __init__(self,group,name):
+                     self.group=group
+                     self.name=name
+             catalog.manage_delObjects('author splitter')
+             #elements=[element('Stop Words',""" Don't remove stop words' """),element('Word Splitter','ECHO author splitter')]
+             elements=[element('Word Splitter','ECHO author splitter')]
+             manage_addLexicon(catalog,id="author splitter",elements=elements)
+             return catalog.manage_catalogReindex(REQUEST,RESPONSE,'manage_main')
+     def checkMetaDataLinks(self,correct=None):
+         """check all metadatalinks and if correct is set change the servername to content.mpiwg-berlin.mpg.de"""
+         self.REQUEST.RESPONSE.write("<html><body>")
+         for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
+             metalink=resource[1].metalink
+             try:
+                 url=urllib.urlopen(metalink)
+             except:
+                 self.REQUEST.RESPONSE.write("<p>ERROR (opening %s):"%resource[1].absolute_url() +" -- %s %s <br>"%sys.exc_info()[0:2])
+                 self.REQUEST.RESPONSE.write("-----------%s"%metalink)
+                 if correct:
+                     urlparsed=[x for x in urlparse.urlparse(metalink)]
+                     urlparsed[1]="content.mpiwg-berlin.mpg.de"
+                     neu=urlparse.urlunparse(urlparsed)
+                     resource[1].metalink=neu[0:]
+                     self.REQUEST.RESPONSE.write("----------changed to:%s)"%neu)
  def manage_addECHO_root(self,id,title,RESPONSE=None):
      """Add an ECHO_root"""
- Line 3200  def manage_addECHO_copyrightType(self,id
+ Line 3750  def manage_addECHO_copyrightType(self,id
- class ECHO_partner(Image,Persistent,ECHO_basis):
-     """ECHO Partner"""
-     meta_type="ECHO_partner"
-     def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
-         self.__name__=id
-         self.title=title
-         self.url=url
-         self.person=person
-         self.email=email
-         self.country=country
-         self.color=color
-         self.precondition=precondition
-         self.copyrightType=copyrightType
-         data, size = self._read_data(file)
-         content_type=self._get_content_type(file, data, id, content_type)
-         self.update_data(data, content_type, size)
-     manage_options = Image.manage_options+(
-         {'label':'Partner Information','action':'ECHO_partner_config'},
-         )
-     def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None):
-         """Change main information"""
-         self.url=url
-         self.person=person
-         self.email=email
-         self.country=country
-         self.color=color
-         self.copyrightType=copyrightType
-         if RESPONSE is not None:
-             RESPONSE.redirect('manage_main')
-     def ECHO_partner_config(self):
-         """Main configuration"""
-         if not hasattr(self,'url'):
-             self.url=""
-         pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt')
-         return pt()
- manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(),
-                              Kind='ECHO_partner',kind='ECHO_partner')
- def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='',
-                     REQUEST=None):
-     """
-     Add a new ECHO_partner object.
-     Creates a new ECHO_partner object 'id' with the contents of 'file'.
-     Based on Image.manage_addImage
-     """
-     id=str(id)
-     title=str(title)
-     content_type=str(content_type)
-     precondition=str(precondition)
-     id, title = OFS.Image.cookId(id, title, file)
-     self=self.this()
-     # First, we create the image without data:
-     self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, content_type, precondition))
-     # Now we "upload" the data.  By doing this in two steps, we
-     # can use a database trick to make the upload more efficient.
-     if file:
-         self._getOb(id).manage_upload(file)
-     if content_type:
-         self._getOb(id).content_type=content_type
-     if REQUEST is not None:
-         try:    url=self.DestinationURL()
-         except: url=REQUEST['URL1']
-         REQUEST.RESPONSE.redirect('%s/manage_main' % url)
-     return id
  class ECHO_linkList(ZopePageTemplate,ECHO_basis):
      """LinkList Objekt"""
- Line 3551  def repairCoords(self):
+ Line 4018  def repairCoords(self):
              col.addMapArea(area)
      msg += "\nDone!"
      return msg
+ from ECHO_Nav import ECHO_navigation
+ class ECHO_main(ECHO_root,ECHO_navigation):
+     """echo main object combines ECHO_root and ECHO_navigation"""
+     meta_type="ECHO_main"
+     def __init__(self,id,title):
+         """init"""
+         self.id=id
+         self.title=title
+         self.pathToHierarchy="/"+self.id # hierarchie always starts with the object.
+         self.displayedMetaTypes=displayTypes
+     manage_options = Folder.manage_options+(
+         {'label':'Main Config','action':'ECHO_navigationConfigForm'},
+         {'label':'Cache','action':'ECHO_cacheManageForm'},
+         {'label':'Main Config','action':'ECHO_copyright_configForm'},
+         {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
+         {'label':'Change Weights','action':'changeWeights'},
+         {'label':'Generate from RDF','action':'generateFromRDFForm'},
+         {'label':'update Resource Catalog','action':'updateResourceCatalog'},
+         {'label':'Copy MD for indexing and search','action':'copySearchFields'},
+         )
+ def manage_addECHO_mainForm(self):
+     """Form for adding"""
+     pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_main.zpt')).__of__(self)
+     return pt()
+ def manage_addECHO_main(self,id,title,RESPONSE=None):
+     """Add an ECHO_main"""
+     self._setObject(id,ECHO_main(id,title))
+     obj=self._getOb(id)
+     text=file(os.path.join(package_home(globals()),'zpt','main_template')).read()
+     manage_addPageTemplate(obj,'main_template',text=text)
+     if RESPONSE is not None:
+         RESPONSE.redirect('manage_main')

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

Removed from v.1.201
changed lines
	Added in v.1.270