phpwiki-checkins Mailing List for PhpWiki (Page 522)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27676/lib

Modified Files:
	pgsql.php 
Log Message:
Changed PostgreSQL db library and schema to work with versioning, maybe.

Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/pgsql.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pgsql.php	2001/07/15 16:03:26	1.7
--- pgsql.php	2001/07/18 04:59:47	1.8
***************
*** 7,15 ****
        OpenDataBase($table)
        CloseDataBase($dbi)
!       RetrievePage($dbi, $pagename, $pagestore)
!       InsertPage($dbi, $pagename, $pagehash)
!       SaveCopyToArchive($dbi, $pagename, $pagehash) 
        IsWikiPage($dbi, $pagename)
        IsInArchive($dbi, $pagename)
        InitTitleSearch($dbi, $search)
        TitleSearchNextMatch($dbi, $res)
--- 7,20 ----
        OpenDataBase($table)
        CloseDataBase($dbi)
!       RetrievePage($dbi, $pagename, $pagestore, $version)
!       RetrievePageVersions($dbi, $pagename, $curstore, $archstore)
!       GetMaxVersionNumber($dbi, $pagename, $pagestore)
!       InsertPage($dbi, $pagename, $pagehash, $clobber)
!       SelectStore($dbi, $pagename, $version, $curstore, $archstore)
!       IsVersionInWiki($dbi, $pagename, $version)
!       IsVersionInArchive($dbi, $pagename, $version)
        IsWikiPage($dbi, $pagename)
        IsInArchive($dbi, $pagename)
+       RemovePage($dbi, $pagename)
        InitTitleSearch($dbi, $search)
        TitleSearchNextMatch($dbi, $res)
***************
*** 65,71 ****

     // Return hash of page + attributes or default
