Index: openacs-4/packages/acs-core-docs/www/db-api.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api.html,v diff -u -r1.46.2.2 -r1.46.2.3 --- openacs-4/packages/acs-core-docs/www/db-api.html 12 Dec 2010 00:07:02 -0000 1.46.2.2 +++ openacs-4/packages/acs-core-docs/www/db-api.html 12 Dec 2010 01:37:24 -0000 1.46.2.3 @@ -1,10 +1,5 @@ -<<<<<<< db-api.html - -The OpenACS Database Access API

The OpenACS Database Access API

-======= -The OpenACS Database Access API

The OpenACS Database Access API

->>>>>>> 1.48 +The OpenACS Database Access API

The OpenACS Database Access API

By Pete Su and Jon Salz. Modified by Roberto Mello.

Overview

One of OpenACS's great strengths is that code written for it is @@ -13,13 +8,8 @@ coherent API for database access which makes this even easier.

More detailed information about the DB api is available at -<<<<<<< db-api.html - Database Access API. -

DB API Examples

-======= Database Access API.

DB API Examples

->>>>>>> 1.48 The OpenACS database API is meant to save developers from making common mistakes and to provide a more structured syntax for specifying database operations, including transactions. Here's @@ -666,13 +656,8 @@ db_dml foo_insert "insert into foo(baz) values(:1)" {[db_nullify_empty_string $baz]}

-<<<<<<< db-api.html

($Id$)

-

Caching Database API Results

The database API allows for direct caching of query results. Repeated calls will -======= -

($Id$)

Caching Database API Results

The database API allows for direct caching of query results. Repeated calls will ->>>>>>> 1.48 return the cached value until it is either explicitly flushed using db_flush_cache, times out (configured the ns_cache is called to create the cache), or another cached query fills the cache, causing older entries to be flushed.