summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gentoobrowse/base.xslt11
-rw-r--r--gentoobrowse/console/bugimport.xml8
-rw-r--r--gentoobrowse/datasources/postgres-web.xml10
-rw-r--r--gentoobrowse/present/accountTracked.xml4
-rw-r--r--gentoobrowse/request/doconfirm.xml8
-rw-r--r--gentoobrowse/request/dologin.xml8
-rw-r--r--gentoobrowse/request/dosignup.xml8
-rw-r--r--gentoobrowse/request/track.xml6
-rw-r--r--gentoobrowse/request/untrack.xml4
-rw-r--r--gentoobrowse/views/categories.xml4
-rw-r--r--gentoobrowse/views/category.xml4
-rw-r--r--gentoobrowse/views/newebuilds.xml6
-rw-r--r--gentoobrowse/views/newebuildsatom.xml4
-rw-r--r--gentoobrowse/views/package.xml28
-rw-r--r--gentoobrowse/views/search.xml4
15 files changed, 69 insertions, 48 deletions
diff --git a/gentoobrowse/base.xslt b/gentoobrowse/base.xslt
index 47e6612..c37f079 100644
--- a/gentoobrowse/base.xslt
+++ b/gentoobrowse/base.xslt
@@ -11,6 +11,17 @@
<link rel="shortcut icon" href="/images/glogo-small.png" type="image/png" />
<meta http-equiv="content-language" content="en" />
<xsl:call-template name="head" />
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-19177673-1']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
</head>
<body>
<h1>Gentoo Browse</h1>
diff --git a/gentoobrowse/console/bugimport.xml b/gentoobrowse/console/bugimport.xml
index 6c43f40..090caba 100644
--- a/gentoobrowse/console/bugimport.xml
+++ b/gentoobrowse/console/bugimport.xml
@@ -4,13 +4,13 @@
<xi:include href="../datasources/postgres.xml" />
<project2:sqlmerge name="bugimport" datasource="postgres" targettable="bugs">
<project2:prociterate name="bugsourceUnc" newline="&#10;" encoding="utf-8" fieldSep="," quoteChar="&quot;"
- path="wget http://bugs.gentoo.org/data/cached/buglist-UNCONFIRMED.htmlgz -qO - | xsltproc console/bugs.xslt -" />
+ path="xsltproc -novalid console/bugs.xslt http://bugs.gentoo.org/data/cached/buglist-UNCONFIRMED.htmlgz" />
<project2:prociterate name="bugsourceAss" newline="&#10;" encoding="utf-8" fieldSep="," quoteChar="&quot;"
- path="wget http://bugs.gentoo.org/data/cached/buglist-ASSIGNED.htmlgz -qO - | xsltproc console/bugs.xslt -" />
+ path="xsltproc -novalid console/bugs.xslt http://bugs.gentoo.org/data/cached/buglist-ASSIGNED.htmlgz" />
<project2:prociterate name="bugsourceROp" newline="&#10;" encoding="utf-8" fieldSep="," quoteChar="&quot;"
- path="wget http://bugs.gentoo.org/data/cached/buglist-REOPENED.htmlgz -qO - | xsltproc console/bugs.xslt -" />
+ path="xsltproc -novalid console/bugs.xslt http://bugs.gentoo.org/data/cached/buglist-REOPENED.htmlgz" />
<project2:prociterate name="bugsourceNew" newline="&#10;" encoding="utf-8" fieldSep="," quoteChar="&quot;"
- path="wget http://bugs.gentoo.org/data/cached/buglist-NEW.htmlgz -qO - | xsltproc console/bugs.xslt -" />
+ path="xsltproc -novalid console/bugs.xslt http://bugs.gentoo.org/data/cached/buglist-NEW.htmlgz" />
<columns>
<column key="true">bugid</column>
<column>severity</column>
diff --git a/gentoobrowse/datasources/postgres-web.xml b/gentoobrowse/datasources/postgres-web.xml
new file mode 100644
index 0000000..0825e30
--- /dev/null
+++ b/gentoobrowse/datasources/postgres-web.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<project2:rdbmsdatasource xmlns:project2="http://project2.randomdan.homeip.net" name="postgres-web">
+ <readonly preferlocal="true">
+ <dsn host="firebrand">Driver=postgresql;ServerName=firebrand.random.lan;Username=apache;Database=gentoo;Password=gentoo;</dsn>
+ <dsn host="defiant">Driver=postgresql;ServerName=defiant.random.lan;Username=apache;Database=gentoo;Password=gentoo;</dsn>
+ <dsn host="akira">Driver=postgresql;ServerName=akira.random.lan;Username=apache;Database=gentoo;Password=gentoo;</dsn>
+ <dsn host="riogrande">Driver=postgresql;ServerName=riogrande.random.lan;Username=apache;Database=gentoo;Password=gentoo;</dsn>
+ </readonly>
+ <masterdsn>Driver=postgresql;ServerName=postgresql.random.lan;Username=apache;Database=gentoo;Password=gentoo;</masterdsn>
+</project2:rdbmsdatasource>
diff --git a/gentoobrowse/present/accountTracked.xml b/gentoobrowse/present/accountTracked.xml
index 89e8da8..590a8db 100644
--- a/gentoobrowse/present/accountTracked.xml
+++ b/gentoobrowse/present/accountTracked.xml
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<view name="index" root="gentoo" style="login.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
+ <xi:include href="../datasources/postgres-web.xml" />
<xi:include href="../checks/loggedIn.xml" />
- <project2:sqlview name="trackedebuilds" recordname="ebuild" datasource="postgres">
+ <project2:sqlview name="trackedebuilds" recordname="ebuild" datasource="postgres-web">
<sql>
SELECT c.name AS catname, p.name AS pkgname, (
SELECT e.version
diff --git a/gentoobrowse/request/doconfirm.xml b/gentoobrowse/request/doconfirm.xml
index 70a1128..71f5d34 100644
--- a/gentoobrowse/request/doconfirm.xml
+++ b/gentoobrowse/request/doconfirm.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<view name="doconfirm" present="accountHome" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
- <project2:sqlcheck datasource="postgres" testOp="=" testValue="1" present="login" name="checkUserAuth">
+ <xi:include href="../datasources/postgres-web.xml" />
+ <project2:sqlcheck datasource="postgres-web" testOp="=" testValue="1" present="login" name="checkUserAuth">
<message>Invalid username or password</message>
<sql>
SELECT COUNT(*)
@@ -13,7 +13,7 @@
<param bind="0" value="$verifyguid" />
</parameters>
</project2:sqlcheck>
- <project2:sqliterate datasource="postgres" name="getUidFromDatabase">
+ <project2:sqliterate datasource="postgres-web" name="getUidFromDatabase">
<sql>
SELECT userid
FROM users
@@ -26,7 +26,7 @@
<project2:sessionset key="loggedInUserID" value="^userid" name="setUidInSession" />
</tasks>
</project2:sqliterate>
- <project2:sqltask datasource="postgres">
+ <project2:sqltask datasource="postgres-web">
<sql>UPDATE users SET verifyguid = NULL WHERE verifyguid = ?</sql>
<parameters>
<param bind="0" value="$verifyguid" />
diff --git a/gentoobrowse/request/dologin.xml b/gentoobrowse/request/dologin.xml
index dde399f..672050d 100644
--- a/gentoobrowse/request/dologin.xml
+++ b/gentoobrowse/request/dologin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<view name="dologin" present="accountHome" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
+ <xi:include href="../datasources/postgres-web.xml" />
<project2:regexcheck apply-to="$username" present="login" name="usernameEntered">
<regex>.+</regex>
<message>User name required</message>
@@ -10,7 +10,7 @@
<regex>.{6,}</regex>
<message>Password too short</message>
</project2:regexcheck>
- <project2:sqlcheck datasource="postgres" testOp="=" testValue="1" present="login" name="checkUserAuth">
+ <project2:sqlcheck datasource="postgres-web" testOp="=" testValue="1" present="login" name="checkUserAuth">
<message>Invalid username or password</message>
<sql>
SELECT COUNT(*)
@@ -23,7 +23,7 @@
<param bind="1" value="$password" />
</parameters>
</project2:sqlcheck>
- <project2:sqlcheck datasource="postgres" testOp="=" testValue="1" present="confirm" name="checkConfirmed">
+ <project2:sqlcheck datasource="postgres-web" testOp="=" testValue="1" present="confirm" name="checkConfirmed">
<message>Confirmation code required</message>
<sql>
SELECT COUNT(*)
@@ -35,7 +35,7 @@
<param bind="0" value="$username" />
</parameters>
</project2:sqlcheck>
- <project2:sqliterate datasource="postgres" name="getUidFromDatabase">
+ <project2:sqliterate datasource="postgres-web" name="getUidFromDatabase">
<sql>
SELECT userid
FROM users
diff --git a/gentoobrowse/request/dosignup.xml b/gentoobrowse/request/dosignup.xml
index 158853d..d1fbe2e 100644
--- a/gentoobrowse/request/dosignup.xml
+++ b/gentoobrowse/request/dosignup.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<view name="dosignup" present="confirm" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
+ <xi:include href="../datasources/postgres-web.xml" />
<project2:regexcheck apply-to="$username" present="signup" name="usernameEntered">
<regex>.+</regex>
<message>User name required</message>
@@ -10,7 +10,7 @@
<regex>.{6,}</regex>
<message>Password too short</message>
</project2:regexcheck>
- <project2:sqlcheck datasource="postgres" testOp="=" testValue="0" present="signup" name="freeUsername">
+ <project2:sqlcheck datasource="postgres-web" testOp="=" testValue="0" present="signup" name="freeUsername">
<message>Username already used</message>
<sql>
SELECT COUNT(*)
@@ -21,7 +21,7 @@
<param bind="0" value="$username" />
</parameters>
</project2:sqlcheck>
- <project2:sqlcheck datasource="postgres" testOp="=" testValue="0" present="signup" name="freeEmail">
+ <project2:sqlcheck datasource="postgres-web" testOp="=" testValue="0" present="signup" name="freeEmail">
<message>Email address already used</message>
<sql>
SELECT COUNT(*)
@@ -32,7 +32,7 @@
<param bind="0" value="$email" />
</parameters>
</project2:sqlcheck>
- <project2:sqltask datasource="postgres">
+ <project2:sqltask datasource="postgres-web">
<sql>INSERT INTO users(username, userrealname, userpassword, useremail, verifyguid)
VALUES(?, ?, ?, ?, uuid_generate_v4())</sql>
<parameters>
diff --git a/gentoobrowse/request/track.xml b/gentoobrowse/request/track.xml
index c5e62e4..f1d3c3f 100644
--- a/gentoobrowse/request/track.xml
+++ b/gentoobrowse/request/track.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<request name="track" present="package" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
- <project2:sqlcheck datasource="postgres" testOp="=" testValue="0" present="package" name="checkNotTracked">
+ <xi:include href="../datasources/postgres-web.xml" />
+ <project2:sqlcheck datasource="postgres-web" testOp="=" testValue="0" present="package" name="checkNotTracked">
<message>Package already tracked</message>
<sql>
SELECT COUNT(*)
@@ -15,7 +15,7 @@
<param bind="1" value="%loggedInUserID" />
</parameters>
</project2:sqlcheck>
- <project2:sqltask datasource="postgres" name="addTrack">
+ <project2:sqltask datasource="postgres-web" name="addTrack">
<sql>INSERT INTO user_packages(packageid, userid, trackedsince) VALUES(?, ?, NOW())</sql>
<parameters>
<param bind="0" value="$packageid" />
diff --git a/gentoobrowse/request/untrack.xml b/gentoobrowse/request/untrack.xml
index 93c5108..4394278 100644
--- a/gentoobrowse/request/untrack.xml
+++ b/gentoobrowse/request/untrack.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<request name="track" present="package" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
- <project2:sqltask datasource="postgres" name="addTrack">
+ <xi:include href="../datasources/postgres-web.xml" />
+ <project2:sqltask datasource="postgres-web" name="addTrack">
<sql>
DELETE FROM user_packages
WHERE packageid = ?
diff --git a/gentoobrowse/views/categories.xml b/gentoobrowse/views/categories.xml
index aeceb43..9e05f71 100644
--- a/gentoobrowse/views/categories.xml
+++ b/gentoobrowse/views/categories.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<block xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
- <project2:sqlview name="categories" recordname="category" datasource="postgres">
+ <xi:include href="../datasources/postgres-web.xml" />
+ <project2:sqlview name="categories" recordname="category" datasource="postgres-web">
<sql>
SELECT c.categoryid, MIN(c.name) AS catname, COUNT(*) AS packages
FROM categories c, packages p
diff --git a/gentoobrowse/views/category.xml b/gentoobrowse/views/category.xml
index 1ba0fb5..cb810a9 100644
--- a/gentoobrowse/views/category.xml
+++ b/gentoobrowse/views/category.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<block xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
- <project2:sqlview name="packages" recordname="package" datasource="postgres">
+ <xi:include href="../datasources/postgres-web.xml" />
+ <project2:sqlview name="packages" recordname="package" datasource="postgres-web">
<sql>
SELECT c.name AS catname, p.name AS pkgname, p.description
FROM categories c, packages p
diff --git a/gentoobrowse/views/newebuilds.xml b/gentoobrowse/views/newebuilds.xml
index 8f1b544..92d5fbd 100644
--- a/gentoobrowse/views/newebuilds.xml
+++ b/gentoobrowse/views/newebuilds.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<block xmlns:project2="http://project2.randomdan.homeip.net" xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="../datasources/postgres.xml" />
- <project2:sqlview name="newebuilds" recordname="ebuild" datasource="postgres">
+ <xi:include href="../datasources/postgres-web.xml" />
+ <project2:sqlview name="newebuilds" recordname="ebuild" datasource="postgres-web">
<sql>
SELECT filename, description, moddate, p.name AS pkgname, c.name AS catname, f.firstseen sync,
up.trackedsince IS NOT NULL AS tracked
@@ -23,7 +23,7 @@
<param bind="0" value="%loggedInUserID|0" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="syncs" recordname="sync" datasource="postgres">
+ <project2:sqlview name="syncs" recordname="sync" datasource="postgres-web">
<sql>
SELECT DISTINCT f.firstseen AS synctime
FROM files f
diff --git a/gentoobrowse/views/newebuildsatom.xml b/gentoobrowse/views/newebuildsatom.xml
index 93ae207..e758330 100644
--- a/gentoobrowse/views/newebuildsatom.xml
+++ b/gentoobrowse/views/newebuildsatom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<block xmlns:project2="http://project2.randomdan.homeip.net" xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="../datasources/postgres.xml" />
- <project2:sqlview name="newebuilds" recordname="ebuild" datasource="postgres">
+ <xi:include href="../datasources/postgres-web.xml" />
+ <project2:sqlview name="newebuilds" recordname="ebuild" datasource="postgres-web">
<sql>
SELECT filename, description, moddate, p.name AS pkgname, c.name AS catname, f.firstseen sync
FROM ebuilds e, files f, categories c, packages p, user_packages up, users u
diff --git a/gentoobrowse/views/package.xml b/gentoobrowse/views/package.xml
index 68ab0f6..5b0daab 100644
--- a/gentoobrowse/views/package.xml
+++ b/gentoobrowse/views/package.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<block xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
- <project2:sqlview name="summary" recordname="package" datasource="postgres">
+ <xi:include href="../datasources/postgres-web.xml" />
+ <project2:sqlview name="summary" recordname="package" datasource="postgres-web">
<sql>
SELECT p.packageid, p.name AS pkgname, p.description, p.firstseen, c.name AS catname
FROM packages p, categories c
@@ -14,7 +14,7 @@
<param bind="0" value="/1" />
<param bind="1" value="/2" />
</parameters>
- <project2:sqlview name="tracks" recordname="track" datasource="postgres">
+ <project2:sqlview name="tracks" recordname="track" datasource="postgres-web">
<sql>
SELECT trackedsince
FROM user_packages up
@@ -26,7 +26,7 @@
<param bind="1" value="%loggedInUserID|0" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="versions" recordname="version" datasource="postgres">
+ <project2:sqlview name="versions" recordname="version" datasource="postgres-web">
<sql>
SELECT e.ebuildid, e.version, f.moddate, e.slot, e.license
FROM ebuilds e, files f
@@ -38,7 +38,7 @@
<param bind="0" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="packageUrls" recordname="url" datasource="postgres">
+ <project2:sqlview name="packageUrls" recordname="url" datasource="postgres-web">
<sql>
SELECT pu.url
FROM package_urls pu
@@ -49,7 +49,7 @@
<param bind="0" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="versionUses" recordname="use" datasource="postgres">
+ <project2:sqlview name="versionUses" recordname="use" datasource="postgres-web">
<sql>
SELECT u.*
FROM ebuilds e, ebuild_uses u
@@ -61,7 +61,7 @@
<param bind="0" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="versionArchs" recordname="arch" datasource="postgres">
+ <project2:sqlview name="versionArchs" recordname="arch" datasource="postgres-web">
<sql>
SELECT a.*
FROM ebuilds e, ebuild_archs a
@@ -73,7 +73,7 @@
<param bind="0" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="packageBugs" recordname="bug" datasource="postgres">
+ <project2:sqlview name="packageBugs" recordname="bug" datasource="postgres-web">
<sql>
SELECT b.bugid, b.summary
FROM bugs b, package_bugs pb
@@ -85,7 +85,7 @@
<param bind="0" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="deps" recordname="package" datasource="postgres">
+ <project2:sqlview name="deps" recordname="package" datasource="postgres-web">
<sql>
SELECT DISTINCT cd.name AS catname, pd.name AS pkgname, pd.description
FROM ebuilds e, ebuild_deps d, packages pd, categories cd
@@ -99,7 +99,7 @@
<param bind="0" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="rdeps" recordname="package" datasource="postgres">
+ <project2:sqlview name="rdeps" recordname="package" datasource="postgres-web">
<sql>
SELECT DISTINCT cd.name AS catname, pd.name AS pkgname, pd.description
FROM ebuilds e, ebuild_rdeps d, packages pd, categories cd
@@ -113,7 +113,7 @@
<param bind="0" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="depees" recordname="package" datasource="postgres">
+ <project2:sqlview name="depees" recordname="package" datasource="postgres-web">
<sql>
SELECT DISTINCT cd.name AS catname, pd.name AS pkgname, pd.description
FROM ebuilds e, (
@@ -134,7 +134,7 @@
<param bind="1" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="maskstatus" recordname="mask" datasource="postgres">
+ <project2:sqlview name="maskstatus" recordname="mask" datasource="postgres-web">
<sql>
SELECT em.ebuildid, DENSE_RANK() OVER(ORDER BY em.setno) AS setno
FROM ebuild_masks em, ebuilds e
@@ -145,7 +145,7 @@
<param bind="0" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="maskdetails" recordname="mask" datasource="postgres">
+ <project2:sqlview name="maskdetails" recordname="mask" datasource="postgres-web">
<sql>
SELECT DISTINCT DENSE_RANK() OVER(ORDER BY em.setno), ms.person, ms.message, ms.dateadded
FROM ebuild_masks em, ebuilds e, masksets ms
@@ -158,7 +158,7 @@
<param bind="0" value="^packageid" />
</parameters>
</project2:sqlview>
- <project2:sqlview name="changelog" recordname="line" datasource="postgres">
+ <project2:sqlview name="changelog" recordname="line" datasource="postgres-web">
<sql>
SELECT line, content
FROM files f, filecache fc, packages p, categories c
diff --git a/gentoobrowse/views/search.xml b/gentoobrowse/views/search.xml
index 3d6a72d..1b7a177 100644
--- a/gentoobrowse/views/search.xml
+++ b/gentoobrowse/views/search.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<block xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:project2="http://project2.randomdan.homeip.net">
- <xi:include href="../datasources/postgres.xml" />
- <project2:sqlview name="searchResults" recordname="package" datasource="postgres">
+ <xi:include href="../datasources/postgres-web.xml" />
+ <project2:sqlview name="searchResults" recordname="package" datasource="postgres-web">
<sql>
select c.name as catname, p.name as pkgname, description,
ts_rank((setweight(to_tsvector('english', p.name), 'A') || setweight(to_tsvector('english', p.description), 'B')),
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 21:52:14 +0000