--- ZSQLExtend/ZSQLExtend.py	2007/05/25 15:01:32	1.116
+++ ZSQLExtend/ZSQLExtend.py	2007/07/31 11:28:48	1.118
@@ -56,6 +56,27 @@ def analyseIntSearch(word):
     else:
         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):
@@ -328,7 +349,7 @@ class ZSQLExtendFolder(Folder,Persistent
         
     
     def importXMLFileFMP(self,table,dsn=None,uploadfile=None,update_fields=None,id_field=None,sync_mode=False,
-                         lc_names=True,keep_fields=False,replace=False,ascii_db=False,
+                         lc_names=True,keep_fields=False,ascii_db=False,replace=False,backup=False,
                          redirect_url=None,RESPONSE=None):
         '''
         Import FileMaker XML file (FMPXMLRESULT format) into the table.
@@ -342,6 +363,7 @@ class ZSQLExtendFolder(Folder,Persistent
         @param keep_fields: (optional) don't add fields to SQL database
         @param ascii_db: (optional) assume ascii encoding in db
         @param replace: (optional) delete and re-insert data
+        @param backup: (optional) create backup of old table (breaks indices)
         @param RESPONSE: (optional)
         @param redirect_url: (optional) url for redirecting after the upload is done
         '''
@@ -370,6 +392,7 @@ class ZSQLExtendFolder(Folder,Persistent
         options.keep_fields=keep_fields
         options.ascii_db=ascii_db
         options.replace_table=replace
+        options.backup_table=backup
 
         importFMPXML(options)
         
@@ -491,7 +514,11 @@ class ZSQLExtendFolder(Folder,Persistent
         @param str: string der Formatiert werden soll.
         @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()
         
         if url and str:
@@ -505,7 +532,9 @@ class ZSQLExtendFolder(Folder,Persistent
                 retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word)
             str=retStr
         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:
             return ""
         
@@ -878,11 +907,14 @@ class ZSQLExtendFolder(Folder,Persistent
         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=self.getConnectionObj()()
             
             self._v_searchSQL.max_rows_=max_rows
+            #self._v_searchSQL.set_client_encoding('UNICODE')
             try:
                 logging.error("I am here")
                 t=self._v_searchSQL.__call__(var=query)
+                #t=self._v_searchSQL.query(query)
                 logging.error("I am here %s"%t)
                 return t
             except :
@@ -896,8 +928,10 @@ class ZSQLExtendFolder(Folder,Persistent
             try:
 
                 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.query(query)
             except :
                 logger("ZSQLSimpleSearch ERROR2",logging.ERROR, '%s %s'%sys.exc_info()[:2])
                 if sys.exc_info()[0]=="Database Error":
@@ -2047,4 +2081,4 @@ def manage_addZSQLBibliography(self, id,
 
     
 
-    
\ No newline at end of file
+