From d1440d08f70e1bc022a0ed18d6e9cb85245bf469 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Tue, 3 Jan 2012 23:14:18 +0000
Subject: Fixes for recents changes

---
 gentoobrowse/.p2config                   | 2 --
 gentoobrowse/console/changelogs.xml      | 6 +++---
 gentoobrowse/console/packagelicenses.xml | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gentoobrowse/.p2config b/gentoobrowse/.p2config
index 0bb6084..333a0a9 100644
--- a/gentoobrowse/.p2config
+++ b/gentoobrowse/.p2config
@@ -1,5 +1,3 @@
-[common]
-consolelogLevel = 9
 [cgi]
 sessionModule = couchsession
 errorContentType=text/xml-xslt
diff --git a/gentoobrowse/console/changelogs.xml b/gentoobrowse/console/changelogs.xml
index 4d15568..d5aebc0 100644
--- a/gentoobrowse/console/changelogs.xml
+++ b/gentoobrowse/console/changelogs.xml
@@ -13,7 +13,7 @@
 			AND c.categoryid = p.categoryid
 		</sql>
 	</project2:sqlrows>
-	<project2:filerows name="logcontent" encoding="utf-8" newline="" fieldSep="">
+	<project2:filerows name="logcontent" encoding="utf-8" newline="" fieldSep="" quoteChar="">
 		<path source="parent" name="path" depth="1" />
 		<columns>
 			<text />
@@ -44,14 +44,14 @@
 			<project2:iterate name="seelog" source="logcontent">
 				<project2:iterate name="seeentries" source="logentries">
 					<project2:if>
-						<project2:and>
+						<project2:all>
 							<project2:validdatetest format="%d %b %Y">
 								<apply-to source="parent" name="date" depth="1" warn="no" />
 							</project2:validdatetest>
 							<project2:regextest regex=".+@.+">
 								<apply-to source="parent" name="email" depth="1" />
 							</project2:regextest>
-						</project2:and>
+						</project2:all>
 						<project2:sqlmergeinsert>
 							<parameters>
 								<packageid source="parent" name="packageid" depth="3" />
diff --git a/gentoobrowse/console/packagelicenses.xml b/gentoobrowse/console/packagelicenses.xml
index 1ed5897..5cf05e1 100644
--- a/gentoobrowse/console/packagelicenses.xml
+++ b/gentoobrowse/console/packagelicenses.xml
@@ -11,7 +11,7 @@
 			AND ft.filetypeid = 7
 		</sql>
 	</project2:sqlrows>
-	<project2:filerows name="lic" encoding="iso-8859-1">
+	<project2:filerows name="lic" encoding="iso-8859-1" newline="" fieldSep="" quoteChar="">
 		<path source="parent" name="path" depth="1" />
 		<columns>
 			<text />
-- 
cgit v1.2.3