Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[10519] trunk/lib/WikiDB
|
From: <var...@us...> - 2021-08-14 19:33:29
|
Revision: 10519
http://sourceforge.net/p/phpwiki/code/10519
Author: vargenau
Date: 2021-08-14 19:33:26 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
function set_links returns no value; remove DEBUG part
Modified Paths:
--------------
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend.php
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2021-08-14 19:14:38 UTC (rev 10518)
+++ trunk/lib/WikiDB/backend/ADODB.php 2021-08-14 19:33:26 UTC (rev 10519)
@@ -545,12 +545,12 @@
array($id, $version + 1, $mtime, 0,
'', $this->_serialize($meta)))
and $dbh->Execute("DELETE FROM $nonempty_tbl WHERE id=$id")
- and $this->set_links($pagename, array())
// need to keep perms and LOCKED, otherwise you can reset the perm
// by action=remove and re-create it with default perms
// keep hits but delete meta-data
//and $dbh->Execute("UPDATE $page_tbl SET pagedata='' WHERE id=$id")
) {
+ $this->set_links($pagename, array());
$this->unlock(array('version', 'recent', 'nonempty', 'page', 'link'));
$dbh->CommitTrans();
return true;
@@ -597,8 +597,6 @@
*
* @param string $pagename Page name
* @param array $links List of page(names) which page links to.
- *
- * on DEBUG: delete old, deleted links from page
*/
function set_links($pagename, $links)
{
@@ -649,29 +647,7 @@
}
}
}
- // purge page table: delete all non-referenced pages
- // for all previously linked pages, which have no other linkto links
- if (DEBUG and $oldlinks) {
- // trigger_error("purge page table: delete all non-referenced pages...", E_USER_NOTICE);
- foreach ($oldlinks as $id => $name) {
- // ...check if the page is empty and has no version
- $result = $dbh->getRow("SELECT $page_tbl.id FROM $page_tbl"
- . " LEFT JOIN $nonempty_tbl USING (id) "
- . " LEFT JOIN $version_tbl USING (id)"
- . " WHERE $nonempty_tbl.id is NULL"
- . " AND $version_tbl.id is NULL"
- . " AND $page_tbl.id=$id");
- $linkto = $dbh->getRow("SELECT linkfrom FROM $link_tbl WHERE linkto=$id");
- if ($result and empty($linkto)) {
- trigger_error("delete empty and non-referenced link $name ($id)", E_USER_NOTICE);
- $dbh->Execute("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
- $dbh->Execute("DELETE FROM $link_tbl WHERE linkto=$id");
- $dbh->Execute("DELETE FROM $page_tbl WHERE id=$id"); // this purges the link
- }
- }
- }
$this->unlock(array('link'));
- return true;
}
/* get all oldlinks in hash => id, relation
Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2021-08-14 19:14:38 UTC (rev 10518)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2021-08-14 19:33:26 UTC (rev 10519)
@@ -100,8 +100,6 @@
*
* @param string $pagename Page name
* @param array $links List of page(names) which page links to.
- *
- * on DEBUG: delete old, deleted links from page
*/
function set_links($pagename, $links)
{
@@ -151,31 +149,7 @@
}
}
}
- // purge page table: delete all non-referenced pages
- // for all previously linked pages, which have no other linkto links
- if (DEBUG and $oldlinks) {
- // trigger_error("purge page table: delete all non-referenced pages...", E_USER_NOTICE);
- foreach ($oldlinks as $id => $name) {
- // ...check if the page is empty and has no version
- if ($id != '') {
- $result = $dbh->getRow("SELECT $page_tbl.id FROM $page_tbl"
- . " LEFT JOIN $nonempty_tbl ON ($nonempty_tbl.id = $page_tbl.id)" //'"id" is not a recognized table hints option'
- . " LEFT JOIN $version_tbl ON ($version_tbl.id = $page_tbl.id)" //'"id" is not a recognized table hints option'
- . " WHERE $nonempty_tbl.id is NULL"
- . " AND $version_tbl.id is NULL"
- . " AND $page_tbl.id=$id");
- $linkto = $dbh->getRow("SELECT linkfrom FROM $link_tbl WHERE linkto=$id");
- if ($result and empty($linkto)) {
- trigger_error("delete empty and non-referenced link $name ($id)", E_USER_NOTICE);
- $dbh->Execute("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
- $dbh->Execute("DELETE FROM $link_tbl WHERE linkto=$id");
- $dbh->Execute("DELETE FROM $page_tbl WHERE id=$id"); // this purges the link
- }
- }
- }
- }
$this->unlock(array('link'));
- return true;
}
/* get all oldlinks in hash => id, relation
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2021-08-14 19:14:38 UTC (rev 10518)
+++ trunk/lib/WikiDB/backend/PDO.php 2021-08-14 19:33:26 UTC (rev 10519)
@@ -654,8 +654,8 @@
$insert->bindParam(6, $meta_serialized, PDO::PARAM_STR, 100);
if ($insert->execute()
and $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id")
- and $this->set_links($pagename, array())
) {
+ $this->set_links($pagename, array());
// need to keep perms and LOCKED, otherwise you can reset the perm
// by action=remove and re-create it with default perms
// keep hits but delete meta-data
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2021-08-14 19:14:38 UTC (rev 10518)
+++ trunk/lib/WikiDB/backend.php 2021-08-14 19:33:26 UTC (rev 10519)
@@ -278,8 +278,6 @@
*
* @param string $pagename Page name
* @param array $links List of page(names) which page links to.
- *
- * on DEBUG: delete old, deleted links from page
*/
abstract function set_links($pagename, $links);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
