[evolvis-commits] r18592: refresh patch against 1.19 (bring back $prefix in SearchPostgres), sync Vcs-*

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Sep 20 14:23:59 CEST 2012


Author: mirabilos
Date: 2012-09-20 14:23:58 +0200 (Thu, 20 Sep 2012)
New Revision: 18592

Modified:
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/control
   trunk/mediawiki/debian/patches/tarent.patch
Log:
refresh patch against 1.19 (bring back $prefix in SearchPostgres), sync Vcs-*

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-09-20 12:23:55 UTC (rev 18591)
+++ trunk/mediawiki/debian/changelog	2012-09-20 12:23:58 UTC (rev 18592)
@@ -1,4 +1,4 @@
-mediawiki (1:1.15.5-8tarent1) unstable; urgency=low
+mediawiki (1:1.19.2-1tarent1) unstable; urgency=low
 
   [ Thorsten Glaser ]
   * debian/patches/tarent.patch: new
@@ -10,7 +10,7 @@
   [ Roland Mas ]
   * debian/patches/tarent.patch: add workaround for search bug
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 15 Mar 2012 13:07:59 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 20 Sep 2012 14:20:52 +0200
 
 mediawiki (1:1.19.2-1) unstable; urgency=low
 

Modified: trunk/mediawiki/debian/control
===================================================================
--- trunk/mediawiki/debian/control	2012-09-20 12:23:55 UTC (rev 18591)
+++ trunk/mediawiki/debian/control	2012-09-20 12:23:58 UTC (rev 18592)
@@ -8,8 +8,9 @@
  ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
 Homepage: http://www.mediawiki.org/
 Standards-Version: 3.9.3
-Vcs-SVN: svn://svn.debian.org/svn/pkg-mediawiki/mediawiki/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-mediawiki/mediawiki/trunk/
+# push mirror of bzr branch on tglase.lan.tarent.de
+Vcs-SVN: svn://evolvis.org/scmrepos/svn/evolvis/trunk/mediawiki
+Vcs-Browser: https://evolvis.org/scm/viewvc.php/trunk/mediawiki/?root=evolvis
 
 Package: mediawiki
 Architecture: all

Modified: trunk/mediawiki/debian/patches/tarent.patch
===================================================================
--- trunk/mediawiki/debian/patches/tarent.patch	2012-09-20 12:23:55 UTC (rev 18591)
+++ trunk/mediawiki/debian/patches/tarent.patch	2012-09-20 12:23:58 UTC (rev 18592)
@@ -1,21 +1,17 @@
-Index: mediawiki-1.15.5/includes/DefaultSettings.php
-===================================================================
---- mediawiki-1.15.5.orig/includes/DefaultSettings.php	2012-01-13 13:20:46.000000000 +0100
-+++ mediawiki-1.15.5/includes/DefaultSettings.php	2012-01-13 13:21:12.000000000 +0100
-@@ -280,6 +280,8 @@
+--- a/includes/DefaultSettings.php
++++ b/includes/DefaultSettings.php
+@@ -2956,6 +2956,8 @@ $wgUrlProtocols = array(
+ 	'telnet://', // Well if we're going to support the above.. -ævar
+ 	'nntp://', // @bug 3808 RFC 1738
+ 	'worldwind://',
++	'webdavs://',
++	'file:',
  	'mailto:',
  	'news:',
  	'svn://',
-+	'webdavs://',
-+	'file:',
- );
- 
- /** internal name of virus scanner. This servers as a key to the $wgAntivirusSetup array.
-Index: mediawiki-1.15.5/includes/specials/SpecialAllpages.php
-===================================================================
---- mediawiki-1.15.5.orig/includes/specials/SpecialAllpages.php	2009-02-20 17:13:40.000000000 +0100
-+++ mediawiki-1.15.5/includes/specials/SpecialAllpages.php	2012-01-13 13:21:12.000000000 +0100
-@@ -9,12 +9,12 @@
+--- a/includes/specials/SpecialAllpages.php
++++ b/includes/specials/SpecialAllpages.php
+@@ -31,12 +31,12 @@ class SpecialAllpages extends Includable
  	/**
  	 * Maximum number of pages to show on single subpage.
  	 */
@@ -25,19 +21,17 @@
  	/**
  	 * Maximum number of pages to show on single index subpage.
  	 */
--	protected $maxLineCount = 200;
+-	protected $maxLineCount = 100;
 +	protected $maxLineCount = 30000;
  
  	/**
  	 * Maximum number of chars to show for an entry.
-Index: mediawiki-1.15.5/includes/SearchPostgres.php
-===================================================================
---- mediawiki-1.15.5.orig/includes/SearchPostgres.php	2009-01-13 21:28:54.000000000 +0100
-+++ mediawiki-1.15.5/includes/SearchPostgres.php	2012-01-13 13:21:12.000000000 +0100
-@@ -143,6 +143,12 @@
- 		}
- 		$prefix = $wgDBversion < 8.3 ? "'default'," : '';
- 
+--- a/includes/search/SearchPostgres.php
++++ b/includes/search/SearchPostgres.php
+@@ -148,11 +148,17 @@ class SearchPostgres extends SearchEngin
+ 	 * @param $colname
+ 	 */
+ 	function searchQuery( $term, $fulltext, $colname ) {
 +		/*-
 +		 * tarent workaround / bugfix for
 +		 * https://evolvis.org/tracker/t_follow.php/1031
@@ -47,3 +41,21 @@
  		# Get the SQL fragment for the given term
  		$searchstring = $this->parseQuery( $term );
  
+ 		## We need a separate query here so gin does not complain about empty searches
+-		$SQL = "SELECT to_tsquery($searchstring)";
++		$SQL = "SELECT to_tsquery($prefix $searchstring)";
+ 		$res = $this->db->query($SQL);
+ 		if (!$res) {
+ 			## TODO: Better output (example to catch: one 'two)
+@@ -175,9 +181,9 @@ class SearchPostgres extends SearchEngin
+ 			}
+ 
+ 			$query = "SELECT page_id, page_namespace, page_title, ".
+-			"ts_rank($fulltext, to_tsquery($searchstring), 5) AS score ".
++			"ts_rank($fulltext, to_tsquery($prefix $searchstring), 5) AS score ".
+ 			"FROM page p, revision r, pagecontent c WHERE p.page_latest = r.rev_id " .
+-			"AND r.rev_text_id = c.old_id AND $fulltext @@ to_tsquery($searchstring)";
++			"AND r.rev_text_id = c.old_id AND $fulltext @@ to_tsquery($prefix $searchstring)";
+ 		}
+ 
+ 		## Redirects



More information about the evolvis-commits mailing list