From de5c956f238430e3915600d790964fe97946b567 Mon Sep 17 00:00:00 2001 From: randomdan Date: Fri, 25 Feb 2011 14:53:40 +0000 Subject: Build a common base for loading p2 xml scripts with proper error checking Extend cgiAppEngine to be able to return data documents specifying an error (requires Apache 2.2.16 and to have filter-errordocs set) Allow cgi requests to return a default document, suitable for 'yes, I did that' type responses Updates to GentooBrowse to use these features --- gentoobrowse/.htaccess | 1 + gentoobrowse/.p2config | 2 ++ gentoobrowse/present/ok.xml | 4 ---- gentoobrowse/request/track.xml | 3 +-- gentoobrowse/request/untrack.xml | 3 +-- gentoobrowse/xslt/base.xslt | 2 +- gentoobrowse/xslt/error.xslt | 25 +++++++++++++++++++++++++ 7 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 gentoobrowse/.p2config delete mode 100644 gentoobrowse/present/ok.xml create mode 100644 gentoobrowse/xslt/error.xslt diff --git a/gentoobrowse/.htaccess b/gentoobrowse/.htaccess index 9651de7..bcd3d7f 100644 --- a/gentoobrowse/.htaccess +++ b/gentoobrowse/.htaccess @@ -1,3 +1,4 @@ +SetEnv filter-errordocs sethandler fcgid-script diff --git a/gentoobrowse/.p2config b/gentoobrowse/.p2config new file mode 100644 index 0000000..9adbd90 --- /dev/null +++ b/gentoobrowse/.p2config @@ -0,0 +1,2 @@ +errorcontenttype=text/xml-xslt +errortransformstyle=xslt/error.xslt diff --git a/gentoobrowse/present/ok.xml b/gentoobrowse/present/ok.xml deleted file mode 100644 index 4abc040..0000000 --- a/gentoobrowse/present/ok.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/gentoobrowse/request/track.xml b/gentoobrowse/request/track.xml index 8708daf..2043e80 100644 --- a/gentoobrowse/request/track.xml +++ b/gentoobrowse/request/track.xml @@ -1,6 +1,5 @@ - + Package already tracked diff --git a/gentoobrowse/request/untrack.xml b/gentoobrowse/request/untrack.xml index 6604151..ceac001 100644 --- a/gentoobrowse/request/untrack.xml +++ b/gentoobrowse/request/untrack.xml @@ -1,6 +1,5 @@ - + DELETE FROM user_packages diff --git a/gentoobrowse/xslt/base.xslt b/gentoobrowse/xslt/base.xslt index eecc5de..a17dea3 100644 --- a/gentoobrowse/xslt/base.xslt +++ b/gentoobrowse/xslt/base.xslt @@ -4,7 +4,7 @@ - + diff --git a/gentoobrowse/xslt/error.xslt b/gentoobrowse/xslt/error.xslt new file mode 100644 index 0000000..50b7777 --- /dev/null +++ b/gentoobrowse/xslt/error.xslt @@ -0,0 +1,25 @@ + + + + + + Argh! Error! - Gentoo Browse + + + + +

Error

+

+

+ + +

Not found

+

The resource at "" could not be found.

+ + + + + + -- cgit v1.2.3