Switch to the new stream style of things

7 files changed, 27 insertions, 17 deletions

diff --git a/gentoobrowse/console/bugimport.xml b/gentoobrowse/console/bugimport.xml
index 3e9c5f4..412be83 100644
--- a/gentoobrowse/console/bugimport.xml
+++ b/gentoobrowse/console/bugimport.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <bugimport name="bugimport" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
-	<project2:filerows name="bugurls" newline="&#10;" encoding="ascii" fieldSep="" quoteChar="" path="console/bug.urls">
+	<project2:streamrows name="bugurls" newline="&#10;" encoding="ascii" fieldSep="" quoteChar="">
+		<project2:filestream path="console/bug.urls" />
 		<columns>
 			<url />
 		</columns>
-	</project2:filerows>
+	</project2:streamrows>
 	<project2:xpathrows name="buglist" html="true" warnings="false" timeout="60000">
 		<proxy value="cache.random.lan:8080" />
 		<url source="parent" name="url" depth="1" />
diff --git a/gentoobrowse/console/changelogs.xml b/gentoobrowse/console/changelogs.xml
index d5aebc0..6622a1c 100644
--- a/gentoobrowse/console/changelogs.xml
+++ b/gentoobrowse/console/changelogs.xml
@@ -13,12 +13,14 @@
 			AND c.categoryid = p.categoryid
 		</sql>
 	</project2:sqlrows>
-	<project2:filerows name="logcontent" encoding="utf-8" newline="" fieldSep="" quoteChar="">
-		<path source="parent" name="path" depth="1" />
+	<project2:streamrows name="logcontent" encoding="utf-8" newline="" fieldSep="" quoteChar="">
+		<project2:filestream>
+			<path source="parent" name="path" depth="1" />
+		</project2:filestream>
 		<columns>
 			<text />
 		</columns>
-	</project2:filerows>
+	</project2:streamrows>
 	<project2:regexrows name="logentries">
 		<sourceText source="parent" name="text" depth="1" />
 		<regex>(\d+ *(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\w* \d+); *([^&lt;]+)? *&lt;([^ &gt;]+)[&gt;\s]\s*(?:[^:]*:)?\s*(.*?)(?:\R\*|\s*$|\R\R)</regex>
diff --git a/gentoobrowse/console/fileimport.xml b/gentoobrowse/console/fileimport.xml
index 6c947dc..236777b 100644
--- a/gentoobrowse/console/fileimport.xml
+++ b/gentoobrowse/console/fileimport.xml
@@ -46,12 +46,14 @@
 			ORDER BY f.fileid
 		</sql>
 	</project2:sqlrows>
-	<project2:filerows name="readFileContent" newline="&#10;" encoding="utf-8" fieldSep="" quoteChar="" keepBlankRows="false" countBlankRows="true">
-		<path source="parent" name="filename" depth="1" />
+	<project2:streamrows name="readFileContent" newline="&#10;" encoding="utf-8" fieldSep="" quoteChar="" keepBlankRows="false" countBlankRows="true">
+		<project2:filestream>
+			<path source="parent" name="filename" depth="1" />
+		</project2:filestream>
 		<columns>
 			<content />
 		</columns>
-	</project2:filerows>
+	</project2:streamrows>
 
 	<project2:sqlmerge name="loadCacheContent" datasource="postgres" targettable="filecache">
 		<updatewhere>a.fileid IN (SELECT o.fileid FROM files o WHERE o.cachedat IS NULL OR o.cachedat != o.moddate)</updatewhere>
diff --git a/gentoobrowse/console/packagelicenses.xml b/gentoobrowse/console/packagelicenses.xml
index 09a5dfe..7a8133d 100644
--- a/gentoobrowse/console/packagelicenses.xml
+++ b/gentoobrowse/console/packagelicenses.xml
@@ -11,12 +11,14 @@
 			AND ft.filetypeid = 7
 		</sql>
 	</project2:sqlrows>
-	<project2:filerows name="lic" encoding="iso-8859-1" newline="" fieldSep="" quoteChar="">
-		<path source="parent" name="path" depth="1" />
+	<project2:streamrows name="lic" encoding="iso-8859-1" newline="" fieldSep="" quoteChar="">
+		<project2:filestream>
+			<path source="parent" name="path" depth="1" />
+		</project2:filestream>
 		<columns>
 			<text />
 		</columns>
-	</project2:filerows>
+	</project2:streamrows>
 	<project2:sqlmerge name="update" datasource="postgres" targettable="license">
 		<updatewhere>a.name IN (SELECT o.filename FROM files o WHERE o.cachedat IS NULL OR o.cachedat != o.moddate)</updatewhere>
 		<project2:iterate name="show" source="updatedlicenses">
diff --git a/gentoobrowse/console/use.global.xml b/gentoobrowse/console/use.global.xml
index dc092bb..9139bcf 100644
--- a/gentoobrowse/console/use.global.xml
+++ b/gentoobrowse/console/use.global.xml
@@ -1,11 +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="gcl" newline="&#10;" encoding="utf-8" fieldSep="" quoteChar="" path="/usr/portage/profiles/use.desc">
+	<project2:streamrows name="gcl" newline="&#10;" encoding="utf-8" fieldSep="" quoteChar="">
+		<project2:filestream path="/usr/portage/profiles/use.desc" />
 		<columns>
 			<text />
 		</columns>
-	</project2:filerows>
+	</project2:streamrows>
 	<project2:regexrows name="gcla">
 		<sourceText source="parent" name="text" depth="1" />
 		<regex>([^ ]+) - (.+)</regex>
diff --git a/gentoobrowse/console/use.local.xml b/gentoobrowse/console/use.local.xml
index e35e3ba..11b62e5 100644
--- a/gentoobrowse/console/use.local.xml
+++ b/gentoobrowse/console/use.local.xml
@@ -1,11 +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.local.desc">
+	<project2:streamrows name="cl" newline="&#10;" encoding="utf-8" fieldSep="" quoteChar="">
+		<project2:filerows path="/usr/portage/profiles/use.local.desc" />
 		<columns>
 			<text />
 		</columns>
-	</project2:filerows>
+	</project2:streamrows>
 	<project2:regexrows name="cla">
 		<sourceText source="parent" name="text" depth="1" />
 		<regex>([^/]+)/([^:]+):([^ ]+) - (.+)</regex>
diff --git a/gentoobrowse/views/poweredBy.xml b/gentoobrowse/views/poweredBy.xml
index 273b8a1..abec8a9 100644
--- a/gentoobrowse/views/poweredBy.xml
+++ b/gentoobrowse/views/poweredBy.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <block xmlns:project2="http://project2.randomdan.homeip.net">
-	<project2:filerows name="poweredBy" path="datasources/poweredBy.txt" fieldSep="|" newline="&#10;" encoding="ascii">
+	<project2:streamrows name="poweredBy" fieldSep="|" newline="&#10;" encoding="ascii">
+		<project2:filestream path="datasources/poweredBy.txt" />
 		<columns>
 			<name />
 			<url />
 		</columns>
-	</project2:filerows>
+	</project2:streamrows>
 	<project2:view name="viewPoweredBy" source="poweredBy" rootname="power" recordname="by" />
 </block>