--- parser3/src/classes/file.C 2005/07/28 11:23:01 1.134 +++ parser3/src/classes/file.C 2005/11/16 14:49:41 1.137 @@ -1,11 +1,11 @@ /** @file Parser: @b file parser class. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_FILE_C="$Date: 2005/07/28 11:23:01 $"; +static const char * const IDENT_FILE_C="$Date: 2005/11/16 14:49:41 $"; #include "pa_config_includes.h" @@ -171,11 +171,9 @@ static void _load(Request& r, MethodPara if(options) { options=new HashStringValue(*options); if(Value *voffset=(Value *)options->get(sql_offset_name)) { - options->remove(sql_offset_name); offset=r.process_to_value(*voffset).as_int(); } if(Value *vlimit=(Value *)options->get(sql_limit_name)) { - options->remove(sql_limit_name); limit=r.process_to_value(*vlimit).as_int(); } // no check on options count here, see file_read @@ -785,12 +783,12 @@ MFile::MFile(): Methoded("file") { // ^cgi[file-name] // ^cgi[file-name;env hash] // ^cgi[file-name;env hash;1cmd;2line;3ar;4g;5s] - add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+10); + add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+50); // ^exec[file-name] // ^exec[file-name;env hash] // ^exec[file-name;env hash;1cmd;2line;3ar;4g;5s] - add_native_method("exec", Method::CT_DYNAMIC, _exec, 1, 2+10); + add_native_method("exec", Method::CT_DYNAMIC, _exec, 1, 2+50); // ^file:list[path] // ^file:list[path][regexp]