[gentoo-commits] dev/fordfrog:master commit in: dev-db/pgfouine/files/, dev-db/pgfouine/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     bfd0a86831c87ed7780609e494b1408eb0ea049c
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 21:07:48 2011 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 21:07:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=bfd0a868

dev-db/pgfouine: added support for parsing cvslog format of PostgreSQL version 9.0 and above

---
 dev-db/pgfouine/ChangeLog                          |    8 ++++++++
 dev-db/pgfouine/files/support-9.0-csvlog.patch     |   13 +++++++++++++
 ...fouine-1.2-r1.ebuild => pgfouine-1.2-r2.ebuild} |    4 ++++
 3 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/dev-db/pgfouine/ChangeLog b/dev-db/pgfouine/ChangeLog
index fc353a0..a1f0288 100644
--- a/dev-db/pgfouine/ChangeLog
+++ b/dev-db/pgfouine/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pgfouine-1.2-r2 (22 Oct 2011)
+
+  22 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> -pgfouine-1.2-r1.ebuild,
+  +pgfouine-1.2-r2.ebuild, +files/support-9.0-csvlog.patch:
+  Added patch from Matt Saunders
+  (http://pgfoundry.org/forum/forum.php?thread_id=2948&forum_id=555) which
+  enables to parse cvslog log files from PostgreSQL version 9.0 and above
+
 *pgfouine-1.2-r1 (30 Jun 2011)
 
   30 Jun 2011; Miroslav Šulc <fordfrog@gentoo.org> -pgfouine-1.2.ebuild,

diff --git a/dev-db/pgfouine/files/support-9.0-csvlog.patch b/dev-db/pgfouine/files/support-9.0-csvlog.patch
new file mode 100644
index 0000000..70538ee
--- /dev/null
+++ b/dev-db/pgfouine/files/support-9.0-csvlog.patch
@@ -0,0 +1,13 @@
+diff --git a/include/CsvlogLogReader.class.php b/include/CsvlogLogReader.class.php
+index cbd18df..e4a5744 100644
+--- a/include/CsvlogLogReader.class.php
++++ b/include/CsvlogLogReader.class.php
+@@ -32,7 +32,7 @@ class CsvlogLogReader extends GenericLogReader {
+ 		while ($csvLine = fgetcsv($filePointer)) {
+ 			$lineParsedCounter ++;
+ 			
+-			if(count($csvLine) == 22) {
++			if(count($csvLine) == 22 || (count($csvLine) == 23) {
+ 				$lines =& $lineParser->parse($csvLine);
+ 				
+ 				if($lines) {

diff --git a/dev-db/pgfouine/pgfouine-1.2-r1.ebuild b/dev-db/pgfouine/pgfouine-1.2-r2.ebuild
similarity index 83%
rename from dev-db/pgfouine/pgfouine-1.2-r1.ebuild
rename to dev-db/pgfouine/pgfouine-1.2-r2.ebuild
index 2ccb529..362c222 100644
--- a/dev-db/pgfouine/pgfouine-1.2-r1.ebuild
+++ b/dev-db/pgfouine/pgfouine-1.2-r2.ebuild
@@ -25,6 +25,10 @@ src_prepare() {
 	# some logs may contain hints even for non-error log lines
 	# this patch disables adding hints to log objects that do not have appendHint() method
 	epatch ${FILESDIR}/disable-hints-for-non-errors.patch
+	# PostgreSQL version 9.0 added extra field to csvlog but pgFouine ignores such lines
+	# as they have 23 columns and not 22
+	# Patch by Matt Saunders: http://pgfoundry.org/forum/forum.php?thread_id=2948&forum_id=555
+	epatch ${FILESDIR}/support-9.0-csvlog.patch
 }
 
 src_configure() {