!    function RetrievePage($dbi, $pagename, $pagestore) {
        $pagename = addslashes($pagename);
!       $query = "select * from $pagestore where pagename='$pagename'";
        // echo "<p>$query<p>";
        $res = pg_exec($dbi['dbc'], $query);
--- 70,77 ----

     // Return hash of page + attributes or default
!    function RetrievePage($dbi, $pagename, $pagestore, $version) {
        $pagename = addslashes($pagename);
!       $version = $version ? " and version=$version" : '';
!       $query = "select * from $pagestore where pagename='$pagename'$version";
        // echo "<p>$query<p>";
        $res = pg_exec($dbi['dbc'], $query);
***************
*** 95,100 ****

     // Either insert or replace a key/value (a page)
!    function InsertPage($dbi, $pagename, $pagehash) {
        $pagename = addslashes($pagename);

--- 101,145 ----

+    // Return all versions of a page as an array of page hashes
+    function RetrievePageVersions($dbi, $pagename, $curstore, $archstore) {
+       $pagename = addslashes($pagename);
+       if (($page[0] = RetrievePage($dbi, $pagename, $curstore, 0)) != -1) {
+          $res = pg_exec($dbi['dbc'], "select * from $archstore where pagename='$pagename' order by version desc");
+          if (pg_numrows($res)) {
+             while ($array = pg_fetch_array($res, 0)) {
+                while (list($key, $val) = each($array)) {
+                   if (gettype($key) == "integer") {
+                      continue;
+                   }
+                   $dbhash[$key] = $val;
+                }
+ 
+                $dbhash['refs'] = unserialize($dbhash['refs']);
+                $dbhash['content'] = explode("\n", $dbhash['content']);
+ 
+                array_push($page, $dbhash);
+             }
+          
+             return $page;
+          }
+       }
+ 
+       // if we reach this the query failed
+       return -1;
+    }
+ 
+ 
+    // Get maximum version number of a page in pagestore
+    function GetMaxVersionNumber($dbi, $pagename, $pagestore) {
+       $pagename = addslashes($pagename);
+       if ($res = pg_exec($dbi['dbc'], "select max(version) from $pagestore where pagename='$pagename'")) {
+          return pg_result($res, 0, "version");
+       }
+       return -1;
+    }
+ 
+    
     // Either insert or replace a key/value (a page)
!    function InsertPage($dbi, $pagename, $pagehash, $clobber) {
        $pagename = addslashes($pagename);

***************
*** 123,240 ****
        // record the time of modification
        $pagehash["lastmodified"] = time();
- 

!       if (IsWikiPage($dbi, $pagename)) {

!          $PAIRS = "author='$pagehash[author]'," .
!                   "content='$pagehash[content]'," .
!                   "created=$pagehash[created]," .
!                   "flags=$pagehash[flags]," .
!                   "lastmodified=$pagehash[lastmodified]," .
!                   "pagename='$pagehash[pagename]'," .
!                   "refs='$pagehash[refs]'," .
!                   "version=$pagehash[version]";

!          $query = "UPDATE $dbi[table] SET $PAIRS WHERE pagename='$pagename'";
! 
!       } else {
!          // do an insert
!          // build up the column names and values for the query
! 
!          $COLUMNS = "author, content, created, flags, " .
!                     "lastmodified, pagename, refs, version";

!          $VALUES =  "'$pagehash[author]', '$pagehash[content]', " .
!                     "$pagehash[created], $pagehash[flags], " .
!                     "$pagehash[lastmodified], '$pagehash[pagename]', " .
!                     "'$pagehash[refs]', $pagehash[version]";

!          $query = "INSERT INTO $dbi[table] ($COLUMNS) VALUES($VALUES)";
        }

-       // echo "<p>Query: $query<p>\n";
-       $retval = pg_exec($dbi['dbc'], $query);
-       if ($retval == false) 
-          echo "Insert/update failed: " . pg_errormessage($dbi['dbc']);

     }

!    function SaveCopyToArchive($dbi, $pagename, $pagehash) {
        global $ArchivePageStore;
-       // echo "<p>save copy called<p>";

        $pagename = addslashes($pagename);
!       // echo "<p>dbi in SaveCopyToArchive: '$dbi' '$ArchivePageStore' '$dbi[dbc]'<p>";
! 
!       // prepare the content for storage
!       if (!isset($pagehash["pagename"]))
!          $pagehash["pagename"] = $pagename;
!       if (!isset($pagehash["flags"]))
!          $pagehash["flags"] = 0;
!       $pagehash["author"] = addslashes($pagehash["author"]);
!       $pagehash["content"] = implode("\n", $pagehash["content"]);
!       $pagehash["content"] = addslashes($pagehash["content"]);
!       $pagehash["pagename"] = addslashes($pagehash["pagename"]);
!       $pagehash["refs"] = serialize($pagehash["refs"]);
! 
!       if (IsInArchive($dbi, $pagename)) {
! 
!          $PAIRS = "author='$pagehash[author]'," .
!                   "content='$pagehash[content]'," .
!                   "created=$pagehash[created]," .
!                   "flags=$pagehash[flags]," .
!                   "lastmodified=$pagehash[lastmodified]," .
!                   "pagename='$pagehash[pagename]'," .
!                   "refs='$pagehash[refs]'," .
!                   "version=$pagehash[version]";
! 
!          $query = "UPDATE $ArchivePageStore SET $PAIRS WHERE pagename='$pagename'";

-       } else {
-          // do an insert
-          // build up the column names and values for the query

!          $COLUMNS = "author, content, created, flags, " .
!                     "lastmodified, pagename, refs, version";

-          $VALUES =  "'$pagehash[author]', '$pagehash[content]', " .
-                     "$pagehash[created], $pagehash[flags], " .
-                     "$pagehash[lastmodified], '$pagehash[pagename]', " .
-                     "'$pagehash[refs]', $pagehash[version]";

!          $query = "INSERT INTO $ArchivePageStore ($COLUMNS) VALUES($VALUES)";
        }

-       // echo "<p>Query: $query<p>\n";
-       $retval = pg_exec($dbi['dbc'], $query);
-       if ($retval == false) 
-          echo "Insert/update failed: " . pg_errormessage($dbi['dbc']);

!    }

!    function IsWikiPage($dbi, $pagename) {
!       global $WikiPageStore;   	
!       $pagename = addslashes($pagename);
!       $query = "select count(*) from $WikiPageStore " .
!                "where pagename='$pagename'";
!       $res = pg_exec($query);
!       $array = pg_fetch_array($res, 0);
!       return $array[0];
!    }

!    function IsInArchive($dbi, $pagename) {
! 	 global $ArchivePageStore;
!       $pagename = addslashes($pagename);
!       $query = "select count(*) from $ArchivePageStore " .
!                "where pagename='$pagename'";
!       $res = pg_exec($query);
!       $array = pg_fetch_array($res, 0);
!       return $array[0];
     }

--- 168,275 ----
        // record the time of modification
        $pagehash["lastmodified"] = time();

!       // Clobber existing page?
!       $clobber = $clobber ? 'replace' : 'insert';

!       $COLUMNS = "author, content, created, flags, " .
!                  "lastmodified, pagename, refs, version";

!       $VALUES =  "'$pagehash[author]', '$pagehash[content]', " .
!                  "$pagehash[created], $pagehash[flags], " .
!                  "$pagehash[lastmodified], '$pagehash[pagename]', " .
!                  "'$pagehash[refs]', $pagehash[version]";
! 
!       if (!pg_exec($dbi['dbc'], "$clobber into $dbi[table] ($COLUMNS) values ($VALUES)")) {
!          $msg = htmlspecialchars(sprintf(gettext("Error writing page '%s'"), $pagename));
!          $msg .= "<BR>";
!          $msg .= htmlspecialchars(sprintf(gettext("PostgreSQL error: %s"), pg_errormessage($dbi['dbc'])));
!          ExitWiki($msg);
!       }
!    }

!    
!    // Adds a page to the archive pagestore
!    function SavePageToArchive($pagename, $pagehash) {
!       global $ArchivePageStore;
!       $dbi = OpenDataBase($ArchivePageStore);
!       InsertPage($dbi, $pagename, $pagehash, false);
!    }   

!    // Returns store where version of page resides
!    function SelectStore($dbi, $pagename, $version, $curstore, $archstore) {
!       if ($version) {
!          if (IsVersionInWiki($dbi, $pagename, $version)) return $curstore;
!          elseif (IsVersionInArchive($dbi, $pagename, $version)) return $archstore;
!          else return -1;
        }
+       elseif (IsWikiPage($dbi, $pagename)) return $curstore;
+       else return -1;
+    }

+    function IsVersionInWiki($dbi, $pagename, $version) {
+       $pagename = addslashes($pagename);
+       if ($res = pg_exec($dbi['dbc'], "select count(*) from $dbi[table] where pagename='$pagename' and version='$version'")) {
+          return pg_result($res, 0, "count");
+       }
+       return 0;
     }

!    function IsVersionInArchive($dbi, $pagename, $version) {
        global $ArchivePageStore;

        $pagename = addslashes($pagename);
!       if ($res = pg_exec($dbi['dbc'], "select count(*) from $ArchivePageStore where pagename='$pagename' and version='$version'")) {
!          return pg_result($res, 0, "count");
!       }
!       return 0;
!    }

!    function IsWikiPage($dbi, $pagename) {
!       $pagename = addslashes($pagename);
!       if ($res = pg_exec($dbi['dbc'], "select count(*) from $dbi[table] where pagename='$pagename'")) {
!          return pg_result($res, 0, "count");
!       }
!       return 0;
!    }

+    function IsInArchive($dbi, $pagename) {
+       global $ArchivePageStore;

!       $pagename = addslashes($pagename);
!       if ($res = pg_exec($dbi['dbc'], "select count(*) from $ArchivePageStore where pagename='$pagename'")) {
!          return pg_result($res, 0, "count");
        }
+       return 0;
+    }

+    function RemovePage($dbi, $pagename) {
+       global $WikiPageStore, $ArchivePageStore;
+       global $WikiLinksStore, $HitCountStore, $WikiScoreStore;

!       $pagename = addslashes($pagename);
!       $msg = gettext ("Cannot delete '%s' from table '%s'");
!       $msg .= "<br>\n";
!       $msg .= gettext ("PostgreSQL error: %s");

+       if (!pg_exec($dbi['dbc'], "delete from $WikiPageStore where pagename='$pagename'"))
+          ExitWiki(sprintf($msg, $pagename, $WikiPageStore, pg_errormessage()));

!       if (!pg_exec($dbi['dbc'], "delete from $ArchivePageStore where pagename='$pagename'"))
!          ExitWiki(sprintf($msg, $pagename, $ArchivePageStore, pg_errormessage()));

+       if (!pg_exec($dbi['dbc'], "delete from $WikiLinksStore where frompage='$pagename'"))
+          ExitWiki(sprintf($msg, $pagename, $WikiLinksStore, pg_errormessage()));

!       if (!pg_exec($dbi['dbc'], "delete from $HitCountStore where pagename='$pagename'"))
!          ExitWiki(sprintf($msg, $pagename, $HitCountStore, pg_errormessage()));
! 
!       if (!pg_exec($dbi['dbc'], "delete from $WikiScoreStore where pagename='$pagename'"))
!          ExitWiki(sprintf($msg, $pagename, $WikiScoreStore, mysql_error()));
     }

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

phpwiki-checkins Mailing List for PhpWiki (Page 522)

phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.