Skip to content

Commit

Permalink
Additional fix for #249 - searching attributes with non-ascii charact…
Browse files Browse the repository at this point in the history
…ers.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5763 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Sep 6, 2006
1 parent f4a3dd3 commit a6a5c5b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/core/qgssearchstringlexer.ll
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
%option noyywrap
%option case-insensitive

// ensure that lexer will be 8-bit (and not just 7-bit)
%option 8bit

%{

#include <stdlib.h> // atof()
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgssearchstringparser.yy
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ scalar_exp:
| '+' scalar_exp %prec UMINUS { $$ = $2; }
| '-' scalar_exp %prec UMINUS { $$ = $2; if ($$->type() == QgsSearchTreeNode::tNumber) $$->setNumber(- $$->number()); }
| NUMBER { $$ = new QgsSearchTreeNode($1); addToTmpNodes($$); }
| STRING { $$ = new QgsSearchTreeNode(yytext, 0); addToTmpNodes($$); }
| COLUMN_REF { $$ = new QgsSearchTreeNode(yytext, 1); addToTmpNodes($$); }
| STRING { $$ = new QgsSearchTreeNode(QString::fromUtf8(yytext), 0); addToTmpNodes($$); }
| COLUMN_REF { $$ = new QgsSearchTreeNode(QString::fromUtf8(yytext), 1); addToTmpNodes($$); }
;

%%
Expand Down

0 comments on commit a6a5c5b

Please sign in to comment.