--- ECHO_content/ECHO_collection.py	2004/01/14 16:09:36	1.8
+++ ECHO_content/ECHO_collection.py	2004/01/21 07:40:52	1.9
@@ -116,6 +116,19 @@ def setECHO_CollectionInformation(self,c
         
         coords=[]
         #coordinates of for rectangles
+<<<<<<< ECHO_collection.py
+        #print "cs", coordstrs
+        if coordstrs:
+            for coordstr in coordstrs:
+                print "cs", coordstr
+                try:
+                    temco=coordstr.split(",")
+                except:
+                    temco=[]
+                #temco.append(angle)
+                coords.append(temco)
+
+=======
         for coordstr in coordstrs:
             try:
                 temco=coordstr.split(",")
@@ -123,6 +136,7 @@ def setECHO_CollectionInformation(self,c
                 temco=[]
             #temco.append(angle)
             coords.append(temco)
+>>>>>>> 1.8
         self.coords=coords[0:]
             
 
@@ -183,6 +197,13 @@ class ECHO_resource(Folder):
             return self.viewClassification
         else:
             return ""
+
+    def getCredits(self):
+        """Ausgabe der credits"""
+        if self.credits:
+            return self.credits
+        else:
+            return []
     
     def __init__(self,id,link,metalink,title,label,description,content_type,responsible,credits,weight,coords):
 
@@ -198,13 +219,17 @@ class ECHO_resource(Folder):
         self.description=description
         self.content_type=content_type
         self.responsible=responsible
-        coordsnew=[ string.split(x,",") for x in coords]
+        
+        if coords:
+            coordsnew=[ string.split(x,",") for x in coords]
+        else:
+            coordsnew=[]
+        
         self.coords=coordsnew
 
 
     def getCoords(self):
         try:
-            print 
             return [string.join(x,",") for x in self.coords]  
         except:
             return []
@@ -222,7 +247,11 @@ class ECHO_resource(Folder):
         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):
+>>>>>>> 1.8
 
         """Änderung der Properties"""
         
@@ -306,7 +335,11 @@ def manage_AddECHO_resourceForm(self):
         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=[],RESPONSE=None):
+>>>>>>> 1.8
 
     """nothing yet"""
     scientificClassificationObj=scientificClassification(context,science,practice)
@@ -351,7 +384,7 @@ class ECHO_externalLink(Folder):
         if not hasattr(self,'weight'):
             self.weight=""
         if not hasattr(self,'coords'):
-            print "HI"
+            
             self.coords=['']
             print "G",self.coords
 
@@ -464,7 +497,6 @@ class ECHO_collection(Folder, Persistent
 
     def getCoords(self):
         try:
-            print self.coords
             return [string.join(x,",") for x in self.coords]  
 
 
@@ -472,7 +504,7 @@ class ECHO_collection(Folder, Persistent
             return []
         
     def __init__(self,id,title,label,description,content_type,responsible,credits,weight,sortfield,coords):
-        print "CO",coords
+        #print "CO",coords
 
         self.id = id
         """Festlegen der ID"""
@@ -535,11 +567,16 @@ class ECHO_collection(Folder, Persistent
 
     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):
+>>>>>>> 1.8
 
         """Änderung der Properties"""
-
+        #print "HI",coords
         coordsnew=[ string.split(x,",") for x in coords]
+        #print "HO",coordsnew
         setECHO_CollectionInformation(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,credits,weight,coordsnew)
 
         self.sortfield=sortfield
@@ -641,7 +678,7 @@ def manage_AddECHO_collectionForm(self):
         return pt()
 
 
-def manage_AddECHO_collection(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,credits,weight,sortfield,coords,RESPONSE=None):
+def manage_AddECHO_collection(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,weight,sortfield,coords,credits=None,RESPONSE=None):
 
     """nothing yet"""
     scientificClassificationObj=scientificClassification(context,science,practice)