[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.91 and 1.95

version 1.91, 2004/05/27 09:31:25 version 1.95, 2004/05/28 15:01:43
Line 243  def readMetadata(url): Line 243  def readMetadata(url):
                   
         for node in metacontent:          for node in metacontent:
             try:              try:
               #print urllib.unquote(getText(node.childNodes)),getText(node.childNodes)
             metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))              metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
             except:              except:
                 """nothing"""                  """nothing"""
Line 442  class ECHO_resource(Folder,Persistent): Line 443  class ECHO_resource(Folder,Persistent):
             else:              else:
                 return "<error>no fulltext available</error>"                  return "<error>no fulltext available</error>"
           
       def getCopyright(self):
           """gib link auf copyright notiz aus"""
           if hasattr(self,'copyrightType'):
               obj=getattr(self.copyrightTypes,'copyrightType')
           else:
               obj=getattr(self.copyrightTypes,'generic')
   
           label=obj.label
           link="copyrightTypes/"+obj.getId()+'/copyright.html'
           
           return """<a target="_blank" href="%s">%s</a>"""%(link,label)
       
     def getCredits(self):      def getCredits(self):
         """Ausgabe der credits"""          """Ausgabe der credits"""
         if self.credits:          if self.credits:
Line 449  class ECHO_resource(Folder,Persistent): Line 462  class ECHO_resource(Folder,Persistent):
         else:          else:
             return []              return []
           
     def __init__(self,id,link,metalink,resourceID,title,label,description,contentType,renderingType,responsible,credits,weight,coords):      def __init__(self,id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords):
   
         self.id = id          self.id = id
         """Festlegen der ID"""          """Festlegen der ID"""
Line 462  class ECHO_resource(Folder,Persistent): Line 475  class ECHO_resource(Folder,Persistent):
         self.credits=toList(credits)          self.credits=toList(credits)
         self.description=description          self.description=description
         self.contentType=contentType          self.contentType=contentType
       self.copyrightType=copyrightType
     self.renderingType=renderingType      self.renderingType=renderingType
         self.responsible=responsible          self.responsible=responsible
         self.resourceID=resourceID          self.resourceID=resourceID
Line 658  class ECHO_resource(Folder,Persistent): Line 672  class ECHO_resource(Folder,Persistent):
                           
     manage_options = Folder.manage_options+(      manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_resource_config_main'},          {'label':'Main Config','action':'ECHO_resource_config_main'},
     {'label':'Change Credits & Copyright','action':'ECHO_resource_config_credits'},      {'label':'Change Partners & Copyright','action':'ECHO_resource_config_credits'},
     {'label':'Change Metadata','action':'ECHO_resource_config_metadata'},      {'label':'Change Metadata','action':'ECHO_resource_config_metadata'},
     {'label':'Change Coords','action':'ECHO_resource_config_coords'},      {'label':'Change Coords','action':'ECHO_resource_config_coords'},
     {'label':'Add coords','action':'ECHO_graphicEntry'},      {'label':'Add coords','action':'ECHO_graphicEntry'},
Line 832  class ECHO_resource(Folder,Persistent): Line 846  class ECHO_resource(Folder,Persistent):
         if not error=="": #Fehler beim Auslesen des Metafiles          if not error=="": #Fehler beim Auslesen des Metafiles
             return "ERROR:",error              return "ERROR:",error
         fields=self.findTagsFromMapping(self.contentType)          fields=self.findTagsFromMapping(self.contentType)
           
         #fields=self.findLabelsFromMapping(self.contentType)          #fields=self.findLabelsFromMapping(self.contentType)
         for field in fields[1]:          for field in fields[1]:
               
             if self.isDefinedInThisSet(fields,field):              if self.isDefinedInThisSet(fields,field):
                   #print urllib.unquote(metadict.get(self.getFieldTag(fields,field),''))
                 self.setFieldValue(self.getFieldTag(fields,field),metadict.get(self.getFieldTag(fields,field),''))                  self.setFieldValue(self.getFieldTag(fields,field),metadict.get(self.getFieldTag(fields,field),''))
   
                   
Line 933  def manage_addECHO_resourceForm(self): Line 950  def manage_addECHO_resourceForm(self):
   
   
   
 def manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,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"""      """addaresource"""
   
     newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,responsible,credits,weight,coords)      newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
   
     self._setObject(id,newObj)      self._setObject(id,newObj)
   
Line 1777  class ECHO_root(Folder,Persistent,Implic Line 1794  class ECHO_root(Folder,Persistent,Implic
         if not content or content=="":          if not content or content=="":
             return ""              return ""
         ret="<%s>"%tag          ret="<%s>"%tag
         ret+=urllib.quote(content)          #ret+=urllib.quote(content)
           ret+=content
   
         ret+="</%s>"%tag          ret+="</%s>"%tag
         return ret          return ret
   
     def getValueFromClass(self,field,found):      def getValueFromClass(self,field,found):
         """retattribute falss existing"""          """retattribute falss existing"""
         try:          try:
             return getattr(found,field)              
               return getattr(found,field).decode('ascii','ignore')
         except:          except:
             return ""              return ""
           
Line 2148  def manage_addECHO_rootForm(self): Line 2168  def manage_addECHO_rootForm(self):
         pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_root.zpt').__of__(self)          pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_root.zpt').__of__(self)
         return pt()          return pt()
     
   class ECHO_copyrightType(Folder):
       """copyright typ"""
   
       meta_type="ECHO_copyrightType"
       
       def __init__(self,id,title,label):
           """init"""
           self.id=id
           self.title=title
           self.label=label
   
       manage_options = Folder.manage_options+(
           {'label':'Main Config','action':'ECHO_copyrightType_config_mainForm'},
       )
   
       def ECHO_copyrightType_config_mainForm(self):
           """change form"""
           pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_copyrightType').__of__(self)
           pt.content_type="text/html"
           return pt()
   
       def ECHO_copyrightType_config_main(self,title,label,RESPONSE=None):
           """change"""
           self.title=title
           self.label=label
   
           if RESPONSE is not None:
               RESPONSE.redirect('manage_main')
   
   def manage_addECHO_copyrightTypeForm(self):
           """Form for adding a ressource"""
           pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_copyrightTypeForm.zpt').__of__(self)
           return pt()
   
   
   def manage_addECHO_copyrightType(self,id,title,label,RESPONSE=None):
       """addaresource"""
   
       newObj=ECHO_copyrightType(id,title,label)
   
       self._setObject(id,newObj)
   
       if RESPONSE is not None:
           RESPONSE.redirect('manage_main')
    
   
    
 class ECHO_partner(Image,Persistent):  class ECHO_partner(Image,Persistent):
     """ECHO Partner"""      """ECHO Partner"""
   
Removed from v.1.91  
changed lines
  Added in v.1.95

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