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