From 6cea9626ec371719fb0075a4777add51a6763bfb Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Tue, 25 Oct 2011 19:41:26 +0000
Subject: Finally sort the stupid names problem in the XML lib and remove
 xmlMemCache for flawed from day one

---
 gentoobrowse/console/bug.urls             |  3 ---
 gentoobrowse/console/bugimport.xml        | 11 +++++++++--
 gentoobrowse/console/categorymetadata.xml |  4 ++--
 gentoobrowse/console/packagemetadata.xml  |  4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/gentoobrowse/console/bug.urls b/gentoobrowse/console/bug.urls
index 1dd0f79..0209f97 100644
--- a/gentoobrowse/console/bug.urls
+++ b/gentoobrowse/console/bug.urls
@@ -1,6 +1,3 @@
 http://bugs.gentoo.org/data/cached/buglist-UNCONFIRMED.htmlgz
-http://bugs.gentoo.org/data/cached/buglist-ASSIGNED.htmlgz
-http://bugs.gentoo.org/data/cached/buglist-REOPENED.htmlgz
 http://bugs.gentoo.org/data/cached/buglist-CONFIRMED.htmlgz
 http://bugs.gentoo.org/data/cached/buglist-IN_PROGRESS.htmlgz
-http://bugs.gentoo.org/data/cached/buglist-NEW.htmlgz
diff --git a/gentoobrowse/console/bugimport.xml b/gentoobrowse/console/bugimport.xml
index d2bb801..1408e53 100644
--- a/gentoobrowse/console/bugimport.xml
+++ b/gentoobrowse/console/bugimport.xml
@@ -6,7 +6,7 @@
 			<column>url</column>
 		</columns>
 	</project2:filerows>
-	<project2:xslrows name="buglist" html="true" warnings="false" timeout="60000">
+	<project2:xpathrows name="buglist" html="true" warnings="false" timeout="60000">
 		<proxy value="cache.random.lan:8080" />
 		<url source="parent" name="url" depth="1" />
 		<filterview name="bugdetails" root="/html/body/div/ul/li/a">
@@ -15,7 +15,14 @@
 			<field name="status" xpath="substring-before(substring-after(.,'status:'),' ')" />
 			<field name="severity" xpath="substring-after(.,'severity:')" />
 		</filterview>
-	</project2:xslrows>
+	</project2:xpathrows>
+
+	<project2:iterate name="eachurl" source="bugurls">
+		<project2:xmldocumentprefetch name="eachbug" html="true" warnings="false" timeout="60000">
+			<proxy value="cache.random.lan:8080" />
+			<url source="parent" name="url" depth="1" />
+		</project2:xmldocumentprefetch>
+	</project2:iterate>
 
 	<project2:sqlmerge name="bugimport" datasource="postgres" targettable="bugs">
 		<project2:iterate name="eachurl" source="bugurls">
diff --git a/gentoobrowse/console/categorymetadata.xml b/gentoobrowse/console/categorymetadata.xml
index 564a003..7e1159f 100644
--- a/gentoobrowse/console/categorymetadata.xml
+++ b/gentoobrowse/console/categorymetadata.xml
@@ -11,12 +11,12 @@
 			AND ft.filetypeid = 4
 		</sql>
 	</project2:sqlrows>
-	<project2:xslrows name="cat" html="false" warnings="true">
+	<project2:xpathrows name="cat" html="false" warnings="true">
 		<url source="parent" name="path" depth="1" />
 		<filterview name="catmetadata" root="/catmetadata">
 			<field name="longdesc" xpath="longdescription[@lang='en']" />
 		</filterview>
-	</project2:xslrows>
+	</project2:xpathrows>
 	<project2:iterate name="eachcat" source="catblanksummaries">
 		<project2:iterate name="catdetail" source="cat" filter="catmetadata">
 			<project2:sqltask name="update" datasource="postgres">
diff --git a/gentoobrowse/console/packagemetadata.xml b/gentoobrowse/console/packagemetadata.xml
index f9bbd6c..abcb209 100644
--- a/gentoobrowse/console/packagemetadata.xml
+++ b/gentoobrowse/console/packagemetadata.xml
@@ -12,14 +12,14 @@
 			AND ft.filetypeid = 4
 		</sql>
 	</project2:sqlrows>
-	<project2:xslrows name="pkg" html="false" warnings="true">
+	<project2:xpathrows name="pkg" html="false" warnings="true">
 		<url source="parent" name="path" depth="1" />
 		<filterview name="pkgmetadata" root="/pkgmetadata">
 			<field name="longdesc" xpath="longdescription" />
 			<field name="maintainer" xpath="maintainer/email" />
 			<field name="herd" xpath="herd" />
 		</filterview>
-	</project2:xslrows>
+	</project2:xpathrows>
 	<project2:iterate name="eachpkg" source="pkgblanksummaries">
 		<project2:iterate name="pkgdetail" source="pkg" filter="pkgmetadata">
 			<project2:sqltask name="update" datasource="postgres">
-- 
cgit v1.2.3