--- parser3/src/classes/hashfile.C 2001/10/26 13:48:18 1.11 +++ parser3/src/classes/hashfile.C 2002/02/08 08:30:10 1.22 @@ -1,15 +1,15 @@ /** @file Parser: @b hashfile parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: hashfile.C,v 1.11 2001/10/26 13:48:18 paf Exp $ + $Id: hashfile.C,v 1.22 2002/02/08 08:30:10 paf Exp $ */ #include "pa_config_includes.h" #include "classes.h" -#ifdef HAVE_LIBDB +#ifdef DB2 #include "pa_request.h" #include "pa_vhashfile.h" @@ -38,23 +38,11 @@ static void _open(Request& r, const Stri VHashfile& self=*static_cast(r.self); self.assign( - params->as_string(0, "DB_HOME must be string"), + r.absolute(params->as_string(0, "DB_HOME must be string")), params->as_string(1, "filename must be string") ); } -static void _clear(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - // db_home & file_name - const String &db_home=params->as_string(0, "DB_HOME must be string"); - const String &file_name=params->as_string(1, "filename must be string"); - - DB_manager->get_connection_ptr(db_home, &method_name)-> - clear_dbfile(file_name); -} - - static void _transaction(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VHashfile& self=*static_cast(r.self); @@ -65,17 +53,8 @@ static void _transaction(Request& r, con // table DB_Table_ptr table_ptr=self.get_table_ptr(&method_name); - // transaction - DB_Transaction transaction(pool, *table_ptr, self.current_transaction); - // execute body - try { - r.write_assign_lang(r.process(body_code)); - } catch(...) { // process/commit problem - transaction.mark_to_rollback(); - - /*re*/throw; - } + r.write_assign_lang(r.process(body_code)); } static void _hash(Request& r, const String& method_name, MethodParams *params) { @@ -94,38 +73,30 @@ static void _cache(Request& r, const Str // key, expires, body code const String &key=params->as_string(0, "key must be string"); - double expires=params->as_double(1, "expires must be number", r); + time_t lifespan=(time_t)params->as_double(1, "lifespan must be number", r); Value& body_code=params->as_junction(2, "body must be code"); - // transaction - DB_Transaction transaction(pool, *self.get_table_ptr(&method_name), self.current_transaction); - - // execute body - try { - if(expires) { // 'expires' specified? try cached copy... - if(String *cached_body=transaction.get(key)) { // have cached copy? - r.write_assign_lang(*cached_body); - // happy with it - return; - } - } else // 'expires'=0, forget cached copy - transaction.remove(key); - - // save - Autosave_marked_to_cancel_cache saved(self); + DB_Table_ptr table_ptr=self.get_table_ptr(&method_name); - // process - Value& processed_body=r.process(body_code); - r.write_assign_lang(processed_body); - - // put it to cache if 'expires' specified & never called ^delete[] - if(expires && !self.marked_to_cancel_cache()) - transaction.put(key, processed_body.as_string(), time(0)+(time_t)expires); - } catch(...) { // process/commit problem - transaction.mark_to_rollback(); - - /*re*/throw; - } + if(lifespan) { // 'lifespan' specified? try cached copy... + if(String *cached_body=table_ptr->get(pool, key, lifespan)) { // have cached copy? + r.write_assign_lang(*cached_body); + // happy with it + return; + } + } else // 'lifespan'=0, forget cached copy + table_ptr->remove(key); + + // save + Autosave_marked_to_cancel_cache saved(self); + + // process + Value& processed_body=r.process(body_code); + r.write_assign_lang(processed_body); + + // put it to cache if 'lifespan' specified & never called ^delete[] + if(lifespan && !self.marked_to_cancel_cache()) + table_ptr->put(key, processed_body.as_string(), lifespan); } static void _delete(Request& r, const String& method_name, MethodParams *params) { @@ -138,7 +109,60 @@ static void _delete(Request& r, const St // key const String &key=params->as_string(0, "key must be string"); // remove - self.get_table_ptr(&method_name)->remove(self.current_transaction, key); + self.get_table_ptr(&method_name)->remove(key); + } +} + +static void _clear(Request& r, const String& method_name, MethodParams *) { + Pool& pool=r.pool(); + VHashfile& self=*static_cast(r.self); + DB_Cursor cursor(*self.get_table_ptr(&method_name), &method_name); + + while(true) { + if(!cursor.move(DB_NEXT)) + break; + + cursor.remove(0/*flags*/); + } +} + +static void _foreach(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + VHashfile& self=*static_cast(r.self); + + const String& key_var_name=params->as_string(0, "key-var name must be string"); + const String& value_var_name=params->as_string(1, "value-var name must be string"); + Value& body_code=params->as_junction(2, "body must be code"); + Value *delim_maybe_code=params->size()>3?¶ms->get(3):0; + + bool need_delim=false; + Value& var_context=*body_code.get_junction()->wcontext; + VString& vkey=*new(pool) VString(pool); + VString& vvalue=*new(pool) VString(pool); + + DB_Cursor cursor(*self.get_table_ptr(&method_name), &method_name); + while(true) { + String *key; + String *data; + if(!cursor.get(pool, key, data, DB_NEXT)) + break; + + if(!key) + continue; // expired + + vkey.set_string(*key); + vvalue.set_string(*data); + var_context.put_element(key_var_name, &vkey); + var_context.put_element(value_var_name, &vvalue); + + Value& processed_body=r.process(body_code); + if(delim_maybe_code) { // delimiter set? + const String *string=processed_body.get_string(); + if(need_delim && string && string->size()) // need delim & iteration produced string? + r.write_pass_lang(r.process(*delim_maybe_code)); + need_delim=true; + } + r.write_pass_lang(processed_body); } } @@ -149,8 +173,6 @@ MHashfile::MHashfile(Pool& apool) : Meth // ^hashfile::open[db_home;filename] add_native_method("open", Method::CT_DYNAMIC, _open, 2, 2); - // ^hashfile:clear[db_home;filename] - add_native_method("clear", Method::CT_STATIC, _clear, 2, 2); // ^transaction{code} add_native_method("transaction", Method::CT_DYNAMIC, _transaction, 1, 1); // ^hash[] @@ -159,6 +181,10 @@ MHashfile::MHashfile(Pool& apool) : Meth add_native_method("cache", Method::CT_DYNAMIC, _cache, 3, 3); // ^hashfile.delete[key] add_native_method("delete", Method::CT_DYNAMIC, _delete, 0, 1); + // ^hashfile.clear[] + add_native_method("clear", Method::CT_DYNAMIC, _clear, 0, 0); + // ^hashfile.foreach[key;value]{code}[delim] + add_native_method("foreach", Method::CT_DYNAMIC, _foreach, 2+1, 2+1+1); } // global variable @@ -171,7 +197,7 @@ Methoded *hashfile_base_class; Methoded *MHashfile_create(Pool& pool) { return -#ifdef HAVE_LIBDB +#ifdef DB2 hashfile_base_class=new(pool) MHashfile(pool) #else 0