Convert tagcloud and uf plugins to multi-line %config initialisation, for better...

diff --git a/gavinc/hcard b/gavinc/hcard
index 9fa0f5b33857e7ee6d09bee3902cb47d36775dec..04284738fc0cceafddeee887ad993df3d08820e9 100644 (file)
--- a/gavinc/hcard
+++ b/gavinc/hcard
@@ -14,12 +14,10 @@ use IO::File;
 
 # --- Configuration defaults -----
 
-my %config = (
+my %config = ();
 
-  # Where is the hcard metadata?
-  hcard_meta_file => "$blosxom::datadir/hcard.yml",
-
-);
+# Where is the hcard metadata?
+$config{hcard_meta_file} = "$blosxom::datadir/hcard.yml";
 
 # --------------------------------
 # __END_CONFIG__

diff --git a/gavinc/tagcloud b/gavinc/tagcloud
index e0c3baaba8c14b69654451fc90e2dff7662f0ac9..d89fc9237e59601d8944b0b87c6d923a9546396b 100644 (file)
--- a/gavinc/tagcloud
+++ b/gavinc/tagcloud
@@ -13,28 +13,28 @@ use vars qw(%config $cloud);
 
 # --- Configuration defaults -----
 
-%config = (
+%config = ();
 
-  # tagcloud requires a hashref containing 'tag => count' pairs
-  tag_hashref           => $tags::tag_counts,
+# tagcloud requires a hashref containing 'tag => count' pairs
+$config{tag_hashref}           = $tags::tag_counts;
 
-  # Formatting options
-  tagcloud_prefix       => qq(<p class="tagcloud">\n),
-  tagcloud_suffix       => qq(</p>\n),
-  show_tag_no           => 0,
-  min_tag_no            => 2,
-  min_size              => 75,
-  max_size              => 200,
-  entry_type            => 'posting',
+# Formatting options
+$config{tagcloud_prefix}       = qq(<p class="tagcloud">\n);
+$config{tagcloud_suffix}       = qq(</p>\n);
+$config{show_tag_no}           = 0;
+$config{min_tag_no}            = 2;
+$config{min_size}              = 75;
+$config{max_size}              = 200;
+$config{entry_type}            = 'posting';
 
-  # Tags to omit from tagcloud
-  tagcloud_blacklist => [ 'Now Playing' ],
-
-);
+# Tags to omit from tagcloud
+$config{tagcloud_blacklist} = [ 'Now Playing' ];
 
 # ---------------------------------
 # __END_CONFIG__
 
+#blosxom::load_config( \%config, 'tagcloud' );
+
 my %tagcloud_blacklist = map { $_ => 1 } @{$config{tagcloud_blacklist}};
 
 $cloud = '';

diff --git a/gavinc/uf_adr_meta b/gavinc/uf_adr_meta
index a3d2f8b8381b7d9bc42a24e020a8470769cc0b38..dc5e3850bfb3a04815bffedb4592e08fbe4fc819 100644 (file)
--- a/gavinc/uf_adr_meta
+++ b/gavinc/uf_adr_meta
@@ -12,27 +12,25 @@ use strict;
 
 # --- Configuration defaults -----
 
-my %config = (
-
-  # Extra CSS classes to add to the microformat container e.g. to turn display off
-  class => '',
-  #class => 'nodisplay',
-
-  # Whether to automatically add microformat to story bodies. If not set, 
-  # you must explicitly add $uf_adr_meta::adr to a template somewhere.
-  auto_append_to_body => 1,
-
-  # What markup style to use for your adr, if auto-appending. 
-  # 3 styles are currently defined: 
-  # 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
-  # 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
-  # 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
-  #    'dd' elements for the fields themselves
-  #style => 'div-span',
-  #style => 'ul',
-  style => 'dl',
-
-);
+my %config = ();
+
+# Extra CSS classes to add to the microformat container e.g. to turn display off
+$config{class} = '';
+#$config{class} = 'nodisplay';
+
+# Whether to automatically add microformat to story bodies. If not set, 
+# you must explicitly add $uf_adr_meta::adr to a template somewhere.
+$config{auto_append_to_body} = 1;
+
+# What markup style to use for your adr, if auto-appending. 
+# 3 styles are currently defined: 
+# 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
+# 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
+# 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
+#    'dd' elements for the fields themselves
+#$config{style} = 'div-span';
+#$config{style} = 'ul';
+$config{style} = 'dl';
 
 # --------------------------------
 # __END_CONFIG__

