Menu
▾
▴
[phpwiki-checkins] CVS: phpwiki/lib dbalib.php,1.4,1.5
|
From: Steve W. <wai...@us...> - 2001-06-22 21:27:58
|
Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31982
Modified Files:
dbalib.php
Log Message:
Same as dbmlib.php: ran indent-region on whole buffer, corrected
missed spots, untabify.
Index: dbalib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/dbalib.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dbalib.php 2001/02/17 05:36:21 1.4
--- dbalib.php 2001/06/22 21:27:55 1.5
***************
*** 1,28 ****
<?php
! rcs_id('$Id$');
! /*
! Database functions:
! OpenDataBase($dbname)
! CloseDataBase($dbi)
! PadSerializedData($data)
! UnPadSerializedData($data)
! RetrievePage($dbi, $pagename, $pagestore)
! InsertPage($dbi, $pagename, $pagehash)
! SaveCopyToArchive($dbi, $pagename, $pagehash)
! IsWikiPage($dbi, $pagename)
! IsInArchive($dbi, $pagename)
! InitTitleSearch($dbi, $search)
! TitleSearchNextMatch($dbi, &$pos)
! InitFullSearch($dbi, $search)
! FullSearchNextMatch($dbi, &$pos)
! IncreaseHitCount($dbi, $pagename)
! GetHitCount($dbi, $pagename)
! InitMostPopular($dbi, $limit)
! MostPopularNextMatch($dbi, &$res)
! GetAllWikiPagenames($dbi)
! */
--- 1,28 ----
<?php
! rcs_id('$Id$');
! /*
! Database functions:
! OpenDataBase($dbname)
! CloseDataBase($dbi)
! PadSerializedData($data)
! UnPadSerializedData($data)
! RetrievePage($dbi, $pagename, $pagestore)
! InsertPage($dbi, $pagename, $pagehash)
! SaveCopyToArchive($dbi, $pagename, $pagehash)
! IsWikiPage($dbi, $pagename)
! IsInArchive($dbi, $pagename)
! InitTitleSearch($dbi, $search)
! TitleSearchNextMatch($dbi, &$pos)
! InitFullSearch($dbi, $search)
! FullSearchNextMatch($dbi, &$pos)
! IncreaseHitCount($dbi, $pagename)
! GetHitCount($dbi, $pagename)
! InitMostPopular($dbi, $limit)
! MostPopularNextMatch($dbi, &$res)
! GetAllWikiPagenames($dbi)
! */
***************
*** 30,44 ****
function _dbname($base)
{
! extract($GLOBALS['DBParams']);
! return "$directory/${database}${prefix}${base}";
}
$WikiPageStore = "wiki";
$ArchivePageStore = "archive";
! $WikiDB = array('wiki' => _dbname('pagesdb'),
! 'archive' => _dbname('archivedb'),
! 'wikilinks' => _dbname('linksdb'),
! 'hottopics' => _dbname('hottopicsdb'),
! 'hitcount' => _dbname('hitcountdb'));
if (preg_match('@^/tmp\b@', $DBParams['directory']))
--- 30,44 ----
function _dbname($base)
{
! extract($GLOBALS['DBParams']);
! return "$directory/${database}${prefix}${base}";
}
$WikiPageStore = "wiki";
$ArchivePageStore = "archive";
! $WikiDB = array('wiki' => _dbname('pagesdb'),
! 'archive' => _dbname('archivedb'),
! 'wikilinks' => _dbname('linksdb'),
! 'hottopics' => _dbname('hottopicsdb'),
! 'hitcount' => _dbname('hitcountdb'));
if (preg_match('@^/tmp\b@', $DBParams['directory']))
***************
*** 46,274 ****
define('MAX_DBM_ATTEMPTS', $DBParams['timeout']);
!
! // open a database and return the handle
! // loop until we get a handle; php has its own
! // locking mechanism, thank god.
! // Suppress ugly error message with @.
!
! function OpenDataBase($dbname) {
! global $WikiDB; // hash of all the DBM file names
!
! reset($WikiDB);
! while (list($key, $file) = each($WikiDB)) {
! while (($dbi[$key] = @dba_open($file, "c", "gdbm")) < 1) {
! $numattempts++;
! if ($numattempts > MAX_DBM_ATTEMPTS) {
! ExitWiki("Cannot open database '$key' : '$file', giving up.");
! }
! sleep(1);
}
}
- return $dbi;
}
! function CloseDataBase($dbi) {
! reset($dbi);
! while (list($dbmfile, $dbihandle) = each($dbi)) {
! dba_close($dbihandle);
! }
! return;
}
! // take a serialized hash, return same padded out to
! // the next largest number bytes divisible by 500. This
! // is to save disk space in the long run, since DBM files
! // leak memory.
! function PadSerializedData($data) {
! // calculate the next largest number divisible by 500
! $nextincr = 500 * ceil(strlen($data) / 500);
! // pad with spaces
! $data = sprintf("%-${nextincr}s", $data);
! return $data;
! }
! // strip trailing whitespace from the serialized data
! // structure.
! function UnPadSerializedData($data) {
! return chop($data);
! }
! // Return hash of page + attributes or default
! function RetrievePage($dbi, $pagename, $pagestore) {
! if ($data = dba_fetch($pagename, $dbi[$pagestore])) {
! // unserialize $data into a hash
! $pagehash = unserialize(UnPadSerializedData($data));
! return $pagehash;
! } else {
! return -1;
! }
}
! // Either insert or replace a key/value (a page)
! function InsertPage($dbi, $pagename, $pagehash) {
! $pagedata = PadSerializedData(serialize($pagehash));
!
! if (!dba_insert($pagename, $pagedata, $dbi['wiki'])) {
! if (!dba_replace($pagename, $pagedata, $dbi['wiki'])) {
! ExitWiki("Error inserting page '$pagename'");
! }
! }
! }
! // for archiving pages to a seperate dbm
! function SaveCopyToArchive($dbi, $pagename, $pagehash) {
! global $ArchivePageStore;
!
! $pagedata = PadSerializedData(serialize($pagehash));
!
! if (!dba_insert($pagename, $pagedata, $dbi[$ArchivePageStore])) {
! if (!dba_replace($pagename, $pagedata, $dbi['archive'])) {
! ExitWiki("Error storing '$pagename' into archive");
! }
! }
! }
! function IsWikiPage($dbi, $pagename) {
! return dba_exists($pagename, $dbi['wiki']);
! }
! function IsInArchive($dbi, $pagename) {
! return dba_exists($pagename, $dbi['archive']);
! }
! // setup for title-search
! function InitTitleSearch($dbi, $search) {
! $pos['search'] = $search;
! $pos['key'] = dba_firstkey($dbi['wiki']);
! return $pos;
! }
! // iterating through database
! function TitleSearchNextMatch($dbi, &$pos) {
! while ($pos['key']) {
! $page = $pos['key'];
! $pos['key'] = dba_nextkey($dbi['wiki']);
! if (eregi($pos['search'], $page)) {
! return $page;
! }
}
- return 0;
}
! // setup for full-text search
! function InitFullSearch($dbi, $search) {
! return InitTitleSearch($dbi, $search);
! }
! //iterating through database
! function FullSearchNextMatch($dbi, &$pos) {
! while ($pos['key']) {
! $key = $pos['key'];
! $pos['key'] = dba_nextkey($dbi['wiki']);
!
! $pagedata = dba_fetch($key, $dbi['wiki']);
! // test the serialized data
! if (eregi($pos['search'], $pagedata)) {
! $page['pagename'] = $key;
! $pagedata = unserialize(UnPadSerializedData($pagedata));
! $page['content'] = $pagedata['content'];
! return $page;
! }
}
- return 0;
}
! ////////////////////////
! // new database features
! function IncreaseHitCount($dbi, $pagename) {
! if (dba_exists($pagename, $dbi['hitcount'])) {
! // increase the hit count
! // echo "$pagename there, incrementing...<br>\n";
! $count = dba_fetch($pagename, $dbi['hitcount']);
! $count++;
! dba_replace($pagename, $count, $dbi['hitcount']);
! } else {
! // add it, set the hit count to one
! // echo "adding $pagename to hitcount...<br>\n";
! $count = 1;
! dba_insert($pagename, $count, $dbi['hitcount']);
! }
}
! function GetHitCount($dbi, $pagename) {
! if (dba_exists($pagename, $dbi['hitcount'])) {
! // increase the hit count
! $count = dba_fetch($pagename, $dbi['hitcount']);
! return $count;
! } else {
! return 0;
! }
}
-
- function InitMostPopular($dbi, $limit) {
- // iterate through the whole dbm file for hit counts
- // sort the results highest to lowest, and return
- // n..$limit results
! $pagename = dba_firstkey($dbi['hitcount']);
! $res[$pagename] = dba_fetch($pagename, $dbi['hitcount']);
! while ($pagename = dba_nextkey($dbi['hitcount'])) {
! $res[$pagename] = dba_fetch($pagename, $dbi['hitcount']);
! //echo "got $pagename with value " . $res[$pagename] . "<br>\n";
! }
! arsort($res);
! return($res);
}
! function MostPopularNextMatch($dbi, &$res) {
! // the return result is a two element array with 'hits'
! // and 'pagename' as the keys
! if (count($res) == 0)
! return 0;
! if (list($pagename, $hits) = each($res)) {
! //echo "most popular next match called<br>\n";
! //echo "got $pagename, $hits back<br>\n";
! $nextpage = array(
! "hits" => $hits,
! "pagename" => $pagename
);
! // $dbm_mostpopular_cntr++;
! return $nextpage;
! } else {
! return 0;
! }
! }
! function GetAllWikiPagenames($dbi) {
! $namelist = array();
! $ctr = 0;
!
! $namelist[$ctr] = $key = dba_firstkey($dbi);
!
! while ($key = dba_nextkey($dbi)) {
! $ctr++;
! $namelist[$ctr] = $key;
! }
! return $namelist;
}
// For emacs users
--- 46,274 ----
define('MAX_DBM_ATTEMPTS', $DBParams['timeout']);
!
! // open a database and return the handle
! // loop until we get a handle; php has its own
! // locking mechanism, thank god.
! // Suppress ugly error message with @.
!
! function OpenDataBase($dbname) {
! global $WikiDB; // hash of all the DBM file names
!
! reset($WikiDB);
! while (list($key, $file) = each($WikiDB)) {
! while (($dbi[$key] = @dba_open($file, "c", "gdbm")) < 1) {
! $numattempts++;
! if ($numattempts > MAX_DBM_ATTEMPTS) {
! ExitWiki("Cannot open database '$key' : '$file', giving up.");
}
+ sleep(1);
}
}
+ return $dbi;
+ }
! function CloseDataBase($dbi) {
! reset($dbi);
! while (list($dbmfile, $dbihandle) = each($dbi)) {
! dba_close($dbihandle);
}
+ return;
+ }
! // take a serialized hash, return same padded out to
! // the next largest number bytes divisible by 500. This
! // is to save disk space in the long run, since DBM files
! // leak memory.
! function PadSerializedData($data) {
! // calculate the next largest number divisible by 500
! $nextincr = 500 * ceil(strlen($data) / 500);
! // pad with spaces
! $data = sprintf("%-${nextincr}s", $data);
! return $data;
! }
! // strip trailing whitespace from the serialized data
! // structure.
! function UnPadSerializedData($data) {
! return chop($data);
! }
! // Return hash of page + attributes or default
! function RetrievePage($dbi, $pagename, $pagestore) {
! if ($data = dba_fetch($pagename, $dbi[$pagestore])) {
! // unserialize $data into a hash
! $pagehash = unserialize(UnPadSerializedData($data));
! return $pagehash;
! } else {
! return -1;
}
+ }
! // Either insert or replace a key/value (a page)
! function InsertPage($dbi, $pagename, $pagehash) {
! $pagedata = PadSerializedData(serialize($pagehash));
!
! if (!dba_insert($pagename, $pagedata, $dbi['wiki'])) {
! if (!dba_replace($pagename, $pagedata, $dbi['wiki'])) {
! ExitWiki("Error inserting page '$pagename'");
! }
! }
! }
! // for archiving pages to a seperate dbm
! function SaveCopyToArchive($dbi, $pagename, $pagehash) {
! global $ArchivePageStore;
!
! $pagedata = PadSerializedData(serialize($pagehash));
!
! if (!dba_insert($pagename, $pagedata, $dbi[$ArchivePageStore])) {
! if (!dba_replace($pagename, $pagedata, $dbi['archive'])) {
! ExitWiki("Error storing '$pagename' into archive");
! }
! }
! }
! function IsWikiPage($dbi, $pagename) {
! return dba_exists($pagename, $dbi['wiki']);
! }
! function IsInArchive($dbi, $pagename) {
! return dba_exists($pagename, $dbi['archive']);
! }
! // setup for title-search
! function InitTitleSearch($dbi, $search) {
! $pos['search'] = $search;
! $pos['key'] = dba_firstkey($dbi['wiki']);
! return $pos;
! }
! // iterating through database
! function TitleSearchNextMatch($dbi, &$pos) {
! while ($pos['key']) {
! $page = $pos['key'];
! $pos['key'] = dba_nextkey($dbi['wiki']);
! if (eregi($pos['search'], $page)) {
! return $page;
}
}
+ return 0;
+ }
! // setup for full-text search
! function InitFullSearch($dbi, $search) {
! return InitTitleSearch($dbi, $search);
! }
! //iterating through database
! function FullSearchNextMatch($dbi, &$pos) {
! while ($pos['key']) {
! $key = $pos['key'];
! $pos['key'] = dba_nextkey($dbi['wiki']);
!
! $pagedata = dba_fetch($key, $dbi['wiki']);
! // test the serialized data
! if (eregi($pos['search'], $pagedata)) {
! $page['pagename'] = $key;
! $pagedata = unserialize(UnPadSerializedData($pagedata));
! $page['content'] = $pagedata['content'];
! return $page;
}
}
+ return 0;
+ }
! ////////////////////////
! // new database features
! function IncreaseHitCount($dbi, $pagename) {
! if (dba_exists($pagename, $dbi['hitcount'])) {
! // increase the hit count
! // echo "$pagename there, incrementing...<br>\n";
! $count = dba_fetch($pagename, $dbi['hitcount']);
! $count++;
! dba_replace($pagename, $count, $dbi['hitcount']);
! } else {
! // add it, set the hit count to one
! // echo "adding $pagename to hitcount...<br>\n";
! $count = 1;
! dba_insert($pagename, $count, $dbi['hitcount']);
}
+ }
! function GetHitCount($dbi, $pagename) {
! if (dba_exists($pagename, $dbi['hitcount'])) {
! // increase the hit count
! $count = dba_fetch($pagename, $dbi['hitcount']);
! return $count;
! } else {
! return 0;
}
+ }
! function InitMostPopular($dbi, $limit) {
! // iterate through the whole dbm file for hit counts
! // sort the results highest to lowest, and return
! // n..$limit results
! $pagename = dba_firstkey($dbi['hitcount']);
! $res[$pagename] = dba_fetch($pagename, $dbi['hitcount']);
! while ($pagename = dba_nextkey($dbi['hitcount'])) {
! $res[$pagename] = dba_fetch($pagename, $dbi['hitcount']);
! //echo "got $pagename with value " . $res[$pagename] . "<br>\n";
}
! arsort($res);
! return($res);
! }
! function MostPopularNextMatch($dbi, &$res) {
! // the return result is a two element array with 'hits'
! // and 'pagename' as the keys
! if (count($res) == 0)
! return 0;
!
! if (list($pagename, $hits) = each($res)) {
! //echo "most popular next match called<br>\n";
! //echo "got $pagename, $hits back<br>\n";
! $nextpage = array(
! "hits" => $hits,
! "pagename" => $pagename
);
! // $dbm_mostpopular_cntr++;
! return $nextpage;
! } else {
! return 0;
! }
! }
! function GetAllWikiPagenames($dbi) {
! $namelist = array();
! $ctr = 0;
! $namelist[$ctr] = $key = dba_firstkey($dbi);
!
! while ($key = dba_nextkey($dbi)) {
! $ctr++;
! $namelist[$ctr] = $key;
}
+
+ return $namelist;
+ }
// For emacs users
|
