--- parser3/src/classes/table.C 2001/04/05 13:19:40 1.54 +++ parser3/src/classes/table.C 2001/04/06 13:41:29 1.59 @@ -5,16 +5,20 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: table.C,v 1.54 2001/04/05 13:19:40 paf Exp $ + $Id: table.C,v 1.59 2001/04/06 13:41:29 paf Exp $ */ #include "pa_config_includes.h" + +#include "pcre.h" + #include "pa_common.h" #include "pa_request.h" #include "_table.h" #include "pa_vtable.h" #include "pa_vint.h" #include "pa_sql_connection.h" +#include "pa_dir.h" // global var @@ -26,7 +30,7 @@ static void _set(Request& r, const Strin // data is last parameter Value *vdata=static_cast(params->get(params->size()-1)); // forcing {this body type} - r.fail_if_junction_(false, *vdata, method_name, "body must be junction"); + r.fail_if_junction_(false, *vdata, method_name, "body must be code"); Temp_lang temp_lang(r, String::UL_PASS_APPENDED); const String& data=r.process(*vdata).as_string(); @@ -71,7 +75,7 @@ static void _load(Request& r, const Stri Value *vfilename=static_cast(params->get(params->size()-1)); // forcing [this file name type] r.fail_if_junction_(true, *vfilename, - method_name, "file name must not be junction"); + method_name, "file name must not be code"); // loading text char *data=file_read_text(pool, r.absolute(vfilename->as_string())); @@ -121,7 +125,7 @@ static void _save(Request& r, const Stri Value *vtable_name=static_cast(params->get(params->size()-1)); // forcing this body type] r.fail_if_junction_(true, *vtable_name, - method_name, "file name must not be junction"); + method_name, "file name must not be code"); Table& table=static_cast(r.self)->table(); @@ -193,7 +197,7 @@ static void _menu(Request& r, const Stri Value& body_code=*static_cast(params->get(0)); // forcing ^menu{this param type} r.fail_if_junction_(false, body_code, - method_name, "body must be junction"); + method_name, "body must be code"); Value *delim_code=params->size()==2?static_cast(params->get(1)):0; @@ -280,13 +284,13 @@ static int sort_cmp_double(const void *a static void _sort(Request& r, const String& method_name, Array *params) { Value& key_maker=*(Value *)params->get(0); // forcing ^sort{this} ^sort(or this) param type - r.fail_if_junction_(false, key_maker, method_name, "key-maker must be junction"); + r.fail_if_junction_(false, key_maker, method_name, "key-maker must be code"); bool reverse; if(params->size()==2) { // ..[asc|desc] Value& order=*(Value *)params->get(1); // forcing ..[this param-type] - r.fail_if_junction_(true, order, method_name, "order must not be junction"); + r.fail_if_junction_(true, order, method_name, "order must not be code"); reverse=order.as_string()=="desc"; } else reverse=false; @@ -340,13 +344,13 @@ static void _found(Request& r, const Str Value& then_code=*static_cast(params->get(0)); // forcing ^found{this param type} r.fail_if_junction_(false, then_code, - method_name, "found-parameter must be junction"); + method_name, "found-parameter must be code"); r.write_pass_lang(r.process(then_code)); } else if(params->size()==2) { Value& else_code=*static_cast(params->get(1)); // forcing ^found{this param type} r.fail_if_junction_(false, else_code, - method_name, "not found-parameter must be junction"); + method_name, "not found-parameter must be code"); r.write_pass_lang(r.process(else_code)); } } @@ -376,7 +380,7 @@ static void _append(Request& r, const St // data is last parameter Value *value=static_cast(params->get(0)); // forcing {this body type} - r.fail_if_junction_(false, *value, method_name, "body must be junction"); + r.fail_if_junction_(false, *value, method_name, "body must be code"); const String& string=r.process(*value).as_string(); @@ -392,7 +396,7 @@ static void _join(Request& r, const Stri Value *value=static_cast(params->get(0)); // forcing [this table ref type] - r.fail_if_junction_(true, *value, method_name, "table ref must not be junction"); + r.fail_if_junction_(true, *value, method_name, "table ref must not be code"); Table *maybe_src=value->get_table(); if(!maybe_src) @@ -423,7 +427,7 @@ static void _join(Request& r, const Stri } } -/// ^table:sql{query}[(count[;offset])] @test limit/offset +/// ^table:sql{query}[(count[;offset])] static void _sql(Request& r, const String& method_name, Array *params) { Pool& pool=r.pool(); @@ -434,7 +438,7 @@ static void _sql(Request& r, const Strin Value& statement=*static_cast(params->get(0)); // forcing {this query param type} - r.fail_if_junction_(false, statement, method_name, "statement must be junction"); + r.fail_if_junction_(false, statement, method_name, "statement must be code"); ulong limit=0; if(params->size()>1) { @@ -454,7 +458,8 @@ static void _sql(Request& r, const Strin Temp_lang temp_lang(r, String::UL_SQL); const String& statement_string=r.process(statement).as_string(); - const char *statement_cstr=statement_string.cstr(String::UL_UNKNOWN, r.connection); + const char *statement_cstr= + statement_string.cstr(String::UL_UNSPECIFIED, r.connection); unsigned int sql_column_count; SQL_Driver::Cell *sql_columns; unsigned long sql_row_count; SQL_Driver::Cell **sql_rows; bool need_rethrow=false; Exception rethrow_me; @@ -504,8 +509,89 @@ static void _sql(Request& r, const Strin static_cast(r.self)->set_table(table); } -// initialize +/// ^table:dir[path] +/// ^table:dir[path][regexp] +static void _dir(Request& r, const String& method_name, Array *params) { + Pool& pool=r.pool(); + + Value& relative_path=*static_cast(params->get(0)); + // forcing [path] + r.fail_if_junction_(true, relative_path, method_name, "path must not be code"); + + const String *regexp; + pcre *regexp_code; + int ovecsize; + int *ovector; + if(params->size()>1) { + Value& regexp_value=*static_cast(params->get(1)); + // forcing [regexp] + r.fail_if_junction_(true, regexp_value, method_name, "regexp must not be code"); + regexp=®exp_value.as_string(); + + const char *pattern=regexp->cstr(String::UL_AS_IS); + const char *errptr; + int erroffset; + regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, + &errptr, &erroffset, + pcre_tables); + + if(!regexp_code) + PTHROW(0, 0, + ®exp->mid(erroffset, regexp->size()), + "regular expression syntax error - %s", errptr); + + ovector=(int *)malloc(sizeof(int)*(ovecsize=(1/*match*/)*3)); + } else + regexp_code=0; + + + const char* absolute_path_cstr=r.absolute(relative_path.as_string()) + .cstr(String::UL_FILE_NAME); + + Array& columns=*new(pool) Array(pool); + columns+=new(pool) String(pool, "name"); + Table& table=*new(pool) Table(pool, &method_name, &columns); + + LOAD_DIR(absolute_path_cstr, + size_t file_name_size=strlen(ffblk.ff_name); + bool suits=true; + if(regexp_code) { + int exec_result=pcre_exec(regexp_code, 0, + ffblk.ff_name, file_name_size, 0, + 0, ovector, ovecsize); + + if(exec_result==PCRE_ERROR_NOMATCH) + suits=false; + else if(exec_result<0) { + (*pcre_free)(regexp_code); + PTHROW(0, 0, + regexp, + "regular expression execute #%d", + exec_result); + } + } + + if(suits) { + char *file_name_cstr=(char *)r.malloc(file_name_size); + memcpy(file_name_cstr, ffblk.ff_name, file_name_size); + String &file_name=*new(pool) String(pool); + file_name.APPEND_TAINTED(file_name_cstr, file_name_size, + method_name.origin().file, method_name.origin().line); + + Array& row=*new(pool) Array(pool); + row+=&file_name; + table+=&row; + } + ); + + if(regexp_code) + (*pcre_free)(regexp_code); + + // replace any previous table value + static_cast(r.self)->set_table(table); +} +// initialize void initialize_table_class(Pool& pool, VStateless_class& vclass) { // ^table:set{data} // ^table:set[nameless]{data} @@ -562,4 +648,8 @@ void initialize_table_class(Pool& pool, // ^table:sql[query][(count[;offset])] vclass.add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3); + + // ^table:dir[path] + // ^table:dir[path][regexp] + vclass.add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2); }