diff --git a/gavinc/uf_geo_meta b/gavinc/uf_geo_meta
index 94c2ee9c273a252967756ffd06b32553a2c17e50..e2ac567961c7635befac46a836cc967ac6a9d4db 100644 (file)
--- a/gavinc/uf_geo_meta
+++ b/gavinc/uf_geo_meta
@@ -12,27 +12,25 @@ use strict;
 
 # --- Configurable variables -----
 
-my %config = (
-
-  # Extra CSS classes to add to the microformat container e.g. to turn display off
-  class => '',
-  #class => 'nodisplay',
-
-  # Whether to automatically add microformat to story bodies. If not set, 
-  # you must explicitly add $uf_adr_meta::adr to a template somewhere.
-  auto_append_to_body => 1,
-
-  # What markup style to use for your adr, if auto-appending. 
-  # 3 styles are currently defined: 
-  # 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
-  # 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
-  # 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
-  #    'dd' elements for the fields themselves
-  #style => 'div-span',
-  #style => 'ul',
-  style => 'dl',
-
-);
+my %config = ();
+
+# Extra CSS classes to add to the microformat container e.g. to turn display off
+$config{class} = '';
+#$config{class} = 'nodisplay';
+
+# Whether to automatically add microformat to story bodies. If not set, 
+# you must explicitly add $uf_adr_meta::adr to a template somewhere.
+$config{auto_append_to_body} = 1;
+
+# What markup style to use for your adr, if auto-appending. 
+# 3 styles are currently defined: 
+# 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
+# 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
+# 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
+#    'dd' elements for the fields themselves
+#$config{style} = 'div-span';
+#$config{style} = 'ul';
+$config{style} = 'dl';
 
 # --------------------------------
 # __END_CONFIG__

diff --git a/gavinc/uf_hcalendar_meta b/gavinc/uf_hcalendar_meta
index 52b850a01b66457347e2608cd652773e9c91d89c..7afab15145a573da0762984046b29c7fc8a4ed76 100644 (file)
--- a/gavinc/uf_hcalendar_meta
+++ b/gavinc/uf_hcalendar_meta
@@ -12,27 +12,25 @@ use strict;
 
 # --- Configurable variables -----
 
-my %config = (
-
-  # Extra CSS classes to add to the microformat container e.g. to turn display off
-  class => '',
-  #class => 'nodisplay',
-
-  # Whether to automatically add microformat to story bodies. If not set, 
-  # you must explicitly add $uf_adr_meta::adr to a template somewhere.
-  auto_append_to_body => 1,
-
-  # What markup style to use for your adr, if auto-appending. 
-  # 3 styles are currently defined: 
-  # 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
-  # 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
-  # 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
-  #    'dd' elements for the fields themselves
-  #style => 'div-span',
-  #style => 'ul',
-  style => 'dl',
-
-);
+my %config = ();
+
+# Extra CSS classes to add to the microformat container e.g. to turn display off
+$config{class} = '';
+#$config{class} = 'nodisplay';
+
+# Whether to automatically add microformat to story bodies. If not set, 
+# you must explicitly add $uf_adr_meta::adr to a template somewhere.
+$config{auto_append_to_body} = 1;
+
+# What markup style to use for your adr, if auto-appending. 
+# 3 styles are currently defined: 
+# 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
+# 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
+# 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
+#    'dd' elements for the fields themselves
+#$config{style} = 'div-span';
+#$config{style} = 'ul';
+$config{style} = 'dl';
 
 # --------------------------------
 # __END_CONFIG__

diff --git a/gavinc/uf_hcard_meta b/gavinc/uf_hcard_meta
index 7b6ba0674347c77f9ca028e1fea2a51a170785d0..90b23339252c50931581fcaa1a147c6c58138fd0 100644 (file)
--- a/gavinc/uf_hcard_meta
+++ b/gavinc/uf_hcard_meta
@@ -12,27 +12,25 @@ use strict;
 
 # --- Configuration defaults -----
 
-my %config = (
-
-  # Extra CSS classes to add to the microformat container e.g. to turn display off
-  class => '',
-  #class => 'nodisplay',
-
-  # Whether to automatically add microformat to story bodies. If not set, 
-  # you must explicitly add $uf_adr_meta::adr to a template somewhere.
-  auto_append_to_body => 1,
-
-  # What markup style to use for your adr, if auto-appending. 
-  # 3 styles are currently defined: 
-  # 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
-  # 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
-  # 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
-  #    'dd' elements for the fields themselves
-  #style => 'div-span',
-  #style => 'ul',
-  style => 'dl',
-
-);
+my %config = ();
+
+# Extra CSS classes to add to the microformat container e.g. to turn display off
+$config{class} = '';
+#$config{class} = 'nodisplay';
+
+# Whether to automatically add microformat to story bodies. If not set, 
+# you must explicitly add $uf_adr_meta::adr to a template somewhere.
+$config{auto_append_to_body} = 1;
+
+# What markup style to use for your adr, if auto-appending. 
+# 3 styles are currently defined: 
+# 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
+# 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
+# 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
+#    'dd' elements for the fields themselves
+#$config{style} = 'div-span';
+#$config{style} = 'ul';
+$config{style} = 'dl';
 
 # --------------------------------
 # __END_CONFIG__

diff --git a/gavinc/uf_xfolk_meta b/gavinc/uf_xfolk_meta
index e99988c3777e16ba99fd13e558c6bcc043741039..9d5963d60210e900fd7f7bd228f7f60511c2d671 100644 (file)
--- a/gavinc/uf_xfolk_meta
+++ b/gavinc/uf_xfolk_meta
@@ -12,30 +12,28 @@ use strict;
 
 # --- Configurable variables -----
 
-my %config = (
-
-  # URL to use as base URL for tag links
-  tagbase => "$blosxom::url/tags",
-
-  # Extra CSS classes to add to the microformat container e.g. to turn display off
-  class => '',
-  #class => 'nodisplay',
-
-  # Whether to automatically add microformat to story bodies. If not set, 
-  # you must explicitly add $uf_adr_meta::adr to a template somewhere.
-  auto_append_to_body => 1,
-
-  # What markup style to use for your adr, if auto-appending. 
-  # 3 styles are currently defined: 
-  # 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
-  # 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
-  # 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
-  #    'dd' elements for the fields themselves
-  #style => 'div-span',
-  #style => 'ul',
-  style => 'dl',
-
-);
+my %config = ();
+
+# URL to use as base URL for tag links
+$config{tagbase} = "$blosxom::url/tags";
+
+# Extra CSS classes to add to the microformat container e.g. to turn display off
+$config{class} = '';
+#$config{class} = 'nodisplay';
+
+# Whether to automatically add microformat to story bodies. If not set, 
+# you must explicitly add $uf_adr_meta::adr to a template somewhere.
+$config{auto_append_to_body} = 1;
+
+# What markup style to use for your adr, if auto-appending. 
+# 3 styles are currently defined: 
+# 'div-span' uses a 'div' elt for the container, and 'span' elements for the fields
+# 'ul' uses a 'ul' list for the container, and 'li' elements for the fields
+# 'dl' uses a 'dl' list for the container, 'dt' elements for field names, and 
+#    'dd' elements for the fields themselves
+#$config{style} = 'div-span';
+#$config{style} = 'ul';
+$config{style} = 'dl';
 
 # --------------------------------
 # __END_CONFIG__