diff options
| -rw-r--r-- | gentoobrowse/console/packagefileimport.xml | 8 | ||||
| -rw-r--r-- | gentoobrowse/console/packageimport.xml | 15 |
2 files changed, 9 insertions, 14 deletions
diff --git a/gentoobrowse/console/packagefileimport.xml b/gentoobrowse/console/packagefileimport.xml deleted file mode 100644 index 99cd60a..0000000 --- a/gentoobrowse/console/packagefileimport.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<packageimport name="bugassociate" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:project2="http://project2.randomdan.homeip.net"> - <xi:include href="../datasources/postgres.xml" /> - <xi:include href="fileimport.xml" /> - <xi:include href="packageimport.xml" /> - <xi:include href="packagemasks.xml" /> -</packageimport> diff --git a/gentoobrowse/console/packageimport.xml b/gentoobrowse/console/packageimport.xml index fbfb25b..8e281ef 100644 --- a/gentoobrowse/console/packageimport.xml +++ b/gentoobrowse/console/packageimport.xml @@ -90,12 +90,14 @@ <project2:sqlmerge name="urls" datasource="postgres" targettable="package_urls" useview="yes"> <sql> - SELECT DISTINCT e.packageid, REGEXP_SPLIT_TO_TABLE(fc.content, ' ') AS url - FROM filecache fc, ebuilds e, files f - WHERE fc.line = 6 - AND fc.fileid = e.ebuildid - AND fc.fileid = f.fileid - AND filetypeid = 1 + SELECT packageid, url FROM ( + SELECT DISTINCT e.packageid, REGEXP_SPLIT_TO_TABLE(fc.content, ' ') AS url + FROM filecache fc, ebuilds e, files f + WHERE fc.line = 6 + AND fc.fileid = e.ebuildid + AND fc.fileid = f.fileid + AND filetypeid = 1) AS u + WHERE url LIKE '%://%' </sql> <columns> <column key="true">packageid</column> @@ -209,5 +211,6 @@ </columns> </project2:sqlmerge> + <xi:include href="packagemasks.xml" /> <xi:include href="bugassociate.xml" /> </packageimport> |