Merge branch 'upstream' into debian/sid

5 files changed, 41 insertions, 24 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 5bee805b..c737a112 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,11 +12,19 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.3.1.orig.tar.gz (2010-04-28:17/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
+  sisu_2.3.1.orig.tar.gz
+  sisu_2.3.1-1.dsc
+  sisu_2.3.1-1.diff.gz
+
+  * param, for topic_register, an additional check required, bug fix, repost
+
 %% 2.3.0.orig.tar.gz (2010-04-27:17/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
-  sisu_2.3.0.orig.tar.gz
-  sisu_2.3.0-1.dsc
-  sisu_2.3.0-1.diff.gz
+  6acef3da979f59d0e3912c0bd8a13f07b4f047ed2a0f1c196fc3504005b31447 2750663 sisu_2.3.0.orig.tar.gz
+  6423bf0b1d231bb766886fa23561fce565375c60902705ca0611ea6897b7de59 1145 sisu_2.3.0-1.dsc
+  80d59fa6c4b9d81db59db80fcca9ef40586718983e6a5d6f154d5593e4a4977f 276051 sisu_2.3.0-1.diff.gz
 
   * db (sql)  add oclc (Online Computer Library Center) number, affects table
     structure, (hence breakage & version bump)
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 1f2c8bab..cce6eb57 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
 --- 
-:version: 2.3.0
-:date_stamp: 2010w17/1
-:date: "2010-04-26"
+:version: 2.3.1
+:date_stamp: 2010w17/3
+:date: "2010-04-28"
 :project: SiSU
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index b998dbb6..1c0343db 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,19 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.3.1.orig.tar.gz (2010-04-28:17/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
+  sisu_2.3.1.orig.tar.gz
+  sisu_2.3.1-1.dsc
+  sisu_2.3.1-1.diff.gz
+
+  * param, for topic_register, an additional check required, bug fix, repost
+
 %% 2.3.0.orig.tar.gz (2010-04-27:17/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
-  sisu_2.3.0.orig.tar.gz
-  sisu_2.3.0-1.dsc
-  sisu_2.3.0-1.diff.gz
+  6acef3da979f59d0e3912c0bd8a13f07b4f047ed2a0f1c196fc3504005b31447 2750663 sisu_2.3.0.orig.tar.gz
+  6423bf0b1d231bb766886fa23561fce565375c60902705ca0611ea6897b7de59 1145 sisu_2.3.0-1.dsc
+  80d59fa6c4b9d81db59db80fcca9ef40586718983e6a5d6f154d5593e4a4977f 276051 sisu_2.3.0-1.diff.gz
 
   * db (sql)  add oclc (Online Computer Library Center) number, affects table
     structure, (hence breakage & version bump)
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
index 8ee5f43f..8423dff8 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -16,7 +16,7 @@
  :issued: 2002-11-12
  :available: 2002-11-12
  :published: 2009-01-18
- :modified: 2010-04-26
+ :modified: 2010-04-28
 
 @make:
  :num_top: 1
@@ -55,9 +55,9 @@
 
 3~source- Source (tarball tar.gz)
 
-_* {~^ sisu_2.3.0.orig.tar.gz (2010-04-26:17/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
+_* {~^ sisu_2.3.1.orig.tar.gz (2010-04-28:17/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
 
-_* {~^ sisu-markup-samples_2.0.4.orig.tar.gz (of 2008-10-09:40/4 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.4.orig.tar.gz *~sisu-markup-samples
+_* {~^ sisu-markup-samples_2.0.2.orig.tar.gz (of 2010-04-27:17/2 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.2.orig.tar.gz *~sisu-markup-samples
 
 For installation notes see http://sisudoc.org/sisu/sisu_manual/installation.html
 
@@ -102,11 +102,11 @@ group{
 
 *{Source}*
 
-{~^ sisu_2.3.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
+{~^ sisu_2.3.1.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
 
-{~^ sisu_2.3.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0-1.diff.gz
+{~^ sisu_2.3.1-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1-1.diff.gz
 
-{~^ sisu_2.3.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0-1.dsc
+{~^ sisu_2.3.1-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1-1.dsc
 
 }group
 
@@ -114,15 +114,15 @@ group{
 
 *{Debs}*
 
-{~^ sisu_2.3.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.0-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+{~^ sisu_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.1-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
 
-{~^ sisu-complete_2.3.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+{~^ sisu-complete_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.1-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
 
-{~^ sisu-pdf_2.3.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+{~^ sisu-pdf_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.1-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
 
-{~^ sisu-postgresql_2.3.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+{~^ sisu-postgresql_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.1-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
 
-{~^ sisu-sqlite_2.3.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+{~^ sisu-sqlite_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.1-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
 
 }group
 
@@ -136,9 +136,9 @@ _1 http://www.jus.uio.no/sisu/sisu_changelog/changelog.html
 
 Book markup samples have been moved to non-free as the substantive text of the documents are available under the author or original publisher's license, and usually do not comply with the Debian Free Software Guidelines.
 
-_* {~^ sisu-markup-samples_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.4-1_all.deb ~{ <br>marked up documents and other examples related to sisu, a larger package containing a number of texts <br>Depends: sisu }~
+_* {~^ sisu-markup-samples_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.2-1_all.deb ~{ <br>marked up documents and other examples related to sisu, a larger package containing a number of texts <br>Depends: sisu }~
 
-_* {~^ sisu-markup-samples_2.0.4-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.4-1.dsc ~{ <br>sisu-markup-samples_2.0.4-1.dsc }~
+_* {~^ sisu-markup-samples_2.0.2-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.2-1.dsc ~{ <br>sisu-markup-samples_2.0.2-1.dsc }~
 
 For changelogs see:
 
@@ -152,9 +152,9 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
 
 sudo rpm -i [package name]
 
-_* {~^ sisu-2.3.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.0-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.3.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.1-2.noarch.rpm ~{ <br>created using alien }~
 
-_* {~^ sisu-markup-samples_2.0.4.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_2.0.4.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.4-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
+_* {~^ sisu-markup-samples_2.0.2.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_2.0.2.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.2-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
 
 For changelogs see:
 
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index bf32fc59..a59ac8ff 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -1103,6 +1103,7 @@ module SiSU_Param
           end
         end
         if defined? @classify.topic_register \
+        and not @classify.topic_register.nil? \
         and @classify.topic_register.length >3
            topic_register=@classify.topic_register
            u=topic_register.scan(/[^;]+/)