--- parser3/src/classes/table.C 2003/11/03 13:20:30 1.186 +++ parser3/src/classes/table.C 2003/11/04 10:49:34 1.187 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_TABLE_C="$Date: 2003/11/03 13:20:30 $"; +static const char* IDENT_TABLE_C="$Date: 2003/11/04 10:49:34 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -52,8 +52,8 @@ String table_reverse_name(TABLE_REVERSE_ // local defines -#define COLUMN_SEPARATOR_NAME "column-separator" -#define COLUMN_ENCLOSER_NAME "column-encloser" +#define COLUMN_SEPARATOR_NAME "separator" +#define COLUMN_ENCLOSER_NAME "encloser" // methods @@ -178,7 +178,7 @@ static void _create(Request& r, MethodPa GET_SELF(r, VTable).set_table(table); } -inline char* remove_encloser(char* cstr, char encloser) { +static char* remove_encloser(char* cstr, char encloser) { if(cstr[0]!=encloser) return cstr; @@ -206,40 +206,133 @@ inline char* remove_encloser(char* cstr, return cstr; } -static void _load(Request& r, MethodParams& params) { - const String& first_param=params.as_string(0, "file name must be string"); - int filename_param_index=0; - bool nameless=first_param=="nameless"; - if(nameless) - filename_param_index++; - size_t options_param_index=filename_param_index+1; +struct lsplit_result { + char* piece; + char delim; - HashStringValue *options=0; - char column_separator='\t'; - char column_encloser=0; - if(options_param_indexget(COLUMN_SEPARATOR_NAME)) { - options->remove(COLUMN_SEPARATOR_NAME); + operator bool() { return piece!=0; } +}; + +inline lsplit_result lsplit(char* string, char delim1, char delim2) { + lsplit_result result; + if(string) { + char delims[]={delim1, delim2, 0}; + if(char* v=strpbrk(string, delims)) { + result.delim=*v; + *v=0; + result.piece=v+1; + return result; + } + } + result.piece=0; + result.delim=0; + return result; +} + +inline lsplit_result lsplit(char* *string_ref, char delim1, char delim2) { + lsplit_result result; + result.piece=*string_ref; + lsplit_result next=lsplit(*string_ref, delim1, delim2); + result.delim=next.delim; + *string_ref=next.piece; + return result; +} + +static lsplit_result lsplit(char** string_ref, char delim1, char delim2, char encloser) { + lsplit_result result; + + if(char* string=*string_ref) { + if(encloser && *string==encloser) { + string++; + + char *read; + char *write; + write=read=string; + char c; + while(c=*read++) { + if(c==encloser) { + char n=*read; + if(n==encloser) // double-encloser stands for encloser + read++; + else if(n==delim1 || n==delim2) { + result.delim=n; + read++; + break; + } + } + + *write++=c; + } + *write=0; // terminate + *string_ref=c? read: 0; + result.piece=string; + return result; + } else + return lsplit(string_ref, delim1, delim2); + } + result.piece=0; + return result; +} + +static void skip_empty_and_comment_lines( char** data_ref ) { + if(char *data=*data_ref) { + while( char c=*data ) { + if( c== '\n' || c == '#' ) { + /*nowhere=*/getrow(&data); // remove empty&comment lines + *data_ref=data; + continue; + } + break; + } + } +} + +struct TableSeparators { + char column; + char encloser; + + TableSeparators() { + column='\t'; + encloser=0; + } + void load( HashStringValue& options ) { + if(Value* vseparator=options.get(COLUMN_SEPARATOR_NAME)) { + options.remove(COLUMN_SEPARATOR_NAME); const String& sseparator=vseparator->as_string(); if(sseparator.length()!=1) throw Exception("parser.runtime", &sseparator, "separator must be one character long"); - column_separator=sseparator.first_char(); + column=sseparator.first_char(); } - if(Value* vencloser=options->get(COLUMN_ENCLOSER_NAME)) { - options->remove(COLUMN_ENCLOSER_NAME); + if(Value* vencloser=options.get(COLUMN_ENCLOSER_NAME)) { + options.remove(COLUMN_ENCLOSER_NAME); const String& sencloser=vencloser->as_string(); if(sencloser.length()!=1) throw Exception("parser.runtime", &sencloser, "encloser must be one character long"); - column_encloser=sencloser.first_char(); + encloser=sencloser.first_char(); } } +}; + +static void _load(Request& r, MethodParams& params) { + const String& first_param=params.as_string(0, "file name must be string"); + int filename_param_index=0; + bool nameless=first_param=="nameless"; + if(nameless) + filename_param_index++; + size_t options_param_index=filename_param_index+1; + + HashStringValue *options=0; + TableSeparators separators; + if(options_param_indexcount()) // append last empty column [if without \n] + break; + *row+=new String(sr.piece, 0, true); + if(sr.delim=='\n') { + table+=row; + row=new ArrayString; + skip_empty_and_comment_lines(&data); } + } + // last line [if without \n] + if(row->count()) table+=row; - }; - + // replace any previous table value GET_SELF(r, VTable).set_table(table); }