update: changelog, version (2.2.0), review

4 files changed, 81 insertions, 45 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 625b247d..3d5ebb13 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,29 +12,45 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
-%% 2.1.1.orig.tar.gz (2010-04-18:15/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.1.orig.tar.gz
-  sisu_2.1.1.orig.tar.gz
-  sisu_2.1.1-1.dsc
-  sisu_2.1.1-1.diff.gz
+%% 2.2.0.orig.tar.gz (2010-04-19:16/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
+  sisu_2.2.0.orig.tar.gz
+  sisu_2.2.0-1.dsc
+  sisu_2.2.0-1.diff.gz
 
-  * shared_metadata, fixed wrong reference to md.gutenberg instead of md.pg,
-    prevents building of latex/pdf in affected cases
+  * db (sql) table structure, further review and changes (hence breakage & version bump)
+    * new pgsql db name prefix "sisu_v2b_"
+    * new table column words in doc_objects & endnotes, VARCHAR 3000 to contain
+      list of unique sorted words in object
+    * increase use of VARCHAR
+    * new indexes
 
-  * param, where rights.copyright missing, nag profusely but do not break, fix
+  * multiple fixes
 
-  * shared_html_lite, markup heading objects
+    * db_sqltxt, sql issue at times with missing author field, fix
 
-  * db_sqltxt, sql issue at times with missing author field, fix
+    * db_select, check for whether db exists, note this does not check whether
+      tables have been created though
 
-  * db_select, check for whether db exists, note this does not check whether
-    tables have been created though
+    * db_import sqlite, prevent multiple import of file with same
+      filename(.sst) (cgi form should work correctly, without multiple entries)
 
-  * db_import sqlite, prevent multiple import of file with same filename(.sst)
-    (cgi form should work correctly, without multiple entries)
+    * db_indexes, db_drop fixes
 
-  * cgi_sql_common, better presentation for next page where more matches than
-    limit per page
+    * cgi_sql_common, better presentation for next page where more matches than
+      limit per page
+
+    * shared_metadata, fixed wrong reference to md.gutenberg instead of md.pg,
+      prevents building of latex/pdf in affected cases
+
+    * param, extensive db column size checks for metadata
+
+    * param, where rights.copyright missing, nag profusely but do not break,
+      fix
+
+    * shared_html_lite, markup heading objects
+
+    [2.1.1 fix release was not built, changes appear under 2.2.0]
 
 %% 2.1.0.orig.tar.gz (2010-04-16:15/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
@@ -42,6 +58,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
   a1a452dc0ff287a746a408862156afa054c51ae9efc232f8fa59a67d9af6b4b6 1145 sisu_2.1.0-1.dsc
   a94c9bf7cf6eb340a27055967abbc8a6726a2eb974daf221fee0940b6f85bc66 275748 sisu_2.1.0-1.diff.gz
 
+  * db table structure, further review, minor, but disruptive
+
   * db (sql) database table name and column structure changes, new pgsql db
     name prefix "sisu_v2a_" (hence breakage & version bump), continue to review
     (db_columns, db_create, db_import, db_sqltxt)
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 011f1edb..5cb7a079 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
 --- 
-:version: 2.1.1
-:date_stamp: 2010w15/7
-:date: "2010-04-18"
+:version: 2.2.0
+:date_stamp: 2010w16/1
+:date: "2010-04-19"
 :project: SiSU
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index c9b275ab..e182f467 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,29 +12,45 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
-%% 2.1.1.orig.tar.gz (2010-04-18:15/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.1.orig.tar.gz
-  sisu_2.1.1.orig.tar.gz
-  sisu_2.1.1-1.dsc
-  sisu_2.1.1-1.diff.gz
+%% 2.2.0.orig.tar.gz (2010-04-19:16/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
+  sisu_2.2.0.orig.tar.gz
+  sisu_2.2.0-1.dsc
+  sisu_2.2.0-1.diff.gz
 
-  * shared_metadata, fixed wrong reference to md.gutenberg instead of md.pg,
-    prevents building of latex/pdf in affected cases
+  * db (sql) table structure, further review and changes (hence breakage & version bump)
+    * new pgsql db name prefix "sisu_v2b_"
+    * new table column words in doc_objects & endnotes, VARCHAR 3000 to contain
+      list of unique sorted words in object
+    * increase use of VARCHAR
+    * new indexes
 
-  * param, where rights.copyright missing, nag profusely but do not break, fix
+  * multiple fixes
 
-  * shared_html_lite, markup heading objects
+    * db_sqltxt, sql issue at times with missing author field, fix
 
-  * db_sqltxt, sql issue at times with missing author field, fix
+    * db_select, check for whether db exists, note this does not check whether
+      tables have been created though
 
-  * db_select, check for whether db exists, note this does not check whether
-    tables have been created though
+    * db_import sqlite, prevent multiple import of file with same
+      filename(.sst) (cgi form should work correctly, without multiple entries)
 
-  * db_import sqlite, prevent multiple import of file with same filename(.sst)
-    (cgi form should work correctly, without multiple entries)
+    * db_indexes, db_drop fixes
 
-  * cgi_sql_common, better presentation for next page where more matches than
-    limit per page
+    * cgi_sql_common, better presentation for next page where more matches than
+      limit per page
+
+    * shared_metadata, fixed wrong reference to md.gutenberg instead of md.pg,
+      prevents building of latex/pdf in affected cases
+
+    * param, extensive db column size checks for metadata
+
+    * param, where rights.copyright missing, nag profusely but do not break,
+      fix
+
+    * shared_html_lite, markup heading objects
+
+    [2.1.1 fix release was not built, changes appear under 2.2.0]
 
 %% 2.1.0.orig.tar.gz (2010-04-16:15/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
@@ -42,6 +58,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
   a1a452dc0ff287a746a408862156afa054c51ae9efc232f8fa59a67d9af6b4b6 1145 sisu_2.1.0-1.dsc
   a94c9bf7cf6eb340a27055967abbc8a6726a2eb974daf221fee0940b6f85bc66 275748 sisu_2.1.0-1.diff.gz
 
+  * db table structure, further review, minor, but disruptive
+
   * db (sql) database table name and column structure changes, new pgsql db
     name prefix "sisu_v2a_" (hence breakage & version bump), continue to review
     (db_columns, db_create, db_import, db_sqltxt)
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 ec2a06eb..7b5b2caf 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
@@ -57,7 +57,7 @@
 
 Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
 
-_* {~^ sisu_2.1.1.orig.tar.gz (2010-04-18:15/7) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.1.orig.tar.gz
+_* {~^ sisu_2.2.0.orig.tar.gz (2010-04-19:16/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.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
 
@@ -104,11 +104,11 @@ group{
 
 *{Source}*
 
-{~^ sisu_2.1.1.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.1.orig.tar.gz
+{~^ sisu_2.2.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
 
-{~^ sisu_2.1.1-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.1-1.diff.gz
+{~^ sisu_2.2.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0-1.diff.gz
 
-{~^ sisu_2.1.1-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.1-1.dsc
+{~^ sisu_2.2.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0-1.dsc
 
 }group
 
@@ -116,15 +116,15 @@ group{
 
 *{Debs}*
 
-{~^ sisu_2.1.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.1.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_2.2.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.2.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-complete_2.1.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.1.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-complete_2.2.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.2.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-pdf_2.1.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.1.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-pdf_2.2.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.2.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-postgresql_2.1.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.1.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-postgresql_2.2.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.2.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-sqlite_2.1.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.1.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 }~
+{~^ sisu-sqlite_2.2.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.2.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 }~
 
 }group
 
@@ -154,7 +154,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
 
 sudo rpm -i [package name]
 
-_* {~^ sisu-2.1.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.1.1-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.2.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.2.0-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 }~