From: <var...@us...> - 2010-05-26 12:10:21
|
Revision: 7446 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7446&view=rev Author: vargenau Date: 2010-05-26 12:10:14 +0000 (Wed, 26 May 2010) Log Message: ----------- Use ts_rank (Postgres 8.4) Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2010-05-26 08:24:54 UTC (rev 7445) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2010-05-26 12:10:14 UTC (rev 7446) @@ -606,7 +606,7 @@ $search_clause .= "idxFTI @@ to_tsquery('$search_string')"; if (!$orderby) - $orderby = " ORDER BY rank(idxFTI, to_tsquery('$search_string')) DESC"; + $orderby = " ORDER BY ts_rank(idxFTI, to_tsquery('$search_string')) DESC"; } else { $callback = new WikiMethodCb($searchobj, "_pagename_match_clause"); $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND ("; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-03-03 17:38:29
|
Revision: 7957 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7957&view=rev Author: vargenau Date: 2011-03-03 17:38:22 +0000 (Thu, 03 Mar 2011) Log Message: ----------- Hack to make PageList work Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-03-03 17:08:31 UTC (rev 7956) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-03-03 17:38:22 UTC (rev 7957) @@ -319,6 +319,9 @@ else $exclude=''; + // Horrible hack + $include_empty=false; + if (strstr($orderby, 'mtime ')) { // multiple columns possible if ($include_empty) { $sql = "SELECT " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-06-01 13:44:56
|
Revision: 8091 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8091&view=rev Author: vargenau Date: 2011-06-01 13:44:50 +0000 (Wed, 01 Jun 2011) Log Message: ----------- Hack no longer needed Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-06-01 12:33:26 UTC (rev 8090) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-06-01 13:44:50 UTC (rev 8091) @@ -323,9 +323,6 @@ else $exclude=''; - // Horrible hack - $include_empty=false; - if (strstr($orderby, 'mtime ')) { // multiple columns possible if ($include_empty) { $sql = "SELECT " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-03-15 14:36:37
|
Revision: 8249 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8249&view=rev Author: vargenau Date: 2012-03-15 14:36:26 +0000 (Thu, 15 Mar 2012) Log Message: ----------- Fix "ab " search problem (quotes and space) Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-03-15 13:08:39 UTC (rev 8248) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-03-15 14:36:26 UTC (rev 8249) @@ -607,7 +607,7 @@ // TODO: title still ignored, need better rank and subselect $callback = new WikiMethodCb($searchobj, "_fulltext_match_clause"); $search_string = $search->makeTsearch2SqlClauseObj($callback); - $search_string = str_replace(array("%"," "), array("","&"), $search_string); + $search_string = str_replace('%', '', $search_string); $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND ("; $search_clause .= "idxFTI @@ to_tsquery('$search_string')"; @@ -691,7 +691,7 @@ */ function _fulltext_match_clause($node) { $word = strtolower($node->word); - $word = str_replace(" ", "&", $word); // phrase fix + // $word = str_replace(" ", "&", $word); // phrase fix // @alu: use _quote maybe instead of direct pg_escape_string $word = pg_escape_string($word); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-09-03 10:00:38
|
Revision: 8838 http://sourceforge.net/p/phpwiki/code/8838 Author: vargenau Date: 2013-09-03 10:00:36 +0000 (Tue, 03 Sep 2013) Log Message: ----------- Fusionforge: Use english catalog for search in the wiki as phpwiki is using english to split words Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2013-09-03 09:55:48 UTC (rev 8837) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2013-09-03 10:00:36 UTC (rev 8838) @@ -620,9 +620,9 @@ $search_string = str_replace('%', '', $search_string); $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND ("; - $search_clause .= "idxFTI @@ to_tsquery('$search_string')"; + $search_clause .= "idxFTI @@ to_tsquery('english', '$search_string')"; if (!$orderby) - $orderby = " ORDER BY ts_rank(idxFTI, to_tsquery('$search_string')) DESC"; + $orderby = " ORDER BY ts_rank(idxFTI, to_tsquery('english', '$search_string')) DESC"; } else { $callback = new WikiMethodCb($searchobj, "_pagename_match_clause"); $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND ("; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-25 15:03:00
|
Revision: 9558 http://sourceforge.net/p/phpwiki/code/9558 Author: vargenau Date: 2015-02-25 15:02:48 +0000 (Wed, 25 Feb 2015) Log Message: ----------- Use plainto_tsquery Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-02-24 15:21:23 UTC (rev 9557) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-02-25 15:02:48 UTC (rev 9558) @@ -621,9 +621,9 @@ $search_string = str_replace('%', '', $search_string); $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND ("; - $search_clause .= "idxFTI @@ to_tsquery('english', '$search_string')"; + $search_clause .= "idxFTI @@ plainto_tsquery('english', '$search_string')"; if (!$orderby) - $orderby = " ORDER BY ts_rank(idxFTI, to_tsquery('english', '$search_string')) DESC"; + $orderby = " ORDER BY ts_rank(idxFTI, plainto_tsquery('english', '$search_string')) DESC"; } else { $callback = new WikiMethodCb($searchobj, "_pagename_match_clause"); $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND ("; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-03-05 18:30:17
|
Revision: 9609 http://sourceforge.net/p/phpwiki/code/9609 Author: vargenau Date: 2015-03-05 18:30:15 +0000 (Thu, 05 Mar 2015) Log Message: ----------- Add comments Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-05 18:06:57 UTC (rev 9608) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-05 18:30:15 UTC (rev 9609) @@ -75,6 +75,9 @@ . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'"); } + /* + * filter (nonempty pages) currently ignored + */ function numPages($filter = false, $exclude = '') { $dbh = &$this->_dbh; @@ -88,6 +91,9 @@ . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'"); } + /* + * Read page information from database. + */ function get_pagedata($pagename) { global $page_prefix; @@ -165,6 +171,16 @@ return parent::get_previous_version($page_prefix . $pagename, $version); } + /** + * Get version data. + * + * @param string $pagename Name of the page + * @param int $version Which version to get + * @param bool $want_content Do we need content? + * + * @return array hash The version data, or false if specified version does not + * exist. + */ function get_versiondata($pagename, $version, $want_content = false) { $dbh = &$this->_dbh; @@ -174,11 +190,10 @@ // assert(is_string($pagename) and $pagename != ""); // assert($version > 0); - //trigger_error("GET_REVISION $pagename $version $want_content", E_USER_NOTICE); // FIXME: optimization: sometimes don't get page data? if ($want_content) { $fields = $this->page_tbl_fields - . ",$page_tbl.pagedata as pagedata," + . ",$page_tbl.pagedata AS pagedata," . $this->version_tbl_fields; } else { $fields = $this->page_tbl_fields . "," @@ -253,6 +268,9 @@ return $id; } + /* + * Delete page completely from the database. + */ function purge_page($pagename) { $dbh = &$this->_dbh; @@ -281,6 +299,13 @@ return $result; } + /* + * Find pages which link to or are linked from a page. + * + * TESTME relations: get_links is responsible to add the relation to the pagehash + * as 'linkrelation' key as pagename. See WikiDB_PageIterator::next + * if (isset($next['linkrelation'])) + */ function get_links($pagename, $reversed = true, $include_empty = false, $sortby = '', $limit = '', $exclude = '', $want_relations = false) @@ -399,6 +424,9 @@ return new WikiDB_backend_PearDB_iter($this, $result, $options); } + /* + * Find highest or lowest hit counts. + */ public function most_popular($limit = 20, $sortby = '-hits') { $dbh = &$this->_dbh; @@ -435,10 +463,12 @@ } else { $result = $dbh->query($sql); } - return new WikiDB_backend_PearDB_iter($this, $result); } + /* + * Find recent changes. + */ public function most_recent($params) { $limit = 0; @@ -514,6 +544,9 @@ return new WikiDB_backend_PearDB_iter($this, $result); } + /* + * Find referenced empty pages. + */ function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '') { $dbh = &$this->_dbh; @@ -528,7 +561,6 @@ $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from); if ($exclude) // array of pagenames $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude); - $p = strlen($page_prefix) + 1; $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename" . " FROM $page_tbl p, $link_tbl linked" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-03-06 11:01:58
|
Revision: 9613 http://sourceforge.net/p/phpwiki/code/9613 Author: vargenau Date: 2015-03-06 11:01:51 +0000 (Fri, 06 Mar 2015) Log Message: ----------- Remove wrong comment Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-06 10:53:35 UTC (rev 9612) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-06 11:01:51 UTC (rev 9613) @@ -574,7 +574,6 @@ . $exclude . $orderby; if ($limit) { - // oci8 error: WHERE NULL = NULL appended list($from, $count) = $this->limit($limit); $result = $dbh->limitQuery($sql, $from, $count * 3); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-03-06 11:27:44
|
Revision: 9614 http://sourceforge.net/p/phpwiki/code/9614 Author: vargenau Date: 2015-03-06 11:27:36 +0000 (Fri, 06 Mar 2015) Log Message: ----------- Use page_prefix Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-06 11:01:51 UTC (rev 9613) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-06 11:27:36 UTC (rev 9614) @@ -67,12 +67,11 @@ $dbh = &$this->_dbh; extract($this->_table_names); global $page_prefix; - $pat = $page_prefix; - $p = strlen($pat) + 1; + $p = strlen($page_prefix) + 1; return $dbh->getCol("SELECT substring(pagename from $p)" . " FROM $nonempty_tbl, $page_tbl" . " WHERE $nonempty_tbl.id=$page_tbl.id" - . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'"); + . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'"); } /* @@ -83,12 +82,11 @@ $dbh = &$this->_dbh; extract($this->_table_names); global $page_prefix; - $pat = $page_prefix; - $p = strlen($pat) + 1; + $p = strlen($page_prefix) + 1; return $dbh->getOne("SELECT count(*)" . " FROM $nonempty_tbl, $page_tbl" . " WHERE $nonempty_tbl.id=$page_tbl.id" - . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'"); + . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'"); } /* @@ -325,8 +323,7 @@ $exclude = ''; global $page_prefix; - $pat = $page_prefix; - $p = strlen($pat) + 1; + $p = strlen($page_prefix) + 1; $qpagename = $dbh->escapeSimple($pagename); // MeV+APe 2007-11-14 @@ -338,8 +335,8 @@ . " $page_tbl linkee, $page_tbl linker, $link_tbl " . ($want_relations ? " JOIN $page_tbl related ON ($link_tbl.relation=related.id)" : '') . " WHERE linkfrom=linker.id AND linkto=linkee.id" - . " AND $have.pagename='$pat$qpagename'" - . " AND substring($want.pagename from 0 for $p) = '$pat'" + . " AND $have.pagename='$page_prefix$qpagename'" + . " AND substring($want.pagename from 0 for $p) = '$page_prefix'" . (!$include_empty ? " AND $nonempty_tbl.id=$want.id" : "") //. " GROUP BY $want.id" . $exclude @@ -362,8 +359,7 @@ extract($this->_table_names); global $page_prefix; - $pat = $page_prefix; - $p = strlen($pat) + 1; + $p = strlen($page_prefix) + 1; $orderby = $this->sortby($sortby, 'db'); if ($orderby) $orderby = ' ORDER BY ' . $orderby; @@ -379,7 +375,7 @@ . " FROM $page_tbl, $recent_tbl, $version_tbl" . " WHERE $page_tbl.id=$recent_tbl.id" . " AND $page_tbl.id=$version_tbl.id AND latestversion=version" - . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'" + . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'" . $exclude . $orderby; } else { @@ -389,7 +385,7 @@ . " WHERE $nonempty_tbl.id=$page_tbl.id" . " AND $page_tbl.id=$recent_tbl.id" . " AND $page_tbl.id=$version_tbl.id AND latestversion=version" - . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'" + . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'" . $exclude . $orderby; } @@ -400,14 +396,14 @@ . " FROM $page_tbl" . ($exclude ? " WHERE $exclude" : '') . ($exclude ? " AND " : " WHERE ") - . " substring($page_tbl.pagename from 0 for $p) = '$pat'" + . " substring($page_tbl.pagename from 0 for $p) = '$page_prefix'" . $orderby; } else { $sql = "SELECT " . $this->page_tbl_fields . " FROM $nonempty_tbl, $page_tbl" . " WHERE $nonempty_tbl.id=$page_tbl.id" - . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'" + . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'" . $exclude . $orderby; } @@ -432,8 +428,7 @@ $dbh = &$this->_dbh; extract($this->_table_names); global $page_prefix; - $pat = $page_prefix; - $p = strlen($pat) + 1; + $p = strlen($page_prefix) + 1; if ($limit < 0) { $order = "hits ASC"; $limit = -$limit; @@ -454,7 +449,7 @@ . $this->page_tbl_fields . " FROM $nonempty_tbl, $page_tbl" . " WHERE $nonempty_tbl.id=$page_tbl.id" - . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'" + . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'" . $where . $orderby; if ($limit) { @@ -525,15 +520,14 @@ $where_clause .= " AND " . join(" AND ", $pick); global $page_prefix; - $pat = $page_prefix; - $p = strlen($pat) + 1; + $p = strlen($page_prefix) + 1; // FIXME: use SQL_BUFFER_RESULT for mysql? $sql = "SELECT " . $this->page_tbl_fields . ", " . $this->version_tbl_fields . " FROM $table" . " WHERE $where_clause" - . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'" + . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'" . " ORDER BY mtime $order"; if ($limit) { list($from, $count) = $this->limit($limit); @@ -552,8 +546,7 @@ $dbh = &$this->_dbh; extract($this->_table_names); global $page_prefix; - $pat = $page_prefix; - $p = strlen($pat) + 1; + $p = strlen($page_prefix) + 1; if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom'))) $orderby = 'ORDER BY ' . $orderby; @@ -561,15 +554,14 @@ $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from); if ($exclude) // array of pagenames $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude); - $p = strlen($page_prefix) + 1; $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename" . " FROM $page_tbl p, $link_tbl linked" . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id" . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id" . " WHERE ne.id IS NULL" . " AND p.id = linked.linkfrom" - . " AND substring(p.pagename from 0 for $p) = '$pat'" - . " AND substring(pp.pagename from 0 for $p) = '$pat'" + . " AND substring(p.pagename from 0 for $p) = '$page_prefix'" + . " AND substring(pp.pagename from 0 for $p) = '$page_prefix'" . $exclude_from . $exclude . $orderby; @@ -650,8 +642,7 @@ $dbh = &$this->_dbh; extract($this->_table_names); global $page_prefix; - $pat = $page_prefix; - $len = strlen($pat) + 1; + $len = strlen($page_prefix) + 1; $orderby = $this->sortby($sortby, 'db'); if ($sortby and $orderby) $orderby = ' ORDER BY ' . $orderby; @@ -677,14 +668,14 @@ $callback = new WikiMethodCb($searchobj, "_fulltext_match_clause"); $search_string = $search->makeTsearch2SqlClauseObj($callback); $search_string = str_replace('%', '', $search_string); - $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND ("; + $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$page_prefix') AND ("; $search_clause .= "idxFTI @@ plainto_tsquery('english', '$search_string')"; if (!$orderby) $orderby = " ORDER BY ts_rank(idxFTI, plainto_tsquery('english', '$search_string')) DESC"; } else { $callback = new WikiMethodCb($searchobj, "_pagename_match_clause"); - $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND ("; + $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$page_prefix') AND ("; $search_clause .= $search->makeSqlClauseObj($callback); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-03-06 11:52:56
|
Revision: 9615 http://sourceforge.net/p/phpwiki/code/9615 Author: vargenau Date: 2015-03-06 11:52:49 +0000 (Fri, 06 Mar 2015) Log Message: ----------- Add AS in SQL Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-06 11:27:36 UTC (rev 9614) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-06 11:52:49 UTC (rev 9615) @@ -555,9 +555,9 @@ if ($exclude) // array of pagenames $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude); $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename" - . " FROM $page_tbl p, $link_tbl linked" - . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id" - . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id" + . " FROM $page_tbl AS p, $link_tbl AS linked" + . " LEFT JOIN $page_tbl AS pp ON linked.linkto = pp.id" + . " LEFT JOIN $nonempty_tbl AS ne ON linked.linkto = ne.id" . " WHERE ne.id IS NULL" . " AND p.id = linked.linkfrom" . " AND substring(p.pagename from 0 for $p) = '$page_prefix'" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-03-06 12:57:01
|
Revision: 9616 http://sourceforge.net/p/phpwiki/code/9616 Author: vargenau Date: 2015-03-06 12:56:54 +0000 (Fri, 06 Mar 2015) Log Message: ----------- Fix WantedPages for Fusionforge Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-06 11:52:49 UTC (rev 9615) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2015-03-06 12:56:54 UTC (rev 9616) @@ -551,10 +551,10 @@ $orderby = 'ORDER BY ' . $orderby; if ($exclude_from) // array of pagenames - $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from); + $exclude_from = " AND substring(p.pagename from $p) NOT IN " . $this->_sql_set($exclude_from); if ($exclude) // array of pagenames - $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude); - $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename" + $exclude = " AND substring(p.pagename from $p) NOT IN " . $this->_sql_set($exclude); + $sql = "SELECT substring(pp.pagename from $p) AS wantedfrom, substring(p.pagename from $p) AS pagename" . " FROM $page_tbl AS p, $link_tbl AS linked" . " LEFT JOIN $page_tbl AS pp ON linked.linkto = pp.id" . " LEFT JOIN $nonempty_tbl AS ne ON linked.linkto = ne.id" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-06-24 19:27:57
|
Revision: 10326 http://sourceforge.net/p/phpwiki/code/10326 Author: vargenau Date: 2021-06-24 19:27:56 +0000 (Thu, 24 Jun 2021) Log Message: ----------- PearDB_ffpgsql.php: remove undefined variable $options Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2021-06-24 17:14:05 UTC (rev 10325) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2021-06-24 19:27:56 UTC (rev 10326) @@ -417,7 +417,7 @@ } else { $result = $dbh->query($sql); } - return new WikiDB_backend_PearDB_iter($this, $result, $options); + return new WikiDB_backend_PearDB_iter($this, $result); } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |