From 25df1f96145768c374918e17f79359ec6a81d03b Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Sep 2008 23:04:14 -0500 Subject: [PATCH 1/8] Tweak config --- .../websites/concatenative/concatenative.factor | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor index 0af8eb31d7..0fec239743 100644 --- a/extra/websites/concatenative/concatenative.factor +++ b/extra/websites/concatenative/concatenative.factor @@ -45,7 +45,7 @@ TUPLE: factor-website < dispatcher ; { factor-website "page" } >>template ; -: ( responder -- responder' ) +: ( responder -- responder' ) "Factor website" "Factor website" >>name allow-registration @@ -77,10 +77,10 @@ SYMBOL: dh-file "password" key-password set-global common-configuration - "pastebin" add-responder - "planet" add-responder + "pastebin" add-responder + "planet" add-responder "/tmp/docs/" "docs" add-responder - + test-db main-responder set-global ; : ( path -- responder ) @@ -91,11 +91,12 @@ SYMBOL: dh-file : init-production ( -- ) common-configuration - "concatenative.org" add-responder - "paste.factorcode.org" add-responder - "planet.factorcode.org" add-responder - home "docs" append-path "docs.factorcode.org" add-responder + "concatenative.org" add-responder + "paste.factorcode.org" add-responder + "planet.factorcode.org" add-responder + home "docs" append-path "docs.factorcode.org" add-responder home "cgi" append-path "gitweb.factorcode.org" add-responder + test-db main-responder set-global ; : ( -- config ) From 9b05fe003254a98fca5c7e0eeaa3162a2d90df1a Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Sep 2008 23:05:21 -0500 Subject: [PATCH 2/8] Oops --- extra/websites/concatenative/concatenative.factor | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor index 0fec239743..527b0507ba 100644 --- a/extra/websites/concatenative/concatenative.factor +++ b/extra/websites/concatenative/concatenative.factor @@ -51,8 +51,7 @@ TUPLE: factor-website < dispatcher ; allow-registration allow-password-recovery allow-edit-profile - allow-deactivation - test-db ; + allow-deactivation ; : ( -- responder ) factor-website new-dispatcher From 2b10a154ced6986da042c4b8912218401b0efb9f Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Sep 2008 23:08:37 -0500 Subject: [PATCH 3/8] Broke gitweb oops --- extra/websites/concatenative/concatenative.factor | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor index 527b0507ba..5553fda740 100644 --- a/extra/websites/concatenative/concatenative.factor +++ b/extra/websites/concatenative/concatenative.factor @@ -90,12 +90,11 @@ SYMBOL: dh-file : init-production ( -- ) common-configuration - "concatenative.org" add-responder - "paste.factorcode.org" add-responder - "planet.factorcode.org" add-responder - home "docs" append-path "docs.factorcode.org" add-responder + test-db "concatenative.org" add-responder + test-db "paste.factorcode.org" add-responder + test-db "planet.factorcode.org" add-responder + home "docs" append-path test-db "docs.factorcode.org" add-responder home "cgi" append-path "gitweb.factorcode.org" add-responder - test-db main-responder set-global ; : ( -- config ) From 1bd36b3d879cf91733211c2c77c0900d8655db4d Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Sep 2008 23:13:46 -0500 Subject: [PATCH 4/8] Working on XHTML 1.1 validation --- basis/html/components/components.factor | 2 +- extra/webapps/pastebin/new-paste.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor index dafc9dd06b..6f35ba5d97 100644 --- a/basis/html/components/components.factor +++ b/basis/html/components/components.factor @@ -83,7 +83,7 @@ TUPLE: choice size multiple choices ; choice new ; : render-option ( text selected? -- ) - ; diff --git a/extra/webapps/pastebin/new-paste.xml b/extra/webapps/pastebin/new-paste.xml index 6abae4895b..96339b6cf8 100644 --- a/extra/webapps/pastebin/new-paste.xml +++ b/extra/webapps/pastebin/new-paste.xml @@ -18,6 +18,6 @@ - +

From 00f3c256d97d9dfed71277b68ce3a8605ca0ae6e Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Sep 2008 23:16:14 -0500 Subject: [PATCH 5/8] Working on XHTML 1.1 validation --- extra/webapps/pastebin/paste.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/webapps/pastebin/paste.xml b/extra/webapps/pastebin/paste.xml index 1c138fc8c0..8fe672049f 100644 --- a/extra/webapps/pastebin/paste.xml +++ b/extra/webapps/pastebin/paste.xml @@ -20,7 +20,7 @@ -

Annotation:

+

Annotation:

@@ -52,7 +52,7 @@
Author:
- +

From 0dff27507dec3bfceeb13c3aa9327e3c035c7498 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Sep 2008 23:20:12 -0500 Subject: [PATCH 6/8] Fix validation warning --- extra/webapps/help/help.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/webapps/help/help.xml b/extra/webapps/help/help.xml index f4262a6f6a..7718b10a22 100644 --- a/extra/webapps/help/help.xml +++ b/extra/webapps/help/help.xml @@ -1,4 +1,4 @@ - + From 94872bd43a851f9cb1c00aed217ec8dbc5325851 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Sep 2008 23:29:51 -0500 Subject: [PATCH 7/8] Fix edit-blog action --- extra/webapps/planet/planet.factor | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor index cd6e183d14..00d843573c 100755 --- a/extra/webapps/planet/planet.factor +++ b/extra/webapps/planet/planet.factor @@ -166,14 +166,14 @@ posting "POSTINGS" [ f [ deposit-blog-slots ] + [ "id" value >>id ] [ update-tuple ] - [ - - "$planet/admin" >>path - swap id>> "id" set-query-param - - ] tri + + + "$planet/admin" >>path + "id" value "id" set-query-param + ] >>submit ; : ( -- responder ) From e438fe2a80ae19d158678b284eb3f491bcdcdd65 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Sep 2008 23:36:40 -0500 Subject: [PATCH 8/8] Handle Atom feeds with multiple entry links --- basis/syndication/syndication.factor | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/basis/syndication/syndication.factor b/basis/syndication/syndication.factor index ca7511f1af..aca09b939c 100644 --- a/basis/syndication/syndication.factor +++ b/basis/syndication/syndication.factor @@ -69,11 +69,15 @@ TUPLE: entry title url description date ; [ "item" tags-named [ rss2.0-entry ] map set-entries ] tri ; +: atom-entry-link ( tag -- url/f ) + "link" tags-named [ "rel" swap at "alternate" = ] find nip + dup [ "href" swap at >url ] when ; + : atom1.0-entry ( tag -- entry ) entry new swap { [ "title" tag-named children>string >>title ] - [ "link" tag-named "href" swap at >url >>url ] + [ atom-entry-link >>url ] [ { "content" "summary" } any-tag-named dup children>> [ string? not ] contains?