version 1.47.2.76, 2007/05/02 18:32:45
|
version 1.47.2.79, 2007/10/18 12:00:17
|
Line 110 def sortI(x,y):
|
Line 110 def sortI(x,y):
|
except: |
except: |
return cmp(x[1],y[1]) |
return cmp(x[1],y[1]) |
|
|
|
|
|
def unicodify(str): |
|
"""decode str (utf-8 or latin-1 representation) into unicode object""" |
|
if not str: |
|
return "" |
|
if type(str) is StringType: |
|
try: |
|
return str.decode('utf-8') |
|
except: |
|
return str.decode('latin-1') |
|
else: |
|
return str |
|
|
|
def utf8ify(str): |
|
"""encode unicode object or string into byte string in utf-8 representation""" |
|
if not str: |
|
return "" |
|
if type(str) is StringType: |
|
return str |
|
else: |
|
return str.encode('utf-8') |
|
|
|
|
class MPIWGLink(SimpleItem): |
class MPIWGLink(SimpleItem): |
"""create a symbolic link to another page""" |
"""create a symbolic link to another page""" |
|
|
Line 340 class MPIWGRoot(ZSQLExtendFolder):
|
Line 363 class MPIWGRoot(ZSQLExtendFolder):
|
|
|
def getat(self,array,idx=0,default=None): |
def getat(self,array,idx=0,default=None): |
"""return array element idx or default (but no exception)""" |
"""return array element idx or default (but no exception)""" |
if len(array) < idx: |
if len(array) <= idx: |
return default |
return default |
else: |
else: |
return array[idx] |
return array[idx] |
Line 844 class MPIWGRoot(ZSQLExtendFolder):
|
Line 867 class MPIWGRoot(ZSQLExtendFolder):
|
ret+="Created %s \n"%e_mail |
ret+="Created %s \n"%e_mail |
created=True |
created=True |
except: |
except: |
|
|
msg="Cannot create new user %s (%s %s)"%(e_mail,sys.exc_info()[0],sys.exc_info()[1]) |
msg="Cannot create new user %s (%s %s)"%(e_mail,sys.exc_info()[0],sys.exc_info()[1]) |
logging.error(msg) |
logging.error(msg) |
ret+=msg+"\n" |
ret+=msg+"\n" |
created=False |
created=False |
|
|
if created: |
if created: |
qstr="update personal_www set web_object_created='yes',e_mail='%s' where key=%s"%(e_mail,self.ZSQLQuote(k)) |
qstr="update personal_www set web_object_created='yes',e_mail='%s@mpiwg-berlin.mpg.de' where key=%s"%(e_mail,self.ZSQLQuote(k)) |
self.ZSQLQuery(qstr) |
self.ZSQLQuery(qstr) |
|
|
return ret |
return ret |
Line 1595 class MPIWGProject(CatalogAware,Folder):
|
Line 1617 class MPIWGProject(CatalogAware,Folder):
|
meta_type='MPIWGProject' |
meta_type='MPIWGProject' |
default_catalog='ProjectCatalog' |
default_catalog='ProjectCatalog' |
|
|
|
def decode(self,str): |
|
"""return unicode object""" |
|
return unicodify(str) |
|
|
def sortedByPlace(self,metatype): |
def sortedByPlace(self,metatype): |
"""find metatype and sort by place""" |
"""find metatype and sort by place""" |
Line 2281 class MPIWGProject(CatalogAware,Folder):
|
Line 2306 class MPIWGProject(CatalogAware,Folder):
|
if (text5=="<br>") or (text5=="<br/>"): |
if (text5=="<br>") or (text5=="<br/>"): |
text5="" |
text5="" |
|
|
return text5.encode('utf-8') |
logging.debug("getcontent: field=%s filter=%s -> %s"%(field,filter,repr(text5))) |
|
#return unicodify(text5) |
|
return utf8ify(text5) # return as utf-8 byte string |
|
|
|
|
def showImagesOfPage(self,imageUrl=None): |
def showImagesOfPage(self,imageUrl=None): |
"""show Images of project""" |
"""show Images of project""" |