[BACK]Return to ECHO_collection.py CVS log [TXT] [DIR] Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.101 and 1.105

version 1.101, 2004/06/07 14:37:36 version 1.105, 2004/06/07 17:14:23
Line 46  import xml.dom.minidom Line 46  import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain  from ECHO_graphicalOverview import javaHandler,javaScriptMain
 import ECHO_helpers  import ECHO_helpers
   
 def getCopyrightsFromForm(argv):  def getCopyrightsFromForm(self,argv):
     medias={}      medias={}
     partners={}      partners={}
     copyrights={}      copyrights={}
           
     copyrightsFinal=[]      copyrightsFinal=[]
     for arg in argv.keys():      for arg in argv.keys():
         print arg          
         if arg[0:5]=='media':          if arg[0:5]=='media':
             nm=int(arg[5:])              nm=int(arg[5:])
             medias[nm]=argv[arg]              medias[nm]=argv[arg]
Line 64  def getCopyrightsFromForm(argv): Line 64  def getCopyrightsFromForm(argv):
             nm=int(arg[5:])              nm=int(arg[5:])
             copyrights[nm]=argv[arg]              copyrights[nm]=argv[arg]
   
   
   
     copyrightsList=[(medias[nm],partners[nm],copyrights[nm]) for nm in medias.keys()]      copyrightsList=[(medias[nm],partners[nm],copyrights[nm]) for nm in medias.keys()]
     for copyright in copyrightsList:      for copyright in copyrightsList:
           
           if copyright[2]=='institution0000':
               copyrightsFinal.append((copyright[0],copyright[1],self.getPartnerCopyright(copyright[1],'')))
           else:
         if not copyright[0]=='':          if not copyright[0]=='':
             copyrightsFinal.append(copyright)              copyrightsFinal.append(copyright)
           
               
     return copyrightsFinal      return copyrightsFinal
   
 #List of different types for the graphical linking viewer  #List of different types for the graphical linking viewer
Line 338  class ECHO_copyright(Folder): Line 346  class ECHO_copyright(Folder):
         """change"""          """change"""
         self.title=title          self.title=title
         self.copyrights=[]          self.copyrights=[]
         self.copyrights=getCopyrightsFromForm(self.REQUEST.form)[0:]          self.copyrights=getCopyrightsFromForm(self,self.REQUEST.form)[0:]
   
         if RESPONSE is not None:          if RESPONSE is not None:
             RESPONSE.redirect('manage_main')              RESPONSE.redirect('manage_main')
Line 358  def manage_addECHO_copyright(self, id,ti Line 366  def manage_addECHO_copyright(self, id,ti
           
                   
   
     self._setObject(id, ECHO_copyright(id, title,getCopyrightsFromForm(self.REQUEST.form)))      self._setObject(id, ECHO_copyright(id, title,getCopyrightsFromForm(self,self.REQUEST.form)))
   
     if RESPONSE is not None:      if RESPONSE is not None:
         RESPONSE.redirect('manage_main')          RESPONSE.redirect('manage_main')
Line 479  class ECHO_resource(Folder,Persistent): Line 487  class ECHO_resource(Folder,Persistent):
             else:              else:
                 return "<error>no fulltext available</error>"                  return "<error>no fulltext available</error>"
   
     def getCopyright(self):      def getCopyrightsHTML(self):
         """gib link auf copyright notiz aus"""          """gib link auf copyright notiz aus"""
         if hasattr(self,'copyrightType') and hasattr(self.copyrightTypes,self.copyrightType):          
             obj=getattr(self.copyrightTypes,self.copyrightType)          if hasattr(self,'copyrightModell'):
               obj=self.copyrightModell
               
         else:          else:
             obj=getattr(self.copyrightTypes,'generic')              return "ERROR"
           ret=[]
   
         label=obj.label          for copyright in obj.getCopyrights():
         link="copyrightTypes/"+obj.getId()+'/copyright.html'  
                   
         return """<a target="_blank" href="%s">%s</a>"""%(link,label)              link="copyrightTypes/"+copyright[2]+'/copyright.html'
               
               try:
                   label=getattr(self.copyrightTypes,copyright[2]).label
                   ret.append(("""<a target="_blank" href="%s">%s</a>"""%(link,label),copyright[0],copyright[0],copyright[1],copyright[2]))
               except:
                   """nothing"""
               
           return ret
           
     def getCredits(self):      def getCredits(self):
         """Ausgabe der credits"""          """Ausgabe der credits"""
Line 1480  class ECHO_collection(Folder, Persistent Line 1498  class ECHO_collection(Folder, Persistent
         else:          else:
             return "#dddddd"              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):      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):
         """Aenderung der Properties"""          """Aenderung der Properties"""
   
         self.secondaryLink=secondaryLink          self.secondaryLink=secondaryLink
Line 1488  class ECHO_collection(Folder, Persistent Line 1506  class ECHO_collection(Folder, Persistent
         self.imageTag=imageTag          self.imageTag=imageTag
     self.bgcolour=bgcolour      self.bgcolour=bgcolour
         self.viewClassification=viewClassification          self.viewClassification=viewClassification
           self.location=location
           
         if coords:          if coords:
             coordsnew=[ string.split(x,",") for x in coords]              coordsnew=[ string.split(x,",") for x in coords]
Line 1935  class ECHO_root(Folder,Persistent,Implic Line 1954  class ECHO_root(Folder,Persistent,Implic
      return retStr       return retStr
   
   
     def copyrightTypeSelector_HTML(self,selected=None):      def copyrightTypeSelector_HTML(self,selected=None,first=None):
          """give type selector"""           """give type selector"""
   
        if not first:
      if not selected:       if not selected:
          retStr="<option selected>\n"           retStr="<option selected>\n"
      else:       else:
          retStr="<option>\n"           retStr="<option>\n"
        else:
            if not selected:
                retStr="""<option selected value="%s">%s\n"""%first
            else:
                retStr="""<option value="%s">%s\n"""%first
   
             
      try: # erste version copyrightTypes exists       try: # erste version copyrightTypes exists
Line 2357  manage_addECHO_partnerForm=DTMLFile('dtm Line 2383  manage_addECHO_partnerForm=DTMLFile('dtm
   
   
   
 def manage_addECHO_partner(self, id, file,url, person, email, country, title='', precondition='', content_type='',  def manage_addECHO_partner(self, id,file,url, person, email, country, copyrightType='', title='', precondition='', content_type='',
                     REQUEST=None):                      REQUEST=None):
     """      """
     Add a new ECHO_partner object.      Add a new ECHO_partner object.
Line 2376  def manage_addECHO_partner(self, id, fil Line 2402  def manage_addECHO_partner(self, id, fil
     self=self.this()      self=self.this()
   
     # First, we create the image without data:      # First, we create the image without data:
     self._setObject(id, ECHO_partner(id,title,url,'',person, email, country, content_type, precondition))      self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, content_type, precondition))
   
     # Now we "upload" the data.  By doing this in two steps, we      # Now we "upload" the data.  By doing this in two steps, we
     # can use a database trick to make the upload more efficient.      # can use a database trick to make the upload more efficient.
Removed from v.1.101  
changed lines
  Added in v.1.105

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