From ed22563850cf21f664fa3398f145bb39698ca10e Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Fri, 26 Aug 2011 18:00:16 +0000
Subject: Slash XML bloat with parameters and remove a pointless

---
 gentoobrowse/console/changelogs.xml        | 12 +++++------
 gentoobrowse/console/fileimport.xml        | 16 +++++++--------
 gentoobrowse/console/packagelicenses.xml   |  4 ++--
 gentoobrowse/console/use.local.xml         | 32 ++++++++++++++----------------
 gentoobrowse/emails/newpackageversions.xml |  2 +-
 gentoobrowse/emails/welcome.xml            |  2 +-
 gentoobrowse/present/accountTracked.xml    |  2 +-
 gentoobrowse/present/atom.xml              |  2 +-
 gentoobrowse/present/category.xml          |  2 +-
 gentoobrowse/present/herd.xml              |  2 +-
 gentoobrowse/present/index.xml             |  6 +++---
 gentoobrowse/present/package.xml           | 30 ++++++++++++++--------------
 gentoobrowse/present/search.xml            |  4 ++--
 gentoobrowse/request/doconfirm.xml         |  2 +-
 gentoobrowse/request/dologin.xml           |  2 +-
 15 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/gentoobrowse/console/changelogs.xml b/gentoobrowse/console/changelogs.xml
index e0bba34..3ed1f50 100644
--- a/gentoobrowse/console/changelogs.xml
+++ b/gentoobrowse/console/changelogs.xml
@@ -50,12 +50,12 @@
 						</project2:regexcheck>
 						<project2:sqlmergeinsert>
 							<parameters>
-								<param name="packageid"><value source="parent" name="packageid" depth="3" /></param>
-								<param name="date"><value source="parent" name="date" depth="1" /></param>
-								<param name="n"><value source="parent" attribute="rownum" depth="1" /></param>
-								<param name="person"><value source="parent" name="person" depth="1" /></param>
-								<param name="email"><value source="parent" name="email" depth="1" /></param>
-								<param name="comment"><value source="parent" name="comment" depth="1" /></param>
+								<packageid source="parent" name="packageid" depth="3" />
+								<date source="parent" name="date" depth="1" />
+								<n source="parent" attribute="rownum" depth="1" />
+								<person source="parent" name="person" depth="1" />
+								<email source="parent" name="email" depth="1" />
+								<comment source="parent" name="comment" depth="1" />
 							</parameters>
 						</project2:sqlmergeinsert>
 					</project2:if>
diff --git a/gentoobrowse/console/fileimport.xml b/gentoobrowse/console/fileimport.xml
index 2018361..19585cd 100644
--- a/gentoobrowse/console/fileimport.xml
+++ b/gentoobrowse/console/fileimport.xml
@@ -14,14 +14,14 @@
 		<project2:iterate name="eachFileType" source="fileTypes">
 			<project2:iterate name="eachCacheFile" source="findCacheFiles">
 				<parameters>
-					<param name="root"><value source="parent" name="searchroot" depth="1" /></param>
-					<param name="spec"><value source="parent" name="searchspec" depth="1" /></param>
+					<root source="parent" name="searchroot" depth="1" />
+					<spec source="parent" name="searchspec" depth="1" />
 				</parameters>
 				<project2:sqlmergeinsert name="insertFile">
 					<parameters>
-						<param name="filename"><value source="parent" attribute="relPath" depth="1" /></param>
-						<param name="moddate"><value source="parent" attribute="modifiedDate" depth="1"/></param>
-						<param name="filetypeid"><value source="parent" name="filetypeid" depth="2" /></param>
+						<filename source="parent" attribute="relPath" depth="1" />
+						<moddate source="parent" attribute="modifiedDate" depth="1"/>
+						<filetypeid source="parent" name="filetypeid" depth="2" />
 					</parameters>
 				</project2:sqlmergeinsert>
 			</project2:iterate>
@@ -56,9 +56,9 @@
 			<project2:iterate name="eachFileContent" source="readFileContent">
 				<project2:sqlmergeinsert name="insertFile">
 					<parameters>
-						<param name="fileid"><value source="parent" name="fileid" depth="2" /></param>
-						<param name="line"><value source="parent" attribute="rownum" depth="1" /></param>
-						<param name="content"><value source="parent" name="content" depth="1" /></param>
+						<fileid source="parent" name="fileid" depth="2" />
+						<line source="parent" attribute="rownum" depth="1" />
+						<content source="parent" name="content" depth="1" />
 					</parameters>
 				</project2:sqlmergeinsert>
 			</project2:iterate>
diff --git a/gentoobrowse/console/packagelicenses.xml b/gentoobrowse/console/packagelicenses.xml
index 236a031..22cbaf8 100644
--- a/gentoobrowse/console/packagelicenses.xml
+++ b/gentoobrowse/console/packagelicenses.xml
@@ -23,8 +23,8 @@
 			<project2:iterate name="show" source="lic">
 				<project2:sqlmergeinsert>
 					<parameters>
-						<param name="name"><value source="parent" name="filename" depth="2" /></param>
-						<param name="legalbumph"><value source="parent" name="text" depth="1" /></param>
+						<name source="parent" name="filename" depth="2" />
+						<legalbumph source="parent" name="text" depth="1" />
 					</parameters>
 				</project2:sqlmergeinsert>
 			</project2:iterate>
diff --git a/gentoobrowse/console/use.local.xml b/gentoobrowse/console/use.local.xml
index 034c4c7..97141d0 100644
--- a/gentoobrowse/console/use.local.xml
+++ b/gentoobrowse/console/use.local.xml
@@ -21,23 +21,21 @@
 			<project2:iterate name="flags" source="cla">
 				<project2:sqlmergeinsert name="insertFile">
 					<parameters>
-						<param name="packageid">
-							<value source="lookup" name="packageid">
-								<project2:sqlrows name="packagelist" datasource="postgres">
-									<sql>
-										SELECT p.packageid, c.name AS category, p.name AS package
-										FROM packages p, categories c
-										WHERE p.categoryid = c.categoryid
-									</sql>
-								</project2:sqlrows>
-								<parameters>
-									<param name="package"><value source="parent" name="package" depth="1"/></param>
-									<param name="category"><value source="parent" name="category" depth="1"/></param>
-								</parameters>
-							</value>
-						</param>
-						<param name="use"><value source="parent" name="use" depth="1"/></param>
-						<param name="description"><value source="parent" name="description" depth="1" /></param>
+						<packageid source="lookup" name="packageid">
+							<project2:sqlrows name="packagelist" datasource="postgres">
+								<sql>
+									SELECT p.packageid, c.name AS category, p.name AS package
+									FROM packages p, categories c
+									WHERE p.categoryid = c.categoryid
+								</sql>
+							</project2:sqlrows>
+							<parameters>
+								<package source="parent" name="package" depth="1"/>
+								<category source="parent" name="category" depth="1"/>
+							</parameters>
+						</packageid>
+						<use source="parent" name="use" depth="1"/>
+						<description source="parent" name="description" depth="1" />
 					</parameters>
 				</project2:sqlmergeinsert>
 			</project2:iterate>
diff --git a/gentoobrowse/emails/newpackageversions.xml b/gentoobrowse/emails/newpackageversions.xml
index 2e567b0..f187632 100644
--- a/gentoobrowse/emails/newpackageversions.xml
+++ b/gentoobrowse/emails/newpackageversions.xml
@@ -20,7 +20,7 @@
 	</project2:sqlrows>
 	<project2:view name="newpackageversionsforuser" source="newpackageversions" rootname="newpackageversions" recordname="version">
 		<parameters>
-			<param name="userid"><value source="parent" name="userid" depth="2" /></param>
+			<userid source="parent" name="userid" depth="2" />
 		</parameters>
 	</project2:view>
 </view>
diff --git a/gentoobrowse/emails/welcome.xml b/gentoobrowse/emails/welcome.xml
index 277ea90..e245a34 100644
--- a/gentoobrowse/emails/welcome.xml
+++ b/gentoobrowse/emails/welcome.xml
@@ -11,7 +11,7 @@
 	</project2:sqlrows>
 	<project2:view name="verifyguids" source="verifyguidsbyemail" rootname="verifyguids" recordname="verifyguid">
 		<parameters>
-			<param name="email"><value source="param" name="email" /></param>
+			<email source="param" name="email" />
 		</parameters>
 	</project2:view>
 </view>
diff --git a/gentoobrowse/present/accountTracked.xml b/gentoobrowse/present/accountTracked.xml
index 8a01b7b..e48f73c 100644
--- a/gentoobrowse/present/accountTracked.xml
+++ b/gentoobrowse/present/accountTracked.xml
@@ -6,7 +6,7 @@
 	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="trackedPackages" source="trackedPackages" rootname="trackedebuilds" recordname="ebuild" filter="userid">
 		<parameters>
-			<param name="userid"><value source="session" name="loggedInUserID" /></param>
+			<userid source="session" name="loggedInUserID" />
 		</parameters>
 	</project2:view>
 </view>
diff --git a/gentoobrowse/present/atom.xml b/gentoobrowse/present/atom.xml
index 252a0bc..fcb4fea 100644
--- a/gentoobrowse/present/atom.xml
+++ b/gentoobrowse/present/atom.xml
@@ -4,7 +4,7 @@
 	<xi:include href="../views/newebuildsatom.xml" />
 	<project2:view name="atomebuilds" source="newebuilds" rootname="newebuilds" recordname="ebuild">
 		<parameters>
-			<param name="username"><value source="uri" index="1" /></param>
+			<username source="uri" index="1" />
 		</parameters>
 	</project2:view>
 </view>
diff --git a/gentoobrowse/present/category.xml b/gentoobrowse/present/category.xml
index a7cbb84..c3ba0de 100644
--- a/gentoobrowse/present/category.xml
+++ b/gentoobrowse/present/category.xml
@@ -5,7 +5,7 @@
 	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="categoryPackages" source="categoryPackages" rootname="packages" recordname="package" filter="byCatName">
 		<parameters>
-			<param name="catname"><value source="uri" index="1" /></param>
+			<catname source="uri" index="1" />
 		</parameters>
 	</project2:view>
 </view>
diff --git a/gentoobrowse/present/herd.xml b/gentoobrowse/present/herd.xml
index 8f38249..d53bb88 100644
--- a/gentoobrowse/present/herd.xml
+++ b/gentoobrowse/present/herd.xml
@@ -5,7 +5,7 @@
 	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="packagesInHerd" source="packagesInHerd" rootname="packages" recordname="package" filter="byHerd">
 		<parameters>
-			<param name="herd"><value source="uri" index="1" /></param>
+			<herd source="uri" index="1" />
 		</parameters>
 	</project2:view>
 </view>
diff --git a/gentoobrowse/present/index.xml b/gentoobrowse/present/index.xml
index 054590f..f040d4b 100644
--- a/gentoobrowse/present/index.xml
+++ b/gentoobrowse/present/index.xml
@@ -5,13 +5,13 @@
 	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="newebuilds" source="newebuilds" rootname="newebuilds" recordname="ebuild" filter="syncCount">
 		<parameters>
-			<param name="count" value="3" />
-			<param name="userID"><value source="session" name="loggedInUserID"><default value="0" type="int" /></value></param>
+			<count value="3" />
+			<userID source="session" name="loggedInUserID"><default value="0" type="int" /></userID>
 		</parameters>
 	</project2:view>
 	<project2:view name="syncs" source="syncs" rootname="syncs" recordname="sync" filter="syncCount">
 		<parameters>
-			<param name="count" value="3" />
+			<count value="3" />
 		</parameters>
 	</project2:view>
 </view>
diff --git a/gentoobrowse/present/package.xml b/gentoobrowse/present/package.xml
index 1379663..62d4226 100644
--- a/gentoobrowse/present/package.xml
+++ b/gentoobrowse/present/package.xml
@@ -5,68 +5,68 @@
 	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="package" source="packages" rootname="summary" recordname="package" filter="catAndName">
 		<parameters>
-			<param name="cat"><value source="uri" index="1" /></param>
-			<param name="pkg"><value source="uri" index="2" /></param>
+			<cat source="uri" index="1" />
+			<pkg source="uri" index="2" />
 		</parameters>
 		<project2:view name="tracked" source="tracks" rootname="tracks" recordname="track" filter="isPkgTrackedByUser">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
-				<param name="userid"><value source="session" name="loggedInUserID"><default value="0" type="int" /></value></param>
+				<pkgid source="parent" name="packageid" depth="1" />
+				<userid source="session" name="loggedInUserID"><default value="0" type="int" /></userid>
 			</parameters>
 		</project2:view>
 		<project2:view name="versions" source="versions" rootname="versions" recordname="version" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="urls" source="packageUrls" rootname="packageUrls" recordname="url" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="uses" source="versionUses" rootname="versionUses" recordname="use" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="archs" source="versionArchs" rootname="versionArchs" recordname="arch" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="bugs" source="packageBugs" rootname="packageBugs" recordname="bug" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="deps" source="packageDeps" rootname="deps" recordname="package" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="rdeps" source="packageRdeps" rootname="rdeps" recordname="package" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="depees" source="packageDepees" rootname="depees" recordname="package" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="maskStatus" source="maskStatus" rootname="maskstatus" recordname="mask" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="maskDetails" source="maskDetails" rootname="maskdetails" recordname="mask" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 		<project2:view name="changeLog" source="changeLog" rootname="changelog" recordname="entry" filter="pkg">
 			<parameters>
-				<param name="pkgid"><value source="parent" name="packageid" depth="1" /></param>
+				<pkgid source="parent" name="packageid" depth="1" />
 			</parameters>
 		</project2:view>
 	</project2:view>
diff --git a/gentoobrowse/present/search.xml b/gentoobrowse/present/search.xml
index cbac4d0..5a96f2a 100644
--- a/gentoobrowse/present/search.xml
+++ b/gentoobrowse/present/search.xml
@@ -21,7 +21,7 @@
 		</project2:regexcheck>
 		<project2:view name="searchResults" source="packageSearch" rootname="searchResults" recordname="package" filter="freeText">
 			<parameters>
-				<param name="criteria"><value source="param" name="criteria" default="" /></param>
+				<criteria source="param" name="criteria" default="" />
 			</parameters>
 		</project2:view>
 	</project2:if>
@@ -43,7 +43,7 @@
 		</project2:regexcheck>
 		<project2:view name="bugSearchResults" source="bugSearch" rootname="bugSearchResults" recordname="bug" filter="freeText">
 			<parameters>
-				<param name="criteria"><value source="param" name="bcriteria" default="" /></param>
+				<criteria source="param" name="bcriteria" default="" />
 			</parameters>
 		</project2:view>
 	</project2:if>
diff --git a/gentoobrowse/request/doconfirm.xml b/gentoobrowse/request/doconfirm.xml
index a811408..e71d396 100644
--- a/gentoobrowse/request/doconfirm.xml
+++ b/gentoobrowse/request/doconfirm.xml
@@ -12,7 +12,7 @@
 	</project2:sqlcheck>
 	<project2:iterate datasource="postgres-web" name="getUidFromDatabase" source="users" filter="verifyguid">
 		<parameters>
-			<param name="verifyguid"><value source="param" name="verifyguid" /></param>
+			<verifyguid source="param" name="verifyguid" />
 		</parameters>
 		<tasks>
 			<project2:sessionset key="loggedInUserID" name="setUidInSession" />
diff --git a/gentoobrowse/request/dologin.xml b/gentoobrowse/request/dologin.xml
index 34466eb..23d2c5e 100644
--- a/gentoobrowse/request/dologin.xml
+++ b/gentoobrowse/request/dologin.xml
@@ -30,7 +30,7 @@
 	</project2:sqlcheck>
 	<project2:iterate datasource="postgres-web" name="getUidFromDatabase" source="users" filter="username">
 		<parameters>
-			<param name="username"><value source="param" name="username" /></param>
+			<username source="param" name="username" />
 		</parameters>
 		<tasks>
 			<project2:sessionset key="loggedInUserID" name="setUidInSession">
-- 
cgit v1.2.3