From e8ccf377552ed2dfe71b92e3d180b7fb9aa3d208 Mon Sep 17 00:00:00 2001 From: randomdan Date: Thu, 3 Feb 2011 12:45:52 +0000 Subject: Add missing conversion in generic visitor Whole new improved variable system (does drop VariableParse, no longer required) Add option to count, but not include, blank lines in proc and file rows File file rows to open files, not execute them Fix to ODBC API with strings that don't use the whole buffer XML changes to site to use new variable system Changes to GB importer to use FS rows and new SQL merge now that it's a) tested and b) variable parse has gone --- gentoobrowse/checks/loggedIn.xml | 3 +- gentoobrowse/console/emailebuilds.xml | 5 ++-- gentoobrowse/console/fileimport.xml | 45 +++++++++++++++++++----------- gentoobrowse/datasources/postgres.xml | 2 -- 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/index.xml | 2 +- gentoobrowse/present/package.xml | 30 ++++++++++---------- gentoobrowse/present/search.xml | 2 +- gentoobrowse/request/doconfirm.xml | 10 ++++--- gentoobrowse/request/dologin.xml | 18 +++++++----- gentoobrowse/request/dosignup.xml | 24 +++++++++------- gentoobrowse/request/track.xml | 8 +++--- gentoobrowse/request/untrack.xml | 4 +-- 17 files changed, 92 insertions(+), 71 deletions(-) diff --git a/gentoobrowse/checks/loggedIn.xml b/gentoobrowse/checks/loggedIn.xml index 0b120c2..0785380 100644 --- a/gentoobrowse/checks/loggedIn.xml +++ b/gentoobrowse/checks/loggedIn.xml @@ -1,5 +1,6 @@ - + + [1-9][0-9]* Not logged in diff --git a/gentoobrowse/console/emailebuilds.xml b/gentoobrowse/console/emailebuilds.xml index 051b78c..a227a9d 100644 --- a/gentoobrowse/console/emailebuilds.xml +++ b/gentoobrowse/console/emailebuilds.xml @@ -16,8 +16,9 @@ - + insert into user_ebuild_emails(ebuildid, userid, sentat) @@ -33,7 +34,7 @@ where ebe.userid is null - + diff --git a/gentoobrowse/console/fileimport.xml b/gentoobrowse/console/fileimport.xml index b65573f..37b7814 100644 --- a/gentoobrowse/console/fileimport.xml +++ b/gentoobrowse/console/fileimport.xml @@ -4,23 +4,28 @@ - SELECT filetypeid, searchroot, LENGTH(searchroot) + 1 || '-' AS rootlen, searchspec + SELECT filetypeid, searchroot, searchspec FROM filetypes ORDER BY filetypeid DESC - - - filetypeid - filename - moddate - - + - + + + + + + + + + + + + + filename @@ -38,19 +43,25 @@ ORDER BY f.fileid - + + - fileid - line content - + + updatewhere="a.fileid IN (SELECT o.fileid FROM files o WHERE o.cachedat IS NULL OR o.cachedat != o.moddate)"> - + + + + + + + + + fileid diff --git a/gentoobrowse/datasources/postgres.xml b/gentoobrowse/datasources/postgres.xml index 448892a..d6fbd35 100644 --- a/gentoobrowse/datasources/postgres.xml +++ b/gentoobrowse/datasources/postgres.xml @@ -3,8 +3,6 @@ Driver=postgresql;ServerName=firebrand.random.lan;Username=gentoo;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public; Driver=postgresql;ServerName=defiant.random.lan;Username=gentoo;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public; - Driver=postgresql;ServerName=akira.random.lan;Username=gentoo;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public; - Driver=postgresql;ServerName=riogrande.random.lan;Username=gentoo;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public; Driver=postgresql;ServerName=postgresql.random.lan;Username=gentoo;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public; diff --git a/gentoobrowse/emails/newpackageversions.xml b/gentoobrowse/emails/newpackageversions.xml index 45bba93..1132407 100644 --- a/gentoobrowse/emails/newpackageversions.xml +++ b/gentoobrowse/emails/newpackageversions.xml @@ -21,7 +21,7 @@ - + diff --git a/gentoobrowse/emails/welcome.xml b/gentoobrowse/emails/welcome.xml index ad48f66..f3242ca 100644 --- a/gentoobrowse/emails/welcome.xml +++ b/gentoobrowse/emails/welcome.xml @@ -12,7 +12,7 @@ - + diff --git a/gentoobrowse/present/accountTracked.xml b/gentoobrowse/present/accountTracked.xml index 5dded3f..746631b 100644 --- a/gentoobrowse/present/accountTracked.xml +++ b/gentoobrowse/present/accountTracked.xml @@ -6,7 +6,7 @@ - + diff --git a/gentoobrowse/present/atom.xml b/gentoobrowse/present/atom.xml index ecbb0b5..040497f 100644 --- a/gentoobrowse/present/atom.xml +++ b/gentoobrowse/present/atom.xml @@ -4,7 +4,7 @@ - + diff --git a/gentoobrowse/present/category.xml b/gentoobrowse/present/category.xml index 6de3875..f45dc97 100644 --- a/gentoobrowse/present/category.xml +++ b/gentoobrowse/present/category.xml @@ -4,7 +4,7 @@ - + diff --git a/gentoobrowse/present/index.xml b/gentoobrowse/present/index.xml index 4fa7946..36b5da6 100644 --- a/gentoobrowse/present/index.xml +++ b/gentoobrowse/present/index.xml @@ -5,7 +5,7 @@ - + diff --git a/gentoobrowse/present/package.xml b/gentoobrowse/present/package.xml index 0b93d04..69c13cc 100644 --- a/gentoobrowse/present/package.xml +++ b/gentoobrowse/present/package.xml @@ -4,68 +4,68 @@ - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + diff --git a/gentoobrowse/present/search.xml b/gentoobrowse/present/search.xml index 60610df..b2f0f97 100644 --- a/gentoobrowse/present/search.xml +++ b/gentoobrowse/present/search.xml @@ -10,7 +10,7 @@ - + diff --git a/gentoobrowse/request/doconfirm.xml b/gentoobrowse/request/doconfirm.xml index 9b2b0e5..83785a3 100644 --- a/gentoobrowse/request/doconfirm.xml +++ b/gentoobrowse/request/doconfirm.xml @@ -11,21 +11,23 @@ WHERE verifyguid = ? - + - + - + + + UPDATE users SET verifyguid = NULL WHERE verifyguid = ? - + diff --git a/gentoobrowse/request/dologin.xml b/gentoobrowse/request/dologin.xml index 9e1bc19..b2c7121 100644 --- a/gentoobrowse/request/dologin.xml +++ b/gentoobrowse/request/dologin.xml @@ -3,11 +3,13 @@ xmlns:project2="http://project2.randomdan.homeip.net"> - + + .+ User name required - + + .{6,} Password too short @@ -20,8 +22,8 @@ AND userpassword = ? - - + + @@ -33,15 +35,17 @@ AND verifyguid IS NULL - + - + - + + + diff --git a/gentoobrowse/request/dosignup.xml b/gentoobrowse/request/dosignup.xml index 386b585..c0b24df 100644 --- a/gentoobrowse/request/dosignup.xml +++ b/gentoobrowse/request/dosignup.xml @@ -2,11 +2,13 @@ - + + .+ User name required - + + .{6,} Password too short @@ -18,7 +20,7 @@ WHERE username = ? - + @@ -29,20 +31,22 @@ WHERE useremail = ? - + INSERT INTO users(username, userrealname, userpassword, useremail, verifyguid) VALUES(?, ?, ?, ?, uuid_generate_v4()) - - - - + + + + - + + + diff --git a/gentoobrowse/request/track.xml b/gentoobrowse/request/track.xml index 5d8bbc9..ca7b8c8 100644 --- a/gentoobrowse/request/track.xml +++ b/gentoobrowse/request/track.xml @@ -11,15 +11,15 @@ AND userid = ? - - + + INSERT INTO user_packages(packageid, userid, trackedsince) VALUES(?, ?, NOW()) - - + + diff --git a/gentoobrowse/request/untrack.xml b/gentoobrowse/request/untrack.xml index 58f595b..1cef535 100644 --- a/gentoobrowse/request/untrack.xml +++ b/gentoobrowse/request/untrack.xml @@ -9,8 +9,8 @@ AND userid = ? - - + + -- cgit v1.2.3