--- parser3/src/classes/hashfile.C 2005/07/28 11:23:01 1.34 +++ parser3/src/classes/hashfile.C 2005/08/09 08:14:47 1.36 @@ -1,12 +1,12 @@ /** @file Parser: @b hashfile 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="$Id: hashfile.C,v 1.34 2005/07/28 11:23:01 paf Exp $"; +static const char * const IDENT="$Id: hashfile.C,v 1.36 2005/08/09 08:14:47 paf Exp $"; #include "classes.h" @@ -31,12 +31,30 @@ public: // Methoded DECLARE_CLASS_VAR(hashfile, new MHashfile, 0); +// defines for statics + +#define OPEN_DATA_NAME "HASHFILE-OPEN-DATA" + // methods +typedef Hash HashStringBool; + static void _open(Request& r, MethodParams& params) { + HashStringBool* file_list=static_cast(r.classes_conf.get(OPEN_DATA_NAME)); + if(!file_list) { + file_list=new HashStringBool(); + r.classes_conf.put(OPEN_DATA_NAME, file_list); + } + + const String& file_spec=r.absolute(params.as_string(0, "filename must be string")); + if(file_list->get(file_spec)) + throw Exception("parser.runtime", + 0, + "this hashfile is already opened, use existing variable"); + file_list->put(file_spec, true); + VHashfile& self=GET_SELF(r, VHashfile); - - self.open(r.absolute(params.as_string(0, "filename must be string"))); + self.open(file_spec); } static void _hash(Request& r, MethodParams&) {