[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.9 and 1.10

version 1.9, 2004/01/21 07:40:52 version 1.10, 2004/01/21 12:50:28
Line 8  class ECHO_resource contains information Line 8  class ECHO_resource contains information
 class ECHO_externalLink contains information on externalLinks  class ECHO_externalLink contains information on externalLinks
   
   
   
 """  """
 import string  import string
 import OFS.Image  import OFS.Image
Line 116  def setECHO_CollectionInformation(self,c Line 115  def setECHO_CollectionInformation(self,c
                   
         coords=[]          coords=[]
         #coordinates of for rectangles          #coordinates of for rectangles
 <<<<<<< ECHO_collection.py  
         #print "cs", coordstrs          #print "cs", coordstrs
         if coordstrs:          if coordstrs:
             for coordstr in coordstrs:              for coordstr in coordstrs:
Line 128  def setECHO_CollectionInformation(self,c Line 127  def setECHO_CollectionInformation(self,c
                 #temco.append(angle)                  #temco.append(angle)
                 coords.append(temco)                  coords.append(temco)
   
 =======  
         for coordstr in coordstrs:  
             try:  
                 temco=coordstr.split(",")  
             except:  
                 temco=[]  
             #temco.append(angle)  
             coords.append(temco)  
 >>>>>>> 1.8  
         self.coords=coords[0:]          self.coords=coords[0:]
                           
   
Line 247  class ECHO_resource(Folder): Line 238  class ECHO_resource(Folder):
         return pt()          return pt()
           
   
 <<<<<<< ECHO_collection.py  
     def changeECHO_resource(self,metalink,link,context,science,practice,source_type,period,title,label,description,content_type,responsible,weight,credits=None,coords=None,viewClassification=None,RESPONSE=None):  
 =======  
     def changeECHO_resource(self,metalink,link,context,science,practice,source_type,period,title,label,description,content_type,responsible,credits,weight,viewClassification="",coords="",RESPONSE=None):      def changeECHO_resource(self,metalink,link,context,science,practice,source_type,period,title,label,description,content_type,responsible,credits,weight,viewClassification="",coords="",RESPONSE=None):
 >>>>>>> 1.8  
   
         """Änderung der Properties"""          """Änderung der Properties"""
                   
Line 335  def manage_AddECHO_resourceForm(self): Line 323  def manage_AddECHO_resourceForm(self):
         return pt()          return pt()
   
   
 <<<<<<< ECHO_collection.py  
 def manage_AddECHO_resource(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,link,metalink,credits,weight,coords=None,RESPONSE=None):  def manage_AddECHO_resource(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,link,metalink,credits,weight,coords=None,RESPONSE=None):
 =======  
 def manage_AddECHO_resource(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,link,metalink,credits,weight,coords=[],RESPONSE=None):  
 >>>>>>> 1.8  
   
     """nothing yet"""      """nothing yet"""
     scientificClassificationObj=scientificClassification(context,science,practice)      scientificClassificationObj=scientificClassification(context,science,practice)
Line 567  class ECHO_collection(Folder, Persistent Line 553  class ECHO_collection(Folder, Persistent
   
     security.declarePublic('changeECHO_Collection')      security.declarePublic('changeECHO_Collection')
   
 <<<<<<< ECHO_collection.py  
     def changeECHO_Collection(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,credits,weight,coords=[""],sortfield="weight",RESPONSE=None):  
 =======  
     def changeECHO_Collection(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,credits,weight,sortfield="weight",coords="",RESPONSE=None):      def changeECHO_Collection(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,credits,weight,sortfield="weight",coords="",RESPONSE=None):
 >>>>>>> 1.8  
   
         """Änderung der Properties"""          """Änderung der Properties"""
         #print "HI",coords          #print "HI",coords
Removed from v.1.9  
changed lines
  Added in v.1.10

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