From a1f36c0da633d29da0d490131c1d13f5dc7fa784 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Mon, 8 Aug 2011 18:14:59 +0000
Subject: Fix target table name Fix rowset name Fix metadata SQL Use PG pipe,
 not socket

---
 gentoobrowse/console/changelogs.xml      | 2 +-
 gentoobrowse/console/packagemetadata.xml | 2 +-
 gentoobrowse/console/use.global.xml      | 8 ++++----
 gentoobrowse/datasources/postgres.xml    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gentoobrowse/console/changelogs.xml b/gentoobrowse/console/changelogs.xml
index 11235c4..51781c5 100644
--- a/gentoobrowse/console/changelogs.xml
+++ b/gentoobrowse/console/changelogs.xml
@@ -27,7 +27,7 @@
 			<column>comment</column>
 		</columns>
 	</project2:regexrows>
-	<project2:sqlmerge name="changelogs" datasource="postgres" targettable="newchangelogs">
+	<project2:sqlmerge name="changelogs" datasource="postgres" targettable="package_changelogs">
 		<updatewhere>
 			a.packageid IN (
 					SELECT p.packageid
diff --git a/gentoobrowse/console/packagemetadata.xml b/gentoobrowse/console/packagemetadata.xml
index 1f89694..9c00963 100644
--- a/gentoobrowse/console/packagemetadata.xml
+++ b/gentoobrowse/console/packagemetadata.xml
@@ -5,7 +5,7 @@
 		<sql>
 			SELECT p.packageid, 'file://' || ft.searchroot || f.filename AS path, f.moddate
 			FROM packages p, categories c, files f, filetypes ft
-			WHERE (p.metadatadate IS NULL OR p.metadatadate != f.moddate)
+			WHERE (f.cachedat IS NULL OR f.cachedat != f.moddate)
 			AND p.categoryid = c.categoryid
 			AND f.filename = c.name || '/' || p.name || '/metadata.xml'
 			AND f.filetypeid = ft.filetypeid
diff --git a/gentoobrowse/console/use.global.xml b/gentoobrowse/console/use.global.xml
index 9fafbfe..69fb1d2 100644
--- a/gentoobrowse/console/use.global.xml
+++ b/gentoobrowse/console/use.global.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <test name="test" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
-	<project2:filerows name="cl" newline="&#10;" encoding="utf-8" fieldSep="" quoteChar="" path="/usr/portage/profiles/use.desc">
+	<project2:filerows name="gcl" newline="&#10;" encoding="utf-8" fieldSep="" quoteChar="" path="/usr/portage/profiles/use.desc">
 		<columns>
 			<column>text</column>
 		</columns>
 	</project2:filerows>
-	<project2:regexrows name="cla">
+	<project2:regexrows name="gcla">
 		<sourceText source="parent" name="text" depth="1" />
 		<regex>([^ ]+) - (.+)</regex>
 		<columns>
@@ -15,8 +15,8 @@
 		</columns>
 	</project2:regexrows>
 	<project2:sqlmerge name="mergeguse" datasource="postgres" targettable="use_global">
-		<project2:iterate name="lines" source="cl">
-			<project2:iterate name="flags" source="cla" />
+		<project2:iterate name="lines" source="gcl">
+			<project2:iterate name="flags" source="gcla" />
 		</project2:iterate>
 		<columns>
 			<column key="true">use</column>
diff --git a/gentoobrowse/datasources/postgres.xml b/gentoobrowse/datasources/postgres.xml
index 9bece3e..8a2c975 100644
--- a/gentoobrowse/datasources/postgres.xml
+++ b/gentoobrowse/datasources/postgres.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project2:rdbmsdatasource xmlns:project2="http://project2.randomdan.homeip.net" name="postgres">
 	<readonly preferlocal="true">
-		<dsn host="firebrand"><postgresql>host=localhost sslmode=disable user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></dsn>
+		<dsn host="firebrand"><postgresql>sslmode=disable user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></dsn>
 	</readonly>
-	<masterdsn><postgresql>host=localhost sslmode=disable user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></masterdsn>
+	<masterdsn><postgresql>sslmode=disable user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></masterdsn>
 </project2:rdbmsdatasource>
-- 
cgit v1.2.3