Changeset 1126 for ZMS/trunk/_zcatalogmanager.py

Timestamp:

28.07.2010 22:00:49 (22 months ago)

Author:

zmsdev

Message:

Applied fix for searching german-umlauts.

File:

• ZMS/trunk/_zcatalogmanager.py (modified) (3 diffs)

ZMS/trunk/_zcatalogmanager.py

@@ -66 +66 @@
     elif type(v) is list:
       for i in v:
-        s += search_string(i)
+        s += search_string(i) + ' '
     elif type(v) is dict:
       for k in v.keys():
         i = v[k]
-        s += search_string(i)
+        s += search_string(i) + ' '
   return s
 
@@ -122 +122 @@
       pass
 
-
 # --------------------------------------------------------------------------
 #  _zcatalogmanager.getCatalog:
@@ -199 +198 @@
     # --------------------------------------------------------------------------
     def search_encode(self, s):
-      try:
-        s = unicode( s, 'utf-8').encode( 'latin-1')
-        # German Umlauts in capital letters.
-        mapping = {
-          '\xc4':'\xe4', # Ae
-          '\xd6':'\xf6', # Oe
-          '\xdc':'\xfc', # Ue
-        }
-        for capital in mapping.keys():
-          letter = mapping[ capital]
-          while s.find( capital) >= 0:
-            s = s.replace( capital, letter)
-      except ( UnicodeDecodeError, UnicodeEncodeError):
-        _globals.writeError(self,"[search_encode]")
-        try:
-          v = str(sys.exc_value)
-          STR_POSITION = ' position '
-          i = v.find(STR_POSITION)
-          if i > 0:
-            v = v[i+len(STR_POSITION):]
-            if v.find('-') > 0:
-              l = int( v[:v.find('-')])
-              h = int( v[v.find('-')+1:v.find(':')])
-            else:
-              l = int( v[:v.find(':')])
-              h = l
-            ln = max( l - 20, 0)
-            hn = min( h + 20, len(s))
-            print ">>>>>",s[ln:hn]
-            print ">>>>>"," "*(l-ln)+"^"*(h-l+1)
-        except:
-          _globals.writeError(self,"[search_encode]: ignore exception")
-      return s
+      return _globals.umlaut_quote(s)