version 1.116, 2007/05/25 15:01:32
|
version 1.117, 2007/07/24 09:22:14
|
Line 56 def analyseIntSearch(word):
|
Line 56 def analyseIntSearch(word):
|
else: |
else: |
return "BETWEEN "+splitted[0]+" AND "+splitted[1] |
return "BETWEEN "+splitted[0]+" AND "+splitted[1] |
|
|
|
def unicodify(str): |
|
"""decode str (utf-8 or latin-1 representation) into unicode object""" |
|
if not str: |
|
return u"" |
|
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') |
|
|
|
|
|
|
def sql_quote(v): |
def sql_quote(v): |
Line 491 class ZSQLExtendFolder(Folder,Persistent
|
Line 512 class ZSQLExtendFolder(Folder,Persistent
|
@param str: string der Formatiert werden soll. |
@param str: string der Formatiert werden soll. |
@param url: (optional) default ist "None", sonderfall erzeugt einen Link aus String mit unterliegender url |
@param url: (optional) default ist "None", sonderfall erzeugt einen Link aus String mit unterliegender url |
""" |
""" |
#url=None |
#logging.debug("formatascii str=%s url=%s"%(repr(str),repr(url))) |
|
|
|
if not str: |
|
return "" |
|
|
str=str.rstrip().lstrip() |
str=str.rstrip().lstrip() |
|
|
if url and str: |
if url and str: |
Line 505 class ZSQLExtendFolder(Folder,Persistent
|
Line 530 class ZSQLExtendFolder(Folder,Persistent
|
retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word) |
retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word) |
str=retStr |
str=retStr |
if str: |
if str: |
return re.sub(r"[\n]","<br/>",str) |
retStr = re.sub(r"[\n]","<br/>",str) |
|
#logging.debug("formatascii out=%s"%(repr(retStr))) |
|
return retStr |
else: |
else: |
return "" |
return "" |
|
|
Line 878 class ZSQLExtendFolder(Folder,Persistent
|
Line 905 class ZSQLExtendFolder(Folder,Persistent
|
if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")): |
if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")): |
|
|
self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.getConnectionObj().getId(),"var","<dtml-var var>") |
self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.getConnectionObj().getId(),"var","<dtml-var var>") |
|
#self._v_searchSQL=self.getConnectionObj()() |
|
|
self._v_searchSQL.max_rows_=max_rows |
self._v_searchSQL.max_rows_=max_rows |
|
#self._v_searchSQL.set_client_encoding('UNICODE') |
try: |
try: |
logging.error("I am here") |
logging.error("I am here") |
t=self._v_searchSQL.__call__(var=query) |
t=self._v_searchSQL.__call__(var=query) |
|
#t=self._v_searchSQL.query(query) |
logging.error("I am here %s"%t) |
logging.error("I am here %s"%t) |
return t |
return t |
except : |
except : |
Line 896 class ZSQLExtendFolder(Folder,Persistent
|
Line 926 class ZSQLExtendFolder(Folder,Persistent
|
try: |
try: |
|
|
self._v_searchSQL.max_rows_=max_rows |
self._v_searchSQL.max_rows_=max_rows |
|
#self._v_searchSQL.set_client_encoding('UNICODE') |
|
|
return self._v_searchSQL.__call__(var=query) |
return self._v_searchSQL.__call__(var=query) |
|
#return self._v_searchSQL.query(query) |
except : |
except : |
logger("ZSQLSimpleSearch ERROR2",logging.ERROR, '%s %s'%sys.exc_info()[:2]) |
logger("ZSQLSimpleSearch ERROR2",logging.ERROR, '%s %s'%sys.exc_info()[:2]) |
if sys.exc_info()[0]=="Database Error": |
if sys.exc_info()[0]=="Database Error": |