--- ECHO_content/ECHO_collection.py 2004/02/03 17:31:16 1.12 +++ ECHO_content/ECHO_collection.py 2004/02/09 11:45:46 1.13 @@ -1,4 +1,4 @@ - +"""New version of the product started February, 8th. Without scientific classification, use content-type for further classification.""" """Echo collection provides the classes for the ECHO content web-site. class ECHO_collection is the basis class for an ECHO collection. @@ -23,7 +23,7 @@ from Products.PageTemplates.PageTemplate from Products.PageTemplates.PageTemplate import PageTemplate from Globals import Persistent from Acquisition import Implicit - +from pyPgSQL import libpq import urllib import xml.dom.minidom @@ -93,7 +93,7 @@ def readMetadata(url): return metadict,"" -def setECHO_CollectionInformation(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,credits,weight,coordstrs,viewClassification=""): +def setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coordstrs,viewClassification=""): """Allegemeine Informationen zu einer ECHO Collection""" @@ -107,12 +107,6 @@ def setECHO_CollectionInformation(self,c self.credits=toList(credits) self.weight=weight - self.scientific_Information.source_type=source_type - self.scientific_Information.period=period - self.scientific_Information.scientific_Classification.context=context - self.scientific_Information.scientific_Classification.science=science - self.scientific_Information.scientific_Classification.practice=practice - coords=[] #coordinates of for rectangles @@ -132,7 +126,7 @@ def setECHO_CollectionInformation(self,c class scientificClassification(SimpleItem,Persistent,Implicit): - """subclass""" + """outdated will be deleeted in the next versions: subclass""" security=ClassSecurityInfo() def __init__(self,context,science,practice): @@ -155,7 +149,7 @@ class scientificClassification(SimpleIte class scientificInformation(Folder,Persistent,Implicit): - """subclass scientificInformation""" + """outdated will be deleted in the next versions: subclass scientificInformation""" security=ClassSecurityInfo() @@ -188,7 +182,7 @@ class ECHO_resource(Folder): return self.viewClassification else: return "" - + def getCredits(self): """Ausgabe der credits""" if self.credits: @@ -234,17 +228,17 @@ class ECHO_resource(Folder): if not hasattr(self,'coords'): self.coords=[] - pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_resource.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource.zpt').__of__(self) return pt() - 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,title,label,description,content_type,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None): """Änderung der Properties""" - setECHO_CollectionInformation(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,credits,weight,coords,viewClassification) + setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coords,viewClassification) self.link=link @@ -263,7 +257,7 @@ class ECHO_resource(Folder): def ECHO_graphicEntry(self): """DO nothing""" if 'overview' in self.aq_parent.__dict__.keys(): - pt=PageTemplateFile('Products/ECHO_content/ECHO_draw.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_draw.zpt').__of__(self) return pt() else: return "NO OVERVIEW GRAPHICS" @@ -276,7 +270,7 @@ class ECHO_resource(Folder): coords.append(temco) self.coords=coords[0:] - #pt=PageTemplateFile('Products/ECHO_content/ECHO_draw.zpt').__of__(self) + if RESPONSE is not None: RESPONSE.redirect('ECHO_graphicEntry') @@ -284,7 +278,7 @@ class ECHO_resource(Folder): """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource""" (metadict, error)=readMetadata(self.metalink) - #print "BLA" + if not error=="": #Fehler beim Auslesen des Metafiles return "ERROR:",error @@ -294,11 +288,11 @@ class ECHO_resource(Folder): self.metadata=metadict.keys() - #return "BLUccssB" + self.label=self.generate_label() if template=="yes": - pt=PageTemplateFile('Products/ECHO_content/ECHO_resourceMD.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_resourceMD.zpt').__of__(self) return pt() def ECHO_getMD(self,item): @@ -313,31 +307,23 @@ class ECHO_resource(Folder): def generate_label(self): """Erzeugt_standard_Label aus Template""" pt=getattr(self,"label_template_"+self.bib_type) - #return pt - #pt.content_type="text/html; charset=utf-8" - return pt() -def manage_AddECHO_resourceForm(self): - """Nothing yet""" - pt=PageTemplateFile('Products/ECHO_content/AddECHO_resourceForm.zpt').__of__(self) return pt() +def manage_addECHO_resourceForm(self): + """Form for adding a ressource""" + pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_resourceForm.zpt').__of__(self) + return pt() -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): - - """nothing yet""" - scientificClassificationObj=scientificClassification(context,science,practice) - - scientificInformationObj=scientificInformation(source_type,period) - +def manage_addECHO_resource(self,id,title,label,description,content_type,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None): + """addaresource""" newObj=ECHO_resource(id,link,metalink,title,label,description,content_type,responsible,credits,weight,coords) self._setObject(id,newObj) - getattr(self,id)._setObject('scientific_Information',scientificInformationObj) - getattr(self,id).scientific_Information._setObject('scientific_Classification',scientificClassificationObj) + if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -374,16 +360,16 @@ class ECHO_externalLink(Folder): self.coords=[''] #print "G",self.coords - pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_externalLink.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_externalLink.zpt').__of__(self) return pt() - def changeECHO_externalLink(self,link,context,science,practice,source_type,period,title,label,description,content_type,responsible,credits,weight,coords,RESPONSE=None): + def changeECHO_externalLink(self,link,title,label,description,content_type,responsible,weight,coords=None,credits=None,RESPONSE=None): """Änderung der Properties""" - setECHO_CollectionInformation(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,credits,weight,coords) + setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coords) self.link=link @@ -400,25 +386,19 @@ class ECHO_externalLink(Folder): return self.REQUEST.RESPONSE.redirect(self.link) -def manage_AddECHO_externalLinkForm(self): - """Nothing yet""" - pt=PageTemplateFile('Products/ECHO_content/AddECHO_externalLinkForm.zpt').__of__(self) +def manage_addECHO_externalLinkForm(self): + """Form for external Links""" + pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_externalLinkForm.zpt').__of__(self) return pt() -def manage_AddECHO_externalLink(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,link,credits,weight,coords,RESPONSE=None): - - """nothing yet""" - scientificClassificationObj=scientificClassification(context,science,practice) - - scientificInformationObj=scientificInformation(source_type,period) - +def manage_addECHO_externalLink(self,id,title,label,description,content_type,responsible,link,weight,coords=None,credits=None,RESPONSE=None): + """Add an external Link""" newObj=ECHO_externalLink(id,link,title,label,description,content_type,responsible,credits,weight,coords) self._setObject(id,newObj) - getattr(self,id)._setObject('scientific_Information',scientificInformationObj) - getattr(self,id).scientific_Information._setObject('scientific_Classification',scientificClassificationObj) + if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -457,8 +437,7 @@ class ECHO_collection(Folder, Persistent security.declarePublic('ECHO_rerenderLinksMD') def ECHO_rerenderLinksMD(self): """Rerender all Links""" - #print "HI" - #return "OK" + for entry in self.__dict__.keys(): object=getattr(self,entry) @@ -475,12 +454,6 @@ class ECHO_collection(Folder, Persistent return "Rerenderd all links to resources in: "+self.title - - security.declarePublic('printall') - def printall(self): - return self.scientific_information.__dict__.keys() - - def getCoords(self): try: @@ -510,7 +483,7 @@ class ECHO_collection(Folder, Persistent manage_options = Folder.manage_options+( - {'label':'Main Config','action':'ECHO_Collection_config'}, + {'label':'Main Config','action':'ECHO_collection_config'}, {'label':'Rerender Links','action':'ECHO_rerenderLinksMD'}, {'label':'Graphics','action':'ECHO_graphicEntry'}, @@ -519,7 +492,7 @@ class ECHO_collection(Folder, Persistent def ECHO_graphicEntry(self): """DO nothing""" if 'overview' in self.aq_parent.__dict__.keys(): - pt=PageTemplateFile('Products/ECHO_content/ECHO_draw.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_draw.zpt').__of__(self) return pt() else: return "NO OVERVIEW GRAPHICS" @@ -531,13 +504,13 @@ class ECHO_collection(Folder, Persistent temco.append(angle) coords.append(temco) self.coords=coords[0:] - #pt=PageTemplateFile('Products/ECHO_content/ECHO_draw.zpt').__of__(self) + if RESPONSE is not None: RESPONSE.redirect('ECHO_graphicEntry') - security.declarePublic('ECHO_Collection_config') - def ECHO_Collection_config(self): + security.declarePublic('ECHO_collection_config') + def ECHO_collection_config(self): """Main configuration""" if not hasattr(self,'weight'): @@ -545,25 +518,23 @@ class ECHO_collection(Folder, Persistent if not hasattr(self,'sortfield'): self.sortfield="weight" - #print "HI" + if not hasattr(self,'coords'): self.coords=[] - pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_Collection.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_collection.zpt').__of__(self) return pt() - security.declarePublic('changeECHO_Collection') - - - def changeECHO_Collection(self,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,weight,credits="",sortfield="weight",coords="",RESPONSE=None): + security.declarePublic('changeECHO_collection') + def changeECHO_collection(self,title,label,description,content_type,responsible,weight,credits=None,sortfield="weight",coords=None,RESPONSE=None): """Ä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) + + setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coordsnew) self.sortfield=sortfield @@ -577,16 +548,14 @@ class ECHO_collection(Folder, Persistent def index_html(self): """standard page""" - #print self.objectIDs() if 'index.html' in self.__dict__.keys(): return getattr(self,'index.html')() elif 'overview' in self.__dict__.keys(): - #print "HI" return self.showOverview() - pt=PageTemplateFile('Products/ECHO_content/ECHO_content_standard.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_content_standard.zpt').__of__(self) pt.content_type="text/html" return pt() @@ -603,12 +572,8 @@ class ECHO_collection(Folder, Persistent ids=[] for entry in self.__dict__.keys(): object=getattr(self,entry) - #print "OB:",object - try: - #print "MT:",object.meta_type if object.meta_type in subColTypes: - #print "MT:",object.meta_type,object.getId() for coordtemp in object.coords: if len(coordtemp)>3: coord=coordtemp[0:4] @@ -622,7 +587,7 @@ class ECHO_collection(Folder, Persistent except: """nothing""" - #print "IDS",ids + return ids def getSubCols(self,sortfield="weight"): @@ -631,10 +596,7 @@ class ECHO_collection(Folder, Persistent ids=[] for entry in self.__dict__.keys(): object=getattr(self,entry) - #print "OB:",object - try: - #print "MT:",object.meta_type if object.meta_type in subColTypes: ids.append(object) @@ -664,25 +626,20 @@ class ECHO_collection(Folder, Persistent -def manage_AddECHO_collectionForm(self): - """Nothing yet""" - pt=PageTemplateFile('Products/ECHO_content/AddECHO_collectionForm.zpt').__of__(self) +def manage_addECHO_collectionForm(self): + """Add collection form""" + pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_collectionForm.zpt').__of__(self) return pt() -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) - - scientificInformationObj=scientificInformation(source_type,period) +def manage_addECHO_collection(self,id,title,label,description,content_type,responsible,weight,sortfield,coords="",credits=None,RESPONSE=None): + """add a echo collection""" newObj=ECHO_collection(id,title,label,description,content_type,responsible,credits,weight,sortfield,coords) self._setObject(id,newObj) - getattr(self,id)._setObject('scientific_Information',scientificInformationObj) - getattr(self,id).scientific_Information._setObject('scientific_Classification',scientificClassificationObj) + if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -694,22 +651,29 @@ class ECHO_root(Folder,Persistent,Implic """init""" self.id = id self.title=title + + def PgQuoteString(self,string): + """Quote string""" + print "PG",string + return libpq.PgQuoteString(string) def getPartners(self): """Get list of Partners. Presently only from a subfolder partners""" partnerTypes=['ECHO_partner'] ids=[] - for entry in self.partners.__dict__.keys(): - object=getattr(self.partners,entry) - - try: + try: + for entry in self.partners.__dict__.keys(): + object=getattr(self.partners,entry) - if object.meta_type in partnerTypes: - ids.append(object) - - except: - """nothing""" + try: + if object.meta_type in partnerTypes: + ids.append(object) + + except: + """nothing""" + except: + ids=[] # no partners return ids def getCollectionTree(self): @@ -740,16 +704,16 @@ class ECHO_root(Folder,Persistent,Implic -def manage_AddECHO_root(self,id,title,RESPONSE=None): +def manage_addECHO_root(self,id,title,RESPONSE=None): """Add an ECHO_root""" self._setObject(id,ECHO_root(id,title)) if RESPONSE is not None: RESPONSE.redirect('manage_main') -def manage_AddECHO_rootForm(self): +def manage_addECHO_rootForm(self): """Nothing yet""" - pt=PageTemplateFile('Products/ECHO_content/AddECHO_root.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_root.zpt').__of__(self) return pt() class ECHO_partner(Image,Persistent): @@ -783,16 +747,16 @@ class ECHO_partner(Image,Persistent): """Main configuration""" if not hasattr(self,'url'): self.url="" - pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_partner.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_partner.zpt').__of__(self) return pt() -manage_AddECHO_partnerForm=DTMLFile('ECHO_partnerAdd',globals(), +manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(), Kind='ECHO_partner',kind='ECHO_partner') -def manage_AddECHO_partner(self, id, file,url, title='', precondition='', content_type='', +def manage_addECHO_partner(self, id, file,url, title='', precondition='', content_type='', REQUEST=None): """ Add a new ECHO_partner object.