From 8d9f077c96ba238db69cbaa16a13352e9961ee75 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 7 Aug 2015 21:21:10 +0100
Subject: Replace license import

---
 gentoobrowse/console/packagelicenses.xml | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/gentoobrowse/console/packagelicenses.xml b/gentoobrowse/console/packagelicenses.xml
index 7a8133d..80777a7 100644
--- a/gentoobrowse/console/packagelicenses.xml
+++ b/gentoobrowse/console/packagelicenses.xml
@@ -1,36 +1,15 @@
 <?xml version="1.0"?>
 <homepages name="bugimport" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
-	<project2:sqlrows name="updatedlicenses" datasource="postgres">
+	<project2:sqlmerge name="update" datasource="postgres" targettable="license">
+		<updatewhere>a.name IN (SELECT o.pathparts[2] FROM files o WHERE o.cachedat IS NULL OR o.cachedat != o.moddate)</updatewhere>
 		<sql>
-			SELECT f.filename, ft.searchroot || f.filename AS path
-			FROM files f, filetypes ft
+			SELECT f.pathparts[2] AS name, PG_READ_FILE(f.filename) legalbumph
+			FROM files f
 			WHERE (f.cachedat IS NULL OR f.cachedat != f.moddate)
-			AND f.filetypeid = ft.filetypeid
 			AND filename NOT LIKE '%.pdf'
-			AND ft.filetypeid = 7
+			AND f.filetypeid = 7
 		</sql>
-	</project2:sqlrows>
-	<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: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">
-			<project2:iterate name="show" source="lic">
-				<project2:sqlmergeinsert>
-					<parameters>
-						<name source="parent" name="filename" depth="2" />
-						<legalbumph source="parent" name="text" depth="1" />
-					</parameters>
-				</project2:sqlmergeinsert>
-			</project2:iterate>
-		</project2:iterate>
 		<columns>
 			<name key="true" />
 			<legalbumph />
-- 
cgit v1.2.3