Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7757/src/modules/mal
Modified Files:
tablet.mx
Log Message:
To allow for not quote strings, we now need to supply the quotes if the
strings are quoted.
Index: tablet.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/tablet.mx,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- tablet.mx 31 Oct 2007 11:55:41 -0000 1.105
+++ tablet.mx 9 Dec 2007 16:07:47 -0000 1.106
@@ -392,7 +392,6 @@
unsigned int tabs; /* field size in tab positions */
str lbrk, rbrk; /* column brackets */
str nullstr; /* null representation */
- int quoted; /* escape charaters */
unsigned int width; /* actual column width */
unsigned int maxwidth; /* permissible width */
int fieldstart; /* Fixed character field load positions */
@@ -404,7 +403,8 @@
void *data;
int len;
int nillen;
- int ws; /* if set we need to skip white space */
+ bit ws; /* if set we need to skip white space */
+ bit quote; /* if set use this character for string quotes */
} Column;
@-
@@ -1315,7 +1315,7 @@
line++;
/* recognize fields starting with a quote */
- if ( (*line == '\"' || *line == '\'') &&
+ if ( *line == fmt[i].quote &&
(line == s || *(line - 1) != '\\')) {
quote = *line;
line++;
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
