From 804a103722aa7731ca7f2062ee2ebf533607e6aa Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 3 Oct 2012 00:11:08 -0400 Subject: v4: 4.0.0 new branch & version & changelog "opened" --- CHANGELOG | 34 +- CHANGELOGS/CHANGELOG_v1 | 1 + CHANGELOGS/CHANGELOG_v2 | 1 + CHANGELOGS/CHANGELOG_v3 | 1 + CHANGELOGS/CHANGELOG_v4 | 1 + CHANGELOG_v1 | 1 - CHANGELOG_v2 | 1 - CHANGELOG_v3 | 1 - README | 29 +- bin/sisu | 14 +- bin/sisu-git | 2 - bin/sisu-po | 2 - bin/sisu-webrick | 2 + bin/sisu2 | 136 - bin/sisu3 | 12 +- bin/sisu4 | 134 + bin/sisu_termsheet | 148 - bin/sisu_webrick | 135 - conf/sisu/v2/sisurc.yml | 136 - conf/sisu/v4/sisurc.yml | 146 + data/doc/sisu/CHANGELOG_v1 | 5 +- data/doc/sisu/CHANGELOG_v2 | 25 +- data/doc/sisu/CHANGELOG_v3 | 6 + data/doc/sisu/CHANGELOG_v4 | 26 + .../markup-samples/sisu_manual/_sisu/v2/sisurc.yml | 132 - .../markup-samples/sisu_manual/_sisu/v4/sisurc.yml | 134 + data/sisu/v2/conf/cgi-bin/sisu_search_pgsql.cgi | 904 --- data/sisu/v2/conf/cgi-bin/sisu_search_sqlite.cgi | 901 --- data/sisu/v2/conf/completion/README | 7 - data/sisu/v2/conf/completion/_sisu | 64 - data/sisu/v2/conf/convert/kdissert_to_sisu | 161 - data/sisu/v2/conf/convert/modify.rb | 272 - data/sisu/v2/conf/convert/sisu_convert | 519 -- data/sisu/v2/conf/convert/wvHtml.xml | 388 -- data/sisu/v2/conf/convert/wvSiSU.xml | 360 -- data/sisu/v2/conf/editor-syntax-etc/README | 90 - .../conf/editor-syntax-etc/diakonos/diakonos.conf | 1159 ---- data/sisu/v2/conf/editor-syntax-etc/emacs/README | 5 - .../v2/conf/editor-syntax-etc/emacs/sisu-mode.el | 360 -- .../sisu/v2/conf/editor-syntax-etc/gedit/sisu.lang | 128 - data/sisu/v2/conf/editor-syntax-etc/kate/sisu.xml | 178 - data/sisu/v2/conf/editor-syntax-etc/nano/nanorc | 221 - .../conf/editor-syntax-etc/nedit/sisu_nedit.pats | 79 - .../v2/conf/editor-syntax-etc/vim/colors/8.vim | 65 - .../vim/colors/frugal-cterm-ruby.vim | 65 - .../vim/colors/frugal-cterm-sisu.vim | 65 - .../conf/editor-syntax-etc/vim/colors/frugal.vim | 65 - .../v2/conf/editor-syntax-etc/vim/colors/slate.vim | 75 - .../vim/colors/sparse-cterm-ruby.vim | 65 - .../vim/colors/sparse-cterm-sisu.vim | 65 - .../v2/conf/editor-syntax-etc/vim/filetype.vim | 8 - .../conf/editor-syntax-etc/vim/ftplugin/sisu.vim | 182 - .../v2/conf/editor-syntax-etc/vim/syntax/sisu.vim | 214 - .../conf/editor-syntax-etc/vim/templates/ssi.tpl | 40 - .../conf/editor-syntax-etc/vim/templates/ssm.tpl | 40 - .../conf/editor-syntax-etc/vim/templates/sst.tpl | 40 - .../v2/conf/editor-syntax-etc/vim/vim-sisu.yaml | 7 - data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu | 115 - data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu_www | 115 - data/sisu/v2/conf/ruby/irbrc | 19 - data/sisu/v2/v/version.yml | 5 - data/sisu/v4/conf/cgi-bin/sisu_search_pgsql.cgi | 904 +++ data/sisu/v4/conf/cgi-bin/sisu_search_sqlite.cgi | 901 +++ data/sisu/v4/conf/completion/README | 7 + data/sisu/v4/conf/completion/_sisu | 64 + data/sisu/v4/conf/convert/kdissert_to_sisu | 161 + data/sisu/v4/conf/convert/modify.rb | 376 ++ data/sisu/v4/conf/convert/sisu_convert | 519 ++ data/sisu/v4/conf/convert/wvHtml.xml | 388 ++ data/sisu/v4/conf/convert/wvSiSU.xml | 360 ++ data/sisu/v4/conf/editor-syntax-etc/README | 90 + .../conf/editor-syntax-etc/diakonos/diakonos.conf | 1159 ++++ data/sisu/v4/conf/editor-syntax-etc/emacs/README | 5 + .../v4/conf/editor-syntax-etc/emacs/sisu-mode.el | 368 ++ .../sisu/v4/conf/editor-syntax-etc/gedit/sisu.lang | 128 + data/sisu/v4/conf/editor-syntax-etc/kate/sisu.xml | 178 + data/sisu/v4/conf/editor-syntax-etc/nano/nanorc | 221 + .../conf/editor-syntax-etc/nedit/sisu_nedit.pats | 79 + .../v4/conf/editor-syntax-etc/vim/colors/8.vim | 65 + .../vim/colors/frugal-cterm-ruby.vim | 65 + .../vim/colors/frugal-cterm-sisu.vim | 65 + .../conf/editor-syntax-etc/vim/colors/frugal.vim | 65 + .../v4/conf/editor-syntax-etc/vim/colors/slate.vim | 75 + .../vim/colors/sparse-cterm-ruby.vim | 65 + .../vim/colors/sparse-cterm-sisu.vim | 65 + .../v4/conf/editor-syntax-etc/vim/filetype.vim | 8 + .../conf/editor-syntax-etc/vim/ftplugin/sisu.vim | 189 + .../v4/conf/editor-syntax-etc/vim/syntax/sisu.vim | 261 + .../editor-syntax-etc/vim/syntax/sisu_next.vim | 281 + .../conf/editor-syntax-etc/vim/templates/ssi.tpl | 40 + .../conf/editor-syntax-etc/vim/templates/ssm.tpl | 40 + .../conf/editor-syntax-etc/vim/templates/sst.tpl | 40 + .../v4/conf/editor-syntax-etc/vim/vim-sisu.yaml | 7 + data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu | 115 + data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu_www | 115 + data/sisu/v4/conf/ruby/irbrc | 19 + data/sisu/v4/v/version.yml | 5 + lib/sisu/v2/air.rb | 85 - lib/sisu/v2/author_format.rb | 113 - lib/sisu/v2/cgi.rb | 84 - lib/sisu/v2/cgi_pgsql.rb | 230 - lib/sisu/v2/cgi_sql_common.rb | 992 ---- lib/sisu/v2/cgi_sqlite.rb | 216 - lib/sisu/v2/character_encoding.rb | 379 -- lib/sisu/v2/composite.rb | 236 - lib/sisu/v2/concordance.rb | 340 -- lib/sisu/v2/conf.rb | 249 - lib/sisu/v2/constants.rb | 204 - lib/sisu/v2/css.rb | 2083 ------- lib/sisu/v2/dal.rb | 475 -- lib/sisu/v2/dal_character_check.rb | 104 - lib/sisu/v2/dal_doc_objects.rb | 425 -- lib/sisu/v2/dal_doc_str.rb | 1184 ---- lib/sisu/v2/dal_endnotes.rb | 125 - lib/sisu/v2/dal_expand_insertions.rb | 198 - lib/sisu/v2/dal_hash_digest.rb | 155 - lib/sisu/v2/dal_idx.rb | 357 -- lib/sisu/v2/dal_images.rb | 156 - lib/sisu/v2/dal_metadata.rb | 79 - lib/sisu/v2/dal_numbering.rb | 459 -- lib/sisu/v2/dal_substitutions_and_insertions.rb | 154 - lib/sisu/v2/dal_syntax.rb | 522 -- lib/sisu/v2/db_columns.rb | 2079 ------- lib/sisu/v2/db_create.rb | 612 -- lib/sisu/v2/db_dbi.rb | 93 - lib/sisu/v2/db_drop.rb | 187 - lib/sisu/v2/db_import.rb | 649 --- lib/sisu/v2/db_indexes.rb | 113 - lib/sisu/v2/db_load_tuple.rb | 331 -- lib/sisu/v2/db_remove.rb | 109 - lib/sisu/v2/db_select.rb | 209 - lib/sisu/v2/db_sqltxt.rb | 134 - lib/sisu/v2/db_tests.rb | 117 - lib/sisu/v2/dbi.rb | 143 - lib/sisu/v2/defaults.rb | 2254 -------- lib/sisu/v2/digests.rb | 388 -- lib/sisu/v2/embedded.rb | 139 - lib/sisu/v2/epub.rb | 678 --- lib/sisu/v2/epub_concordance.rb | 312 - lib/sisu/v2/epub_format.rb | 2083 ------- lib/sisu/v2/epub_segments.rb | 527 -- lib/sisu/v2/epub_tune.rb | 416 -- lib/sisu/v2/errors.rb | 81 - lib/sisu/v2/git.rb | 230 - lib/sisu/v2/harvest.rb | 101 - lib/sisu/v2/harvest_authors.rb | 316 - lib/sisu/v2/harvest_topics.rb | 559 -- lib/sisu/v2/help.rb | 1901 ------- lib/sisu/v2/html.rb | 641 --- lib/sisu/v2/html_format.rb | 1423 ----- lib/sisu/v2/html_minitoc.rb | 198 - lib/sisu/v2/html_promo.rb | 434 -- lib/sisu/v2/html_scroll.rb | 200 - lib/sisu/v2/html_segments.rb | 537 -- lib/sisu/v2/html_table.rb | 65 - lib/sisu/v2/html_tune.rb | 371 -- lib/sisu/v2/hub.rb | 580 -- lib/sisu/v2/i18n.rb | 1781 ------ lib/sisu/v2/manifest.rb | 713 --- lib/sisu/v2/manpage.rb | 420 -- lib/sisu/v2/manpage_format.rb | 108 - lib/sisu/v2/odf.rb | 735 --- lib/sisu/v2/odf_format.rb | 468 -- lib/sisu/v2/options.rb | 217 - lib/sisu/v2/param.rb | 1377 ----- lib/sisu/v2/param_identify_markup.rb | 168 - lib/sisu/v2/particulars.rb | 197 - lib/sisu/v2/plaintext.rb | 419 -- lib/sisu/v2/plaintext_format.rb | 113 - lib/sisu/v2/relaxng.rb | 1163 ---- lib/sisu/v2/remote.rb | 211 - lib/sisu/v2/response.rb | 75 - lib/sisu/v2/rexml.rb | 123 - lib/sisu/v2/screen_text_color.rb | 414 -- lib/sisu/v2/share_src.rb | 96 - lib/sisu/v2/share_src_kdissert.rb | 88 - lib/sisu/v2/shared_html.rb | 65 - lib/sisu/v2/shared_html_lite.rb | 316 - lib/sisu/v2/shared_markup_alt.rb | 318 -- lib/sisu/v2/shared_metadata.rb | 800 --- lib/sisu/v2/shared_sem.rb | 156 - lib/sisu/v2/shared_txt.rb | 232 - lib/sisu/v2/shared_xhtml.rb | 65 - lib/sisu/v2/shared_xml.rb | 706 --- lib/sisu/v2/sisupod_make.rb | 338 -- lib/sisu/v2/sitemaps.rb | 219 - lib/sisu/v2/spell.rb | 101 - lib/sisu/v2/sst_convert_markup.rb | 318 -- lib/sisu/v2/sst_do_inline_footnotes.rb | 471 -- lib/sisu/v2/sst_from_xml.rb | 169 - lib/sisu/v2/sst_identify_markup.rb | 474 -- lib/sisu/v2/sst_to_s_xml_sax.rb | 444 -- lib/sisu/v2/sysenv.rb | 3366 ----------- lib/sisu/v2/termsheet.rb | 166 - lib/sisu/v2/texinfo.rb | 386 -- lib/sisu/v2/texinfo_format.rb | 587 -- lib/sisu/v2/texpdf.rb | 830 --- lib/sisu/v2/texpdf_format.rb | 1377 ----- lib/sisu/v2/update.rb | 130 - lib/sisu/v2/urls.rb | 279 - lib/sisu/v2/webrick.rb | 176 - lib/sisu/v2/wikispeak.rb | 374 -- lib/sisu/v2/xhtml.rb | 408 -- lib/sisu/v2/xhtml_table.rb | 99 - lib/sisu/v2/xml.rb | 443 -- lib/sisu/v2/xml_dom.rb | 524 -- lib/sisu/v2/xml_fictionbook.rb | 300 - lib/sisu/v2/xml_format.rb | 1644 ------ lib/sisu/v2/xml_md_oai_pmh_dc.rb | 230 - lib/sisu/v2/xml_scaffold.rb | 199 - lib/sisu/v2/xml_tables.rb | 203 - lib/sisu/v2/zap.rb | 83 - lib/sisu/v4/air.rb | 81 + lib/sisu/v4/author_format.rb | 112 + lib/sisu/v4/cgi.rb | 82 + lib/sisu/v4/cgi_pgsql.rb | 227 + lib/sisu/v4/cgi_sql_common.rb | 1073 ++++ lib/sisu/v4/cgi_sqlite.rb | 214 + lib/sisu/v4/composite.rb | 280 + lib/sisu/v4/concordance.rb | 376 ++ lib/sisu/v4/conf.rb | 254 + lib/sisu/v4/constants.rb | 294 + lib/sisu/v4/css.rb | 3423 +++++++++++ lib/sisu/v4/dal.rb | 510 ++ lib/sisu/v4/dal_character_check.rb | 103 + lib/sisu/v4/dal_doc_objects.rb | 445 ++ lib/sisu/v4/dal_doc_str.rb | 1044 ++++ lib/sisu/v4/dal_endnotes.rb | 124 + lib/sisu/v4/dal_expand_insertions.rb | 378 ++ lib/sisu/v4/dal_hash_digest.rb | 155 + lib/sisu/v4/dal_idx.rb | 367 ++ lib/sisu/v4/dal_images.rb | 157 + lib/sisu/v4/dal_metadata.rb | 78 + lib/sisu/v4/dal_numbering.rb | 469 ++ lib/sisu/v4/dal_substitutions_and_insertions.rb | 155 + lib/sisu/v4/dal_syntax.rb | 604 ++ lib/sisu/v4/db_columns.rb | 2107 +++++++ lib/sisu/v4/db_create.rb | 622 ++ lib/sisu/v4/db_dbi.rb | 92 + lib/sisu/v4/db_drop.rb | 190 + lib/sisu/v4/db_import.rb | 714 +++ lib/sisu/v4/db_indexes.rb | 113 + lib/sisu/v4/db_load_tuple.rb | 332 ++ lib/sisu/v4/db_remove.rb | 120 + lib/sisu/v4/db_select.rb | 223 + lib/sisu/v4/db_sqltxt.rb | 129 + lib/sisu/v4/db_tests.rb | 116 + lib/sisu/v4/dbi.rb | 142 + lib/sisu/v4/dbi_discreet.rb | 182 + lib/sisu/v4/defaults.rb | 2192 +++++++ lib/sisu/v4/digests.rb | 390 ++ lib/sisu/v4/embedded.rb | 144 + lib/sisu/v4/epub.rb | 679 +++ lib/sisu/v4/epub_concordance.rb | 324 ++ lib/sisu/v4/epub_format.rb | 2190 +++++++ lib/sisu/v4/epub_segments.rb | 535 ++ lib/sisu/v4/epub_tune.rb | 409 ++ lib/sisu/v4/errors.rb | 85 + lib/sisu/v4/git.rb | 282 + lib/sisu/v4/harvest.rb | 112 + lib/sisu/v4/harvest_authors.rb | 387 ++ lib/sisu/v4/harvest_topics.rb | 808 +++ lib/sisu/v4/help.rb | 1911 +++++++ lib/sisu/v4/html.rb | 678 +++ lib/sisu/v4/html_format.rb | 1399 +++++ lib/sisu/v4/html_minitoc.rb | 202 + lib/sisu/v4/html_promo.rb | 444 ++ lib/sisu/v4/html_scroll.rb | 218 + lib/sisu/v4/html_segments.rb | 618 ++ lib/sisu/v4/html_table.rb | 64 + lib/sisu/v4/html_tune.rb | 375 ++ lib/sisu/v4/hub.rb | 713 +++ lib/sisu/v4/i18n.rb | 697 +++ lib/sisu/v4/manifest.rb | 909 +++ lib/sisu/v4/manpage.rb | 432 ++ lib/sisu/v4/manpage_format.rb | 102 + lib/sisu/v4/odf.rb | 819 +++ lib/sisu/v4/odf_format.rb | 658 +++ lib/sisu/v4/options.rb | 876 +++ lib/sisu/v4/param.rb | 1675 ++++++ lib/sisu/v4/param_identify_markup.rb | 167 + lib/sisu/v4/particulars.rb | 239 + lib/sisu/v4/plaintext.rb | 434 ++ lib/sisu/v4/plaintext_format.rb | 112 + lib/sisu/v4/po4a.rb | 986 ++++ lib/sisu/v4/po4a_set.rb | 299 + lib/sisu/v4/prog_text_translation.rb | 1703 ++++++ lib/sisu/v4/qrcode.rb | 745 +++ lib/sisu/v4/relaxng.rb | 1160 ++++ lib/sisu/v4/remote.rb | 210 + lib/sisu/v4/response.rb | 74 + lib/sisu/v4/rexml.rb | 123 + lib/sisu/v4/screen_text_color.rb | 474 ++ lib/sisu/v4/share_src.rb | 88 + lib/sisu/v4/share_src_kdissert.rb | 87 + lib/sisu/v4/shared_html.rb | 64 + lib/sisu/v4/shared_html_lite.rb | 321 ++ lib/sisu/v4/shared_images.rb | 173 + lib/sisu/v4/shared_markup_alt.rb | 321 ++ lib/sisu/v4/shared_metadata.rb | 1360 +++++ lib/sisu/v4/shared_sem.rb | 158 + lib/sisu/v4/shared_sisupod_source.rb | 376 ++ lib/sisu/v4/shared_txt.rb | 231 + lib/sisu/v4/shared_xhtml.rb | 64 + lib/sisu/v4/shared_xml.rb | 717 +++ lib/sisu/v4/sisupod_make.rb | 161 + lib/sisu/v4/sitemaps.rb | 216 + lib/sisu/v4/spell.rb | 100 + lib/sisu/v4/sst_convert_markup.rb | 311 + lib/sisu/v4/sst_do_inline_footnotes.rb | 476 ++ lib/sisu/v4/sst_from_xml.rb | 168 + lib/sisu/v4/sst_identify_markup.rb | 483 ++ lib/sisu/v4/sst_to_s_xml_sax.rb | 458 ++ lib/sisu/v4/sysenv.rb | 6015 ++++++++++++++++++++ lib/sisu/v4/termsheet.rb | 165 + lib/sisu/v4/texinfo.rb | 417 ++ lib/sisu/v4/texinfo_format.rb | 572 ++ lib/sisu/v4/texpdf.rb | 979 ++++ lib/sisu/v4/texpdf_format.rb | 1579 +++++ lib/sisu/v4/update.rb | 138 + lib/sisu/v4/urls.rb | 442 ++ lib/sisu/v4/webrick.rb | 185 + lib/sisu/v4/wikispeak.rb | 375 ++ lib/sisu/v4/xhtml.rb | 438 ++ lib/sisu/v4/xhtml_table.rb | 98 + lib/sisu/v4/xml.rb | 472 ++ lib/sisu/v4/xml_dom.rb | 548 ++ lib/sisu/v4/xml_fictionbook.rb | 302 + lib/sisu/v4/xml_format.rb | 1420 +++++ lib/sisu/v4/xml_md_oai_pmh_dc.rb | 229 + lib/sisu/v4/xml_scaffold.rb | 201 + lib/sisu/v4/xml_tables.rb | 198 + lib/sisu/v4/zap.rb | 82 + man/man1/sisu-concordance.1 | 6 +- man/man1/sisu-epub.1 | 6 +- man/man1/sisu-git.1 | 39 - man/man1/sisu-harvest.1 | 6 +- man/man1/sisu-html.1 | 6 +- man/man1/sisu-odf.1 | 6 +- man/man1/sisu-pdf.1 | 6 +- man/man1/sisu-pg.1 | 6 +- man/man1/sisu-po.1 | 42 - man/man1/sisu-sqlite.1 | 6 +- man/man1/sisu-txt.1 | 6 +- man/man1/sisu-webrick.1 | 117 + man/man1/sisu.1 | 2 +- man/man1/sisu2.1 | 1 - man/man1/sisu4.1 | 1 + man/man1/sisu_termsheet.1 | 66 - man/man1/sisu_webrick.1 | 117 - 350 files changed, 73471 insertions(+), 62796 deletions(-) create mode 120000 CHANGELOGS/CHANGELOG_v1 create mode 120000 CHANGELOGS/CHANGELOG_v2 create mode 120000 CHANGELOGS/CHANGELOG_v3 create mode 120000 CHANGELOGS/CHANGELOG_v4 delete mode 120000 CHANGELOG_v1 delete mode 120000 CHANGELOG_v2 delete mode 120000 CHANGELOG_v3 delete mode 100644 bin/sisu-git delete mode 100644 bin/sisu-po create mode 100644 bin/sisu-webrick delete mode 100644 bin/sisu2 create mode 100644 bin/sisu4 delete mode 100644 bin/sisu_termsheet delete mode 100644 bin/sisu_webrick delete mode 100644 conf/sisu/v2/sisurc.yml create mode 100644 conf/sisu/v4/sisurc.yml create mode 100644 data/doc/sisu/CHANGELOG_v4 delete mode 100644 data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml create mode 100644 data/doc/sisu/markup-samples/sisu_manual/_sisu/v4/sisurc.yml delete mode 100644 data/sisu/v2/conf/cgi-bin/sisu_search_pgsql.cgi delete mode 100644 data/sisu/v2/conf/cgi-bin/sisu_search_sqlite.cgi delete mode 100644 data/sisu/v2/conf/completion/README delete mode 100644 data/sisu/v2/conf/completion/_sisu delete mode 100644 data/sisu/v2/conf/convert/kdissert_to_sisu delete mode 100644 data/sisu/v2/conf/convert/modify.rb delete mode 100644 data/sisu/v2/conf/convert/sisu_convert delete mode 100644 data/sisu/v2/conf/convert/wvHtml.xml delete mode 100644 data/sisu/v2/conf/convert/wvSiSU.xml delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/README delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/diakonos/diakonos.conf delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/emacs/README delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/emacs/sisu-mode.el delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/gedit/sisu.lang delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/kate/sisu.xml delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/nano/nanorc delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/nedit/sisu_nedit.pats delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/filetype.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/ftplugin/sisu.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/templates/ssi.tpl delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/templates/ssm.tpl delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/templates/sst.tpl delete mode 100644 data/sisu/v2/conf/editor-syntax-etc/vim/vim-sisu.yaml delete mode 100644 data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu delete mode 100644 data/sisu/v2/conf/lighttpd/lighttpd.cfg.sisu_www delete mode 100644 data/sisu/v2/conf/ruby/irbrc delete mode 100644 data/sisu/v2/v/version.yml create mode 100644 data/sisu/v4/conf/cgi-bin/sisu_search_pgsql.cgi create mode 100644 data/sisu/v4/conf/cgi-bin/sisu_search_sqlite.cgi create mode 100644 data/sisu/v4/conf/completion/README create mode 100644 data/sisu/v4/conf/completion/_sisu create mode 100644 data/sisu/v4/conf/convert/kdissert_to_sisu create mode 100644 data/sisu/v4/conf/convert/modify.rb create mode 100644 data/sisu/v4/conf/convert/sisu_convert create mode 100644 data/sisu/v4/conf/convert/wvHtml.xml create mode 100644 data/sisu/v4/conf/convert/wvSiSU.xml create mode 100644 data/sisu/v4/conf/editor-syntax-etc/README create mode 100644 data/sisu/v4/conf/editor-syntax-etc/diakonos/diakonos.conf create mode 100644 data/sisu/v4/conf/editor-syntax-etc/emacs/README create mode 100644 data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el create mode 100644 data/sisu/v4/conf/editor-syntax-etc/gedit/sisu.lang create mode 100644 data/sisu/v4/conf/editor-syntax-etc/kate/sisu.xml create mode 100644 data/sisu/v4/conf/editor-syntax-etc/nano/nanorc create mode 100644 data/sisu/v4/conf/editor-syntax-etc/nedit/sisu_nedit.pats create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/filetype.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/syntax/sisu.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/syntax/sisu_next.vim create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssi.tpl create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssm.tpl create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/templates/sst.tpl create mode 100644 data/sisu/v4/conf/editor-syntax-etc/vim/vim-sisu.yaml create mode 100644 data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu create mode 100644 data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu_www create mode 100644 data/sisu/v4/conf/ruby/irbrc create mode 100644 data/sisu/v4/v/version.yml delete mode 100644 lib/sisu/v2/air.rb delete mode 100644 lib/sisu/v2/author_format.rb delete mode 100644 lib/sisu/v2/cgi.rb delete mode 100644 lib/sisu/v2/cgi_pgsql.rb delete mode 100644 lib/sisu/v2/cgi_sql_common.rb delete mode 100644 lib/sisu/v2/cgi_sqlite.rb delete mode 100644 lib/sisu/v2/character_encoding.rb delete mode 100644 lib/sisu/v2/composite.rb delete mode 100644 lib/sisu/v2/concordance.rb delete mode 100644 lib/sisu/v2/conf.rb delete mode 100644 lib/sisu/v2/constants.rb delete mode 100644 lib/sisu/v2/css.rb delete mode 100644 lib/sisu/v2/dal.rb delete mode 100644 lib/sisu/v2/dal_character_check.rb delete mode 100644 lib/sisu/v2/dal_doc_objects.rb delete mode 100644 lib/sisu/v2/dal_doc_str.rb delete mode 100644 lib/sisu/v2/dal_endnotes.rb delete mode 100644 lib/sisu/v2/dal_expand_insertions.rb delete mode 100644 lib/sisu/v2/dal_hash_digest.rb delete mode 100644 lib/sisu/v2/dal_idx.rb delete mode 100644 lib/sisu/v2/dal_images.rb delete mode 100644 lib/sisu/v2/dal_metadata.rb delete mode 100644 lib/sisu/v2/dal_numbering.rb delete mode 100644 lib/sisu/v2/dal_substitutions_and_insertions.rb delete mode 100644 lib/sisu/v2/dal_syntax.rb delete mode 100644 lib/sisu/v2/db_columns.rb delete mode 100644 lib/sisu/v2/db_create.rb delete mode 100644 lib/sisu/v2/db_dbi.rb delete mode 100644 lib/sisu/v2/db_drop.rb delete mode 100644 lib/sisu/v2/db_import.rb delete mode 100644 lib/sisu/v2/db_indexes.rb delete mode 100644 lib/sisu/v2/db_load_tuple.rb delete mode 100644 lib/sisu/v2/db_remove.rb delete mode 100644 lib/sisu/v2/db_select.rb delete mode 100644 lib/sisu/v2/db_sqltxt.rb delete mode 100644 lib/sisu/v2/db_tests.rb delete mode 100644 lib/sisu/v2/dbi.rb delete mode 100644 lib/sisu/v2/defaults.rb delete mode 100644 lib/sisu/v2/digests.rb delete mode 100644 lib/sisu/v2/embedded.rb delete mode 100644 lib/sisu/v2/epub.rb delete mode 100644 lib/sisu/v2/epub_concordance.rb delete mode 100644 lib/sisu/v2/epub_format.rb delete mode 100644 lib/sisu/v2/epub_segments.rb delete mode 100644 lib/sisu/v2/epub_tune.rb delete mode 100644 lib/sisu/v2/errors.rb delete mode 100644 lib/sisu/v2/git.rb delete mode 100644 lib/sisu/v2/harvest.rb delete mode 100644 lib/sisu/v2/harvest_authors.rb delete mode 100644 lib/sisu/v2/harvest_topics.rb delete mode 100644 lib/sisu/v2/help.rb delete mode 100644 lib/sisu/v2/html.rb delete mode 100644 lib/sisu/v2/html_format.rb delete mode 100644 lib/sisu/v2/html_minitoc.rb delete mode 100644 lib/sisu/v2/html_promo.rb delete mode 100644 lib/sisu/v2/html_scroll.rb delete mode 100644 lib/sisu/v2/html_segments.rb delete mode 100644 lib/sisu/v2/html_table.rb delete mode 100644 lib/sisu/v2/html_tune.rb delete mode 100644 lib/sisu/v2/hub.rb delete mode 100644 lib/sisu/v2/i18n.rb delete mode 100644 lib/sisu/v2/manifest.rb delete mode 100644 lib/sisu/v2/manpage.rb delete mode 100644 lib/sisu/v2/manpage_format.rb delete mode 100644 lib/sisu/v2/odf.rb delete mode 100644 lib/sisu/v2/odf_format.rb delete mode 100644 lib/sisu/v2/options.rb delete mode 100644 lib/sisu/v2/param.rb delete mode 100644 lib/sisu/v2/param_identify_markup.rb delete mode 100644 lib/sisu/v2/particulars.rb delete mode 100644 lib/sisu/v2/plaintext.rb delete mode 100644 lib/sisu/v2/plaintext_format.rb delete mode 100644 lib/sisu/v2/relaxng.rb delete mode 100644 lib/sisu/v2/remote.rb delete mode 100644 lib/sisu/v2/response.rb delete mode 100644 lib/sisu/v2/rexml.rb delete mode 100644 lib/sisu/v2/screen_text_color.rb delete mode 100644 lib/sisu/v2/share_src.rb delete mode 100644 lib/sisu/v2/share_src_kdissert.rb delete mode 100644 lib/sisu/v2/shared_html.rb delete mode 100644 lib/sisu/v2/shared_html_lite.rb delete mode 100644 lib/sisu/v2/shared_markup_alt.rb delete mode 100644 lib/sisu/v2/shared_metadata.rb delete mode 100644 lib/sisu/v2/shared_sem.rb delete mode 100644 lib/sisu/v2/shared_txt.rb delete mode 100644 lib/sisu/v2/shared_xhtml.rb delete mode 100644 lib/sisu/v2/shared_xml.rb delete mode 100644 lib/sisu/v2/sisupod_make.rb delete mode 100644 lib/sisu/v2/sitemaps.rb delete mode 100644 lib/sisu/v2/spell.rb delete mode 100644 lib/sisu/v2/sst_convert_markup.rb delete mode 100644 lib/sisu/v2/sst_do_inline_footnotes.rb delete mode 100644 lib/sisu/v2/sst_from_xml.rb delete mode 100644 lib/sisu/v2/sst_identify_markup.rb delete mode 100644 lib/sisu/v2/sst_to_s_xml_sax.rb delete mode 100644 lib/sisu/v2/sysenv.rb delete mode 100644 lib/sisu/v2/termsheet.rb delete mode 100644 lib/sisu/v2/texinfo.rb delete mode 100644 lib/sisu/v2/texinfo_format.rb delete mode 100644 lib/sisu/v2/texpdf.rb delete mode 100644 lib/sisu/v2/texpdf_format.rb delete mode 100644 lib/sisu/v2/update.rb delete mode 100644 lib/sisu/v2/urls.rb delete mode 100644 lib/sisu/v2/webrick.rb delete mode 100644 lib/sisu/v2/wikispeak.rb delete mode 100644 lib/sisu/v2/xhtml.rb delete mode 100644 lib/sisu/v2/xhtml_table.rb delete mode 100644 lib/sisu/v2/xml.rb delete mode 100644 lib/sisu/v2/xml_dom.rb delete mode 100644 lib/sisu/v2/xml_fictionbook.rb delete mode 100644 lib/sisu/v2/xml_format.rb delete mode 100644 lib/sisu/v2/xml_md_oai_pmh_dc.rb delete mode 100644 lib/sisu/v2/xml_scaffold.rb delete mode 100644 lib/sisu/v2/xml_tables.rb delete mode 100644 lib/sisu/v2/zap.rb create mode 100644 lib/sisu/v4/air.rb create mode 100644 lib/sisu/v4/author_format.rb create mode 100644 lib/sisu/v4/cgi.rb create mode 100644 lib/sisu/v4/cgi_pgsql.rb create mode 100644 lib/sisu/v4/cgi_sql_common.rb create mode 100644 lib/sisu/v4/cgi_sqlite.rb create mode 100644 lib/sisu/v4/composite.rb create mode 100644 lib/sisu/v4/concordance.rb create mode 100644 lib/sisu/v4/conf.rb create mode 100644 lib/sisu/v4/constants.rb create mode 100644 lib/sisu/v4/css.rb create mode 100644 lib/sisu/v4/dal.rb create mode 100644 lib/sisu/v4/dal_character_check.rb create mode 100644 lib/sisu/v4/dal_doc_objects.rb create mode 100644 lib/sisu/v4/dal_doc_str.rb create mode 100644 lib/sisu/v4/dal_endnotes.rb create mode 100644 lib/sisu/v4/dal_expand_insertions.rb create mode 100644 lib/sisu/v4/dal_hash_digest.rb create mode 100644 lib/sisu/v4/dal_idx.rb create mode 100644 lib/sisu/v4/dal_images.rb create mode 100644 lib/sisu/v4/dal_metadata.rb create mode 100644 lib/sisu/v4/dal_numbering.rb create mode 100644 lib/sisu/v4/dal_substitutions_and_insertions.rb create mode 100644 lib/sisu/v4/dal_syntax.rb create mode 100644 lib/sisu/v4/db_columns.rb create mode 100644 lib/sisu/v4/db_create.rb create mode 100644 lib/sisu/v4/db_dbi.rb create mode 100644 lib/sisu/v4/db_drop.rb create mode 100644 lib/sisu/v4/db_import.rb create mode 100644 lib/sisu/v4/db_indexes.rb create mode 100644 lib/sisu/v4/db_load_tuple.rb create mode 100644 lib/sisu/v4/db_remove.rb create mode 100644 lib/sisu/v4/db_select.rb create mode 100644 lib/sisu/v4/db_sqltxt.rb create mode 100644 lib/sisu/v4/db_tests.rb create mode 100644 lib/sisu/v4/dbi.rb create mode 100644 lib/sisu/v4/dbi_discreet.rb create mode 100644 lib/sisu/v4/defaults.rb create mode 100644 lib/sisu/v4/digests.rb create mode 100644 lib/sisu/v4/embedded.rb create mode 100644 lib/sisu/v4/epub.rb create mode 100644 lib/sisu/v4/epub_concordance.rb create mode 100644 lib/sisu/v4/epub_format.rb create mode 100644 lib/sisu/v4/epub_segments.rb create mode 100644 lib/sisu/v4/epub_tune.rb create mode 100644 lib/sisu/v4/errors.rb create mode 100644 lib/sisu/v4/git.rb create mode 100644 lib/sisu/v4/harvest.rb create mode 100644 lib/sisu/v4/harvest_authors.rb create mode 100644 lib/sisu/v4/harvest_topics.rb create mode 100644 lib/sisu/v4/help.rb create mode 100644 lib/sisu/v4/html.rb create mode 100644 lib/sisu/v4/html_format.rb create mode 100644 lib/sisu/v4/html_minitoc.rb create mode 100644 lib/sisu/v4/html_promo.rb create mode 100644 lib/sisu/v4/html_scroll.rb create mode 100644 lib/sisu/v4/html_segments.rb create mode 100644 lib/sisu/v4/html_table.rb create mode 100644 lib/sisu/v4/html_tune.rb create mode 100644 lib/sisu/v4/hub.rb create mode 100644 lib/sisu/v4/i18n.rb create mode 100644 lib/sisu/v4/manifest.rb create mode 100644 lib/sisu/v4/manpage.rb create mode 100644 lib/sisu/v4/manpage_format.rb create mode 100644 lib/sisu/v4/odf.rb create mode 100644 lib/sisu/v4/odf_format.rb create mode 100644 lib/sisu/v4/options.rb create mode 100644 lib/sisu/v4/param.rb create mode 100644 lib/sisu/v4/param_identify_markup.rb create mode 100644 lib/sisu/v4/particulars.rb create mode 100644 lib/sisu/v4/plaintext.rb create mode 100644 lib/sisu/v4/plaintext_format.rb create mode 100644 lib/sisu/v4/po4a.rb create mode 100644 lib/sisu/v4/po4a_set.rb create mode 100644 lib/sisu/v4/prog_text_translation.rb create mode 100644 lib/sisu/v4/qrcode.rb create mode 100644 lib/sisu/v4/relaxng.rb create mode 100644 lib/sisu/v4/remote.rb create mode 100644 lib/sisu/v4/response.rb create mode 100644 lib/sisu/v4/rexml.rb create mode 100644 lib/sisu/v4/screen_text_color.rb create mode 100644 lib/sisu/v4/share_src.rb create mode 100644 lib/sisu/v4/share_src_kdissert.rb create mode 100644 lib/sisu/v4/shared_html.rb create mode 100644 lib/sisu/v4/shared_html_lite.rb create mode 100644 lib/sisu/v4/shared_images.rb create mode 100644 lib/sisu/v4/shared_markup_alt.rb create mode 100644 lib/sisu/v4/shared_metadata.rb create mode 100644 lib/sisu/v4/shared_sem.rb create mode 100644 lib/sisu/v4/shared_sisupod_source.rb create mode 100644 lib/sisu/v4/shared_txt.rb create mode 100644 lib/sisu/v4/shared_xhtml.rb create mode 100644 lib/sisu/v4/shared_xml.rb create mode 100644 lib/sisu/v4/sisupod_make.rb create mode 100644 lib/sisu/v4/sitemaps.rb create mode 100644 lib/sisu/v4/spell.rb create mode 100644 lib/sisu/v4/sst_convert_markup.rb create mode 100644 lib/sisu/v4/sst_do_inline_footnotes.rb create mode 100644 lib/sisu/v4/sst_from_xml.rb create mode 100644 lib/sisu/v4/sst_identify_markup.rb create mode 100644 lib/sisu/v4/sst_to_s_xml_sax.rb create mode 100644 lib/sisu/v4/sysenv.rb create mode 100644 lib/sisu/v4/termsheet.rb create mode 100644 lib/sisu/v4/texinfo.rb create mode 100644 lib/sisu/v4/texinfo_format.rb create mode 100644 lib/sisu/v4/texpdf.rb create mode 100644 lib/sisu/v4/texpdf_format.rb create mode 100644 lib/sisu/v4/update.rb create mode 100644 lib/sisu/v4/urls.rb create mode 100644 lib/sisu/v4/webrick.rb create mode 100644 lib/sisu/v4/wikispeak.rb create mode 100644 lib/sisu/v4/xhtml.rb create mode 100644 lib/sisu/v4/xhtml_table.rb create mode 100644 lib/sisu/v4/xml.rb create mode 100644 lib/sisu/v4/xml_dom.rb create mode 100644 lib/sisu/v4/xml_fictionbook.rb create mode 100644 lib/sisu/v4/xml_format.rb create mode 100644 lib/sisu/v4/xml_md_oai_pmh_dc.rb create mode 100644 lib/sisu/v4/xml_scaffold.rb create mode 100644 lib/sisu/v4/xml_tables.rb create mode 100644 lib/sisu/v4/zap.rb delete mode 100644 man/man1/sisu-git.1 delete mode 100644 man/man1/sisu-po.1 create mode 100644 man/man1/sisu-webrick.1 delete mode 120000 man/man1/sisu2.1 create mode 120000 man/man1/sisu4.1 delete mode 100644 man/man1/sisu_termsheet.1 delete mode 100644 man/man1/sisu_webrick.1 diff --git a/CHANGELOG b/CHANGELOG index c13296bf..49c5462a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,26 +1,30 @@ -%% SiSU versions 2 & 3, 2011 +%% SiSU versions 4 & 3 2012 Homepage: -* README CHANGELOG CHANGELOG_v1 CHANGELOG_v2 CHANGELOG_v3 +* README CHANGELOG CHANGELOG_v1 CHANGELOG_v2 CHANGELOG_v3 CHANGELOG_v4 -Herein (this package) reside SiSU versions 2 and 3. +Herein (this package) reside SiSU versions 4 and 3. -README CHANGELOG_1 CHANGELOG_v2 CHANGELOG_v3 +Changelogs are to be found in the CHANGELOGS directory: -This tarball contains two versions of SiSU, the stable version 2 and the -under-development version 3. For version 1 look to sisu 2.7 and earlier. +CHANGELOGS/CHANGELOG_v4 +CHANGELOGS/CHANGELOG_v3 +CHANGELOGS/CHANGELOG_v2 +CHANGELOGS/CHANGELOG_v1 -The input for v2 & v3, a SiSU marked-up document is the same. +you might also look at the README file -As version 2 is the current implementation the source tarball is named after -it, and the command sisu by default runs version 2. To run version 3 add the -flag --v3, i.e. sisu --v3 [filename], or run sisu3 +* v1 sisu pretty mature in operation and syntax +* v2 introduces new processing middle layer (document abstraction); + markup same except for minor changes to document headers; + epub output introduced +* v3 introduces alternative (configurable) output structures +* v4 retires what were referred to as sisu skins -Compatibility Notes - -Versions 3 is experimental and attempts to introduce output more compatible -with mobile devices and other non-web use and more internationalisation -possibilities. Please see CHANGELOG_v3 +This tarball contains two versions of SiSU, version 4 and version 3 which it +replaced +The input for sisu v2, v3 & v4, a SiSU marked-up document is unchanged apart +from document headers. * homepage at: * diff --git a/CHANGELOGS/CHANGELOG_v1 b/CHANGELOGS/CHANGELOG_v1 new file mode 120000 index 00000000..dce668b5 --- /dev/null +++ b/CHANGELOGS/CHANGELOG_v1 @@ -0,0 +1 @@ +../data/doc/sisu/CHANGELOG_v1 \ No newline at end of file diff --git a/CHANGELOGS/CHANGELOG_v2 b/CHANGELOGS/CHANGELOG_v2 new file mode 120000 index 00000000..e87e244c --- /dev/null +++ b/CHANGELOGS/CHANGELOG_v2 @@ -0,0 +1 @@ +../data/doc/sisu/CHANGELOG_v2 \ No newline at end of file diff --git a/CHANGELOGS/CHANGELOG_v3 b/CHANGELOGS/CHANGELOG_v3 new file mode 120000 index 00000000..5fc15e3e --- /dev/null +++ b/CHANGELOGS/CHANGELOG_v3 @@ -0,0 +1 @@ +../data/doc/sisu/CHANGELOG_v3 \ No newline at end of file diff --git a/CHANGELOGS/CHANGELOG_v4 b/CHANGELOGS/CHANGELOG_v4 new file mode 120000 index 00000000..a587bc66 --- /dev/null +++ b/CHANGELOGS/CHANGELOG_v4 @@ -0,0 +1 @@ +../data/doc/sisu/CHANGELOG_v4 \ No newline at end of file diff --git a/CHANGELOG_v1 b/CHANGELOG_v1 deleted file mode 120000 index feac476b..00000000 --- a/CHANGELOG_v1 +++ /dev/null @@ -1 +0,0 @@ -data/doc/sisu/CHANGELOG_v1 \ No newline at end of file diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 deleted file mode 120000 index 48716b0c..00000000 --- a/CHANGELOG_v2 +++ /dev/null @@ -1 +0,0 @@ -data/doc/sisu/CHANGELOG_v2 \ No newline at end of file diff --git a/CHANGELOG_v3 b/CHANGELOG_v3 deleted file mode 120000 index e29fe00f..00000000 --- a/CHANGELOG_v3 +++ /dev/null @@ -1 +0,0 @@ -data/doc/sisu/CHANGELOG_v3 \ No newline at end of file diff --git a/README b/README index dbf19ecb..4fd0f772 100644 --- a/README +++ b/README @@ -1,8 +1,12 @@ -%% SiSU versions 2 & 3, 2011 +%% SiSU versions 4 & 3, 2011 Homepage: -* README CHANGELOG CHANGELOG_v1 CHANGELOG_v2 CHANGELOG_v3 +* README +* CHANGELOGS/CHANGELOG_v4 +* CHANGELOGS/CHANGELOG_v3 +* CHANGELOGS/CHANGELOG_v2 +* CHANGELOGS/CHANGELOG_v1 -Herein (this package) reside SiSU versions 1 and 2. +Herein (this package) reside SiSU versions 4 and 3. %% Description --------------- @@ -515,19 +519,14 @@ features within the ruby language suited to what the application does. Development is curently on version 2, version 1 is likely to remain for some time as a reference implementation. -%% v1, v2 Compatibility Notes ---------------- - -Versions 1 and 2 are not quite compatible, version 1 and version 2 will run -against each other's documents but document metadata, and processing -instructions may be lost. - -On the input side, version 1 and 2 headers are different, version 2 headers -have been tidied, see document markup samples provided +%% Versions -On the output side, the sql databases produced if search is to be implemented -are not the same and a database must be generated for each version, most other -differences should be relatively cosmetic. +* v1 sisu pretty mature in operation and syntax +* v2 introduces new processing middle layer (document abstraction); + markup same except for minor changes to document headers; + epub output introduced +* v3 introduces alternative (configurable) output structures +* v4 retires what were referred to as sisu skins %% License --------------- diff --git a/bin/sisu b/bin/sisu index f840f8bb..9d27ad6d 100644 --- a/bin/sisu +++ b/bin/sisu @@ -45,24 +45,22 @@ WOK $KCODE='u' if RUBY_VERSION < '1.9' argv=$* SiSU_version_dir=case argv.inspect - when /"(?:--v2)"/ - check_sisu_legacy_ruby_version? - 'v2' when /"(?:--v3)"/ check_sisu_stable_ruby_version? 'v3' + when /"(?:--v4)"/ + check_sisu_stable_ruby_version? + 'v4' when /"(?:--dev)"/ check_sisu_dev_ruby_version? - 'v3' + 'v4' else check_sisu_stable_ruby_version? - 'v3' + 'v4' end SiSU_lib="sisu/#{SiSU_version_dir}" require "#{SiSU_lib}/hub" - unless SiSU_version_dir == 'v2' - SiSU::HubMaster.new(argv) - end + SiSU::HubMaster.new(argv) rescue STDERR.puts 'ERROR' STDERR.puts $! diff --git a/bin/sisu-git b/bin/sisu-git deleted file mode 100644 index d38b10c5..00000000 --- a/bin/sisu-git +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sisu -g ${@} diff --git a/bin/sisu-po b/bin/sisu-po deleted file mode 100644 index 9d0d1b95..00000000 --- a/bin/sisu-po +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sisu --v3 --po4a ${@} diff --git a/bin/sisu-webrick b/bin/sisu-webrick new file mode 100644 index 00000000..75d97238 --- /dev/null +++ b/bin/sisu-webrick @@ -0,0 +1,2 @@ +#!/bin/sh +sisu -W ${@} diff --git a/bin/sisu2 b/bin/sisu2 deleted file mode 100644 index d8aac3dd..00000000 --- a/bin/sisu2 +++ /dev/null @@ -1,136 +0,0 @@ -#!/usr/bin/env ruby -# encoding: utf-8 -#SiSU: copyright (C) 1997 - 2012 Ralph Amissah; License GPL, see appended program information -begin - def ruby_version_ok?(base_version) - @v ||=RUBY_VERSION.scan(/\d+/) - vb=base_version.scan(/\d+/) - if @v[0].to_i < vb[0].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i < vb[1].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i == vb[1].to_i \ - && @v[1].to_i < vb[2].to_i - raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" - else check_incompatible_ruby_build? - end - end - def check_incompatible_ruby_build? - require 'rbconfig' - e=Config::CONFIG - if RUBY_VERSION == '1.9.2' \ - && e['PATCHLEVEL'].to_i < 180 - raise <. - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - diff --git a/bin/sisu3 b/bin/sisu3 index f840f8bb..f479fedc 100644 --- a/bin/sisu3 +++ b/bin/sisu3 @@ -45,24 +45,22 @@ WOK $KCODE='u' if RUBY_VERSION < '1.9' argv=$* SiSU_version_dir=case argv.inspect - when /"(?:--v2)"/ - check_sisu_legacy_ruby_version? - 'v2' when /"(?:--v3)"/ check_sisu_stable_ruby_version? 'v3' + when /"(?:--v4)"/ + check_sisu_stable_ruby_version? + 'v4' when /"(?:--dev)"/ check_sisu_dev_ruby_version? - 'v3' + 'v4' else check_sisu_stable_ruby_version? 'v3' end SiSU_lib="sisu/#{SiSU_version_dir}" require "#{SiSU_lib}/hub" - unless SiSU_version_dir == 'v2' - SiSU::HubMaster.new(argv) - end + SiSU::HubMaster.new(argv) rescue STDERR.puts 'ERROR' STDERR.puts $! diff --git a/bin/sisu4 b/bin/sisu4 new file mode 100644 index 00000000..9d27ad6d --- /dev/null +++ b/bin/sisu4 @@ -0,0 +1,134 @@ +#!/usr/bin/env ruby +# encoding: utf-8 +#SiSU: copyright (C) 1997 - 2012 Ralph Amissah; License GPL, see appended program information +begin + def ruby_version_ok?(base_version) + @v ||=RUBY_VERSION.scan(/\d+/) + vb=base_version.scan(/\d+/) + if @v[0].to_i < vb[0].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i < vb[1].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i == vb[1].to_i \ + && @v[1].to_i < vb[2].to_i + raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" + else check_incompatible_ruby_build? + end + end + def check_incompatible_ruby_build? + require 'rbconfig' + e=Config::CONFIG + if RUBY_VERSION == '1.9.2' \ + && e['PATCHLEVEL'].to_i < 180 + raise <. + + If you have Internet connection, the latest version of the GPL should be + available at these locations: + + + + + + * SiSU uses: + * Standard SiSU markup syntax, + * Standard SiSU meta-markup syntax, and the + * Standard SiSU object citation numbering and system + + * Hompages: + + + + * Download: + + + * Ralph Amissah + + diff --git a/bin/sisu_termsheet b/bin/sisu_termsheet deleted file mode 100644 index 73aa933e..00000000 --- a/bin/sisu_termsheet +++ /dev/null @@ -1,148 +0,0 @@ -#!/usr/bin/env ruby -# encoding: utf-8 -#SiSU: copyright (C) 1997 - 2012 Ralph Amissah; License GPL, see appended program information -begin - def ruby_version_ok?(base_version) - @v ||=RUBY_VERSION.scan(/\d+/) - vb=base_version.scan(/\d+/) - if @v[0].to_i < vb[0].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i < vb[1].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i == vb[1].to_i \ - && @v[1].to_i < vb[2].to_i - raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" - else check_incompatible_ruby_build? - end - end - def check_incompatible_ruby_build? - require 'rbconfig' - e=Config::CONFIG - if RUBY_VERSION == '1.9.2' \ - && e['PATCHLEVEL'].to_i < 180 - raise <. - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - - - ** Description: SiSU information Structuring Universe, specialised - pre-processing wrapper - - sisu -t x_bank.and.* - e.g. sisu -t x_bank.and.*.termsheet.rb - e.g. sisu_termsheet.rb -t x_bank.and.c*.termsheet.rb - program calls upon termsheet file with extension termsheet.rb - termsheet.rb calls upon relevant standard form files (to be used) with extension .sForm.rb - there is also a standard_terms.rb file - with terms/details that are constant - the file produced is named after the termsheet.rb with that extension replaced with .er30 - from there scribbler.rb is called upon its usual metaVerse html and pdf creation - ! :-) - to test run - termsheet.rb -f dev.export.import.trade.facility.termsheet.rb - the term sheet calls the standard form or template that is to be run against it. diff --git a/bin/sisu_webrick b/bin/sisu_webrick deleted file mode 100644 index c14ec31e..00000000 --- a/bin/sisu_webrick +++ /dev/null @@ -1,135 +0,0 @@ -#!/usr/bin/env ruby -# encoding: utf-8 -#SiSU: copyright (C) 1997 - 2012 Ralph Amissah; License GPL, see appended program information -begin - def ruby_version_ok?(base_version) - @v ||=RUBY_VERSION.scan(/\d+/) - vb=base_version.scan(/\d+/) - if @v[0].to_i < vb[0].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i < vb[1].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i == vb[1].to_i \ - && @v[1].to_i < vb[2].to_i - raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" - else check_incompatible_ruby_build? - end - end - def check_incompatible_ruby_build? - require 'rbconfig' - e=Config::CONFIG - if RUBY_VERSION == '1.9.2' \ - && e['PATCHLEVEL'].to_i < 180 - raise <. - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - - - ** Description: webrick share - note sisu by default does not link with file - suffixes, see man pages for options diff --git a/conf/sisu/v2/sisurc.yml b/conf/sisu/v2/sisurc.yml deleted file mode 100644 index 86545f32..00000000 --- a/conf/sisu/v2/sisurc.yml +++ /dev/null @@ -1,136 +0,0 @@ -# Name: SiSU - Simple information Structuring Universe -# Author: Ralph@Amissah.com -# Description: Site wide envionment defaults set here -# system environment info / resource configuration file, for sisu -# License: GPL v3 or later -# site environment configuration file -# this file should be configured and live in -# /etc/sisu #per environment settings, overridden by: -# ~/.sisu #per user settings, overridden by: -# ./_sisu #per local markup directory settings -#% #image source directory, main path and subdirectories -#image: -# path: 'sisu_working' -# public: '_sisu/image' -# #all: 'image' -#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name) -#webserv: -# url_root: 'http://www.your.url' #without dir stub -# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home -# images: '_sisu/image' -# man: 'man' -# cgi: '/usr/lib/cgi-bin' -# feed: 'feed' -# sqlite: 'sisu/sqlite' -# webrick_url: true -#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path' -#show_output_on: 'local:8111' -#webserv_cgi: -# host: localhost -# base_path: ~ -# port: '8081' -# user: ~ - -show_output_on: 'filesystem_url' -#texinfo display output -#texinfo: -# stub: 'texinfo' - -##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv -#processing: -# path: '~' -# dir: '.sisu_processing~' -# metaverse: 'metaverse' -# tune: 'tune' -# latex: 'tex' -# texinfo: 'texinfo' -# concord_max: 400000 - -#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) -flag: - color: true # making colour default -c is toggle, and will now toggle colour off - default: '-NhewpotbxXyYv' # -m run by default; includes verbose - i: '-Nhewpoty' # -m run by default - ii: '-NhewpotbxX' # -m run by default - iii: '-NhewpotbxXY' # -m run by default - iv: '-NhewpoabxXYD --update' # -m run by default - v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose -#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal - -default: - papersize: 'A4,letter' - #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif' - #text_wrap: 78 - #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold' - #digest: 'sha' #sha is sha256, default is md5 - #multilingual: false - #language_file: 2 - #language: 'English' - -#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold' - -#% settings used by ssh scp -#remote: -# - -# user: '[usrname]' -# host: '[remote.hostname]' -# path: '.' #no trailing slash eg 'sisu/www' -# - -# user: '[usrname]' -# host: '[remote.hostname]' -# path: '.' #no trailing slash eg 'sisu/www' - -#% webrick information -#webrick: -# port: '8081' - -#% sql database info, postgresql and sqlite -#db: -# share_source: false # boolean, default is false -# postgresql: -# port: # '[port (default is 5432)]' -# host: # '[if not localhost, provide host tcp/ip address or domain name]'' -# user: # '[(if different from user) provide username]' -# password: # '[password if required]' -# sqlite: -# path: ~ # './sisu_sqlite.db' -# port: "**" -#html: -# quick_ref: true #default false -# seg_title_banner: true #default false - -permission_set: - zap: false - css_modify: false -# remote_base_site: true - -program_set: - rmagick: false -# wc: true -# editor: true -# postgresql: true -# sqlite: true -# tidy: true -# rexml: true -# pdflatex: true - -#program_select: -# editor: 'vim' -# pdf_viewer: 'evince' -# web_browser: 'iceweasel' -# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' -# odf_viewer: 'lowriter' #'oowriter' #'abiword' -# xml_viewer: 'xml-viewer' -# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular' -# info_viewer: 'pinfo -f' -# man: 'man' #'groff -man -Tascii' # 'nroff -man' - -#search: -# sisu: -# flag: true -## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi -# action: http://search.sisudoc.org -# db: sisu -# title: sample search form - -#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby diff --git a/conf/sisu/v4/sisurc.yml b/conf/sisu/v4/sisurc.yml new file mode 100644 index 00000000..de2288f9 --- /dev/null +++ b/conf/sisu/v4/sisurc.yml @@ -0,0 +1,146 @@ +# Name: SiSU - Simple information Structuring Universe +# Author: Ralph@Amissah.com +# Description: Site wide envionment defaults set here +# system environment info / resource configuration file, for sisu +# License: GPL v3 or later +# site environment configuration file +# this file should be configured and live in +# /etc/sisu #per environment settings, overridden by: +# ~/.sisu #per user settings, overridden by: +# ./_sisu #per local markup directory settings +#% #image source directory, main path and subdirectories +#image: +# path: 'sisu_working' +# public: '_sisu/image' +# #all: 'image' +#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name) +#webserv: +# url_root: 'http://www.your.url' #without dir stub +# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home +# images: '_sisu/image' +# man: 'man' +# cgi: '/usr/lib/cgi-bin' +# feed: 'feed' +# sqlite: 'sisu/sqlite' +# webrick_url: true +#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path' +#show_output_on: 'local:8111' +#webserv_cgi: +# host: localhost +# base_path: ~ +# port: '8081' +# user: ~ + +show_output_on: 'filesystem_url' +#texinfo display output +#texinfo: +# stub: 'texinfo' + +##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv +#processing: +# path: '~' +# dir: '.sisu_processing~' +# metaverse: 'metaverse' +# tune: 'tune' +# latex: 'tex' +# texinfo: 'texinfo' +# concord_max: 400000 + +#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) +flag: + color: true # making colour default -c is toggle, and will now toggle colour off + default: '-NhewpotbxXyYdv' # -m run by default; includes verbose + i: '-Nhewpoty' # -m run by default + ii: '-NhewpotbxXd' # -m run by default + iii: '-NhewpotbxXYd' # -m run by default + iv: '-NhewpotbxXiIYd' # -m run by default + v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose + +#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal +default: + papersize: 'A4,letter' + #language: 'en' + #texpdf_font: 'Liberation Sans' # 'Liberation Sans' 'Liberation Serif' + #texpdf_font_mono: 'Liberation Mono' #'Inconsolata' + #text_wrap: 78 + #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold' + #digest: 'sha' #sha is sha256, default is md5 + #multilingual: false + #language_file: 2 +#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold' + +#% settings used by ssh scp +#remote: +# - +# user: '[usrname]' +# host: '[remote.hostname]' +# path: '.' #no trailing slash eg 'sisu/www' +# - +# user: '[usrname]' +# host: '[remote.hostname]' +# path: '.' #no trailing slash eg 'sisu/www' + +#% webrick information +#webrick: +# port: '8081' + +#% sql database info, postgresql and sqlite +#db: +# share_source: false # boolean, default is false +# postgresql: +# port: # '[port (default is 5432)]' +# host: # '[if not localhost, provide host tcp/ip address or domain name]'' +# user: # '[(if different from user) provide username]' +# password: # '[password if required]' +# sqlite: +# path: ~ # './sisu_sqlite.db' +# port: "**" + +#html: +# quick_ref: true #default false +# seg_title_banner: true #default false +#odt: +# ocn: true +#plaintext: +# ocn: true + +#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2) +#output_dir_structure_by: filename +#output_dir_structure_by: filetype +output_dir_structure_by: language + +permission_set: + zap: false + css_modify: false +# remote_base_site: true + +program_set: + rmagick: false +# wc: true +# editor: true +# postgresql: true +# sqlite: true +# tidy: true +# rexml: true +# pdflatex: true + +#program_select: +# editor: 'vim' +# pdf_viewer: 'evince' +# web_browser: 'iceweasel' +# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' +# odf_viewer: 'lowriter' #'oowriter' #'abiword' +# xml_viewer: 'xml-viewer' +# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular' +# info_viewer: 'pinfo -f' +# man: 'man' #'groff -man -Tascii' # 'nroff -man' + +#search: +# sisu: +# flag: true +## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi +# action: http://search.sisudoc.org +# db: sisu +# title: sample search form +#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby +#omit: minitoc diff --git a/data/doc/sisu/CHANGELOG_v1 b/data/doc/sisu/CHANGELOG_v1 index 4af76649..611d5c97 100644 --- a/data/doc/sisu/CHANGELOG_v1 +++ b/data/doc/sisu/CHANGELOG_v1 @@ -1,4 +1,7 @@ %% SiSU version 1 +v1 branch is legacy: v2 branch supersedes & replaces it +v1 sisu pretty mature in operation and syntax +v1 branch removed from sisu 3.0 available in sisu =< 2.7 * homepage at: * @@ -12,8 +15,6 @@ Reverse Chronological: %% Legacy Branch, Reference -%% v1 branch removed from sisu 3.0 available in < sisu 2.8 (2.7 and below) - %% 1.0.4.orig.tar.gz (2010-02-17:07/3) [2010-07-07] http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz sisu_1.0.3.orig.tar.gz diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index ba0af469..1404f6d2 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -1,4 +1,10 @@ %% SiSU version 2 +v2 branch is legacy: v3 branch supersedes & replaces it +v2 branch supersedes & replaces v1 branch +v2 introduces new processing middle layer (document abstraction); + markup same except for minor changes to document headers; + epub output introduced +v2 branch removed from sisu 4.0; it is available in sisu =< 3.3.2 * homepage at: * @@ -8,9 +14,24 @@ * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi * CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/ -Reverse Chronological: +%% Legacy Branch, Reference -%% STABLE Branch +* new middle layer (document abstraction) that uses ruby objects to + represent data (instead of strings) + +* downstream libraries updated to use v2 middle layer + +* sisu markup, changes to headers (metadata), input otherwise unchanged + +* output much the same as for version 1 with some tweaks + * search, sql table structure changed for version 2, incompatible + * internal linking of documents is once again supported + * LaTeX/pdf book indexes link within the pdf text rather than to HTML + version of document + +* EPUB output introduced using -e flag + +%% Reverse Chronological: %% 2.9.12 (2012-02-14:07/2) [see 3.1.14.orig.tar.xz] http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.14 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 261c1042..a42f334b 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -1,4 +1,8 @@ %% SiSU version 3 +v3 branch is legacy: v4 branch supersedes & replaces it +v3 branch supersedes & replaces v2 branch +v3 introduces alternative (configurable) output structures +v1 branch is removed; it is available in sisu =< 2.7 * homepage at: * @@ -8,6 +12,8 @@ * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi * CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/ +%% Legacy Branch, Reference + Version 3 introduced output directory structures nad filenames more compatible with mobile devices and other non-web use and more internationalisation possibilities. diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 new file mode 100644 index 00000000..c46b5484 --- /dev/null +++ b/data/doc/sisu/CHANGELOG_v4 @@ -0,0 +1,26 @@ +%% SiSU version 4 +v4 branch supersedes & replaces v3 branch + initial goals: + * remove/retire "skins"; replace some functionality with headers and/or yml + file (consider header like syntax for document and site appearance info) + * bin/sisu $0 make possible to run sisu command on/within project dir tree + * bin/sisu $*, hub, make possible to specify dir path for markup files +v2 branch is removed; it is available in sisu =< 3.3.2 + +* homepage at: +* +* +* +* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm +* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi +* CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/ + +%% Reverse Chronological: + +%% 4.0.0.orig.tar.xz (2012-10-03:40/3) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.0 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.0-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.0.orig.tar.xz + sisu_4.0.0.orig.tar.xz + sisu_4.0.0-1.dsc + sisu_4.0.0-1.debian.tar.gz diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml deleted file mode 100644 index 433c6967..00000000 --- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml +++ /dev/null @@ -1,132 +0,0 @@ -# Name: SiSU - Simple information Structuring Universe -# Author: Ralph@Amissah.com -# Description: Site wide envionment defaults set here -# system environment info / resource configuration file, for sisu -# License: GPL v3 or later -# site environment configuration file -# this file should be configured and live in -# /etc/sisu #per environment settings, overridden by: -# ~/.sisu #per user settings, overridden by: -# ./_sisu #per local markup directory settings -#% #image source directory, main path and subdirectories -#image: -# path: 'sisu_working' -# public: '_sisu/image' -# #all: 'image' -#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name) -#webserv: -# url_root: 'http://www.your.url' #without dir stub -# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home -# images: '_sisu/image' -# man: 'man' -# cgi: '/usr/local/lib/sisu-cgi' -# feed: 'feed' -# sqlite: 'sisu/sqlite' -# webrick_url: true -#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path' -#show_output_on: 'local:8111' -#webserv_cgi: -# host: localhost -# base_path: ~ -# port: '8081' -# user: ~ -# file_links: webserv - -show_output_on: 'filesystem_url' -#texinfo display output -#texinfo: -# stub: 'texinfo' - -#% processing directories, main path and subdirectories -#processing: -# path: 'sisu_processing' -# metaverse: 'metaverse' -# tune: 'tune' -# latex: 'tex' -# texinfo: 'texinfo' -# concord_max: 400000 - -#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) -flag: - color: true # making colour default -c is toggle, and will now toggle colour off - default: '-NhewpotbxXyYv' # -m run by default; includes verbose - i: '-Nhewpoty' # -m run by default - ii: '-NhewpotbxX' # -m run by default - iii: '-NhewpotbxXY' # -m run by default - iv: '-NhewpotbxXiIY' # -m run by default - v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose - -#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible -default: - papersize: 'a4,letter' - language_file: 2 - #digest: 'sha' #sha is sha256, default is md5 - #language: 'English' - #emphasis: 'italics' - -#% settings used by ssh scp -#remote: -# - -# user: '[usrname]' -# host: '[remote.hostname]' -# path: '.' #no trailing slash eg 'sisu/www' -# - -# user: '[usrname]' -# host: '[remote.hostname]' -# path: '.' #no trailing slash eg 'sisu/www' - -#% webrick information -#webrick: -# port: '8081' - -#sql database info, postgresql and sqlite -db: - postgresql: - port: '5432' # '5432' - #user: 'tst' # '[provide username]' - #host: 'sisudoc.org' - #user: 'ralph' - ##port: '5433' - #port: '5432' - sqlite: - user: 'ralph' - path: ~ # './sisu_sqlite.db' - port: "**" - multi: true -# single: true - -permission_set: - zap: true - css_modify: true - remote_base_site: true - -program_set: - rmagick: false -# wc: true -# editor: true -# postgresql: true -# sqlite: true -# tidy: true -# rexml: true -# pdflatex: true - -#program_select: -# editor: 'vim' -# pdf_viewer: 'evince' -# web_browser: 'iceweasel' -# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' -# odf_viewer: 'lowriter' #'oowriter' #'abiword' -# xml_viewer: 'xml-viewer' -# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular' -# info_viewer: 'pinfo -f' -# man: 'man' #'groff -man -Tascii' # 'nroff -man' - -#search: -# sisu: -# flag: true -## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi -# action: http://search.sisudoc.org -# db: sisu -# title: sample search form - -#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v4/sisurc.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v4/sisurc.yml new file mode 100644 index 00000000..6d11656d --- /dev/null +++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v4/sisurc.yml @@ -0,0 +1,134 @@ +# Name: SiSU - Simple information Structuring Universe +# Author: Ralph@Amissah.com +# Description: Site wide envionment defaults set here +# system environment info / resource configuration file, for sisu +# License: GPL v3 or later +# site environment configuration file +# this file should be configured and live in +# /etc/sisu #per environment settings, overridden by: +# ~/.sisu #per user settings, overridden by: +# ./_sisu #per local markup directory settings +#% #image source directory, main path and subdirectories +#image: +# path: 'sisu_working' +# public: '_sisu/image' +# #all: 'image' +#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name) +#webserv: +# url_root: 'http://www.your.url' #without dir stub +# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home +# images: '_sisu/image' +# man: 'man' +# cgi: '/usr/local/lib/sisu-cgi' +# feed: 'feed' +# sqlite: 'sisu/sqlite' +# webrick_url: true +#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path' +#show_output_on: 'local:8111' +#webserv_cgi: +# host: localhost +# base_path: ~ +# port: '8081' +# user: ~ +# file_links: webserv + +show_output_on: 'filesystem_url' +#texinfo display output +#texinfo: +# stub: 'texinfo' + +#% processing directories, main path and subdirectories +#processing: +# path: 'sisu_processing' +# metaverse: 'metaverse' +# tune: 'tune' +# latex: 'tex' +# texinfo: 'texinfo' +# concord_max: 400000 + +#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) +flag: + color: true # making colour default -c is toggle, and will now toggle colour off +# default: '-NhewpotbxXyYv' # -m run by default; includes verbose +# i: '-Nhewpoty' # -m run by default +# ii: '-NhewpotbxX' # -m run by default +# iii: '-NhewpotbxXY' # -m run by default +# iv: '-NhewpotbxXiIY' # -m run by default +# v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose + +#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible +default: + papersize: 'a4,letter' + language_file: 2 + #digest: 'sha' #sha is sha256, default is md5 + #language: 'English' + #emphasis: 'italics' + +#% settings used by ssh scp +#remote: +# - +# user: '[usrname]' +# host: '[remote.hostname]' +# path: '.' #no trailing slash eg 'sisu/www' +# - +# user: '[usrname]' +# host: '[remote.hostname]' +# path: '.' #no trailing slash eg 'sisu/www' + +#% webrick information +#webrick: +# port: '8081' + +#sql database info, postgresql and sqlite +db: + postgresql: + port: '5432' # '5432' + #host: # '[if not localhost, provide host tcp/ip address or domain name]'' + #user: # '[(if different from user) provide username]' + #password: # '[password if required]' + sqlite: + user: 'ralph' + path: ~ # './sisu_sqlite.db' + port: "**" + multi: true +# single: true + +#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2) +#output_dir_structure_by: filename +#output_dir_structure_by: filetype +output_dir_structure_by: language + +permission_set: + zap: true + css_modify: true + remote_base_site: true + +program_set: + rmagick: true +# wc: true +# editor: true +# postgresql: true +# sqlite: true +# tidy: true +# rexml: true +# pdflatex: true + +#program_select: +# editor: 'vim' +# pdf_viewer: 'evince' +# web_browser: 'iceweasel' +# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' +# odf_viewer: 'lowriter' #'oowriter' #'abiword' +# xml_viewer: 'xml-viewer' +# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular' +# info_viewer: 'pinfo -f' +# man: 'man' #'groff -man -Tascii' # 'nroff -man' + +#search: +# sisu: +# flag: true +## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi +# action: http://search.sisudoc.org +# db: sisu +# title: sample search form +#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby diff --git a/data/sisu/v2/conf/cgi-bin/sisu_search_pgsql.cgi b/data/sisu/v2/conf/cgi-bin/sisu_search_pgsql.cgi deleted file mode 100644 index c196c756..00000000 --- a/data/sisu/v2/conf/cgi-bin/sisu_search_pgsql.cgi +++ /dev/null @@ -1,904 +0,0 @@ -#!/usr/bin/env ruby -=begin - * Name: SiSU information Structuring Universe - * Author: Ralph Amissah - * http://www.jus.uio.no/sisu - * http://www.jus.uio.no/sisu/SiSU/download - - * Description: generates naive cgi search form for search of sisu database (pgsql) - * Name: SiSU generated sample cgi search form - - * Description: generated sample cgi search form for SiSU - (SiSU is a framework for document structuring, publishing and search) - - * Author: Ralph Amissah - - * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007 Ralph Amissah All Rights Reserved. - - * License: GPL 3 or later: - - SiSU, a framework for document structuring, publishing and search - - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007 Ralph Amissah - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation, either version 3 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along with - this program. If not, see . - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - - -=end - require 'cgi' - require 'fcgi' - require 'dbi' - @version='sisu_search_pgsql' - @image_src="http://localhost/sisu/_sisu/image" - @hosturl_db="http://localhost" - @hosturl_files="http://www.jus.uio.no" - @port="5432" - user='' - @@limit,@@offset=1000,0 - @base="#@hosturl_db/cgi-bin/#@version.cgi" - @@canned_search_url=@base - @color_heading='#DDFFAA' - @color_match='#ffff48' - class Form - def initialize(base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can='') - search_note='' if checked_searched !~/\S/ - the_can='' if checked_url !~/\S/ - search_field='' if checked_echo !~/\S/ - @base,@search_field,@selected_db,@checked_index,@checked_text,@checked_tip,@checked_stats,@checked_searched,@checked_url,@checked_case,@checked_echo,@checked_sql,@checked_all,@checked_none,@checked_selected,@checked_default,@search_note,@the_can=base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can - @tip=if checked_tip =~/\S/ - 'text:__; keywords:__; title:__; author:__; subject:__; description:__; publisher:__; contributor:__; date:__; type:__; format:__; identifier:__; source:__; language:__; relation:__; coverage:__; rights:__; comment:__; abstract:__; filename:__;
' - else '' - end - end - def submission_form - search_form=<<-WOK - - - - - SiSU search form (sample): SiSU information Structuring Universe - - - - - - - - - - -
SiSU --> - - -
-
- - -
- - - #@tip - #@search_note - #@the_can -
- - - - - to search: select which database to search (drop-down menu below); enter your search query (in the form above); and click on the search button (below) -
- - - index - text / grep - case sensitive -
- echo query - result stats - search url - searched - available fields - sql statement -
- checks: - default - selected - all - none - - - -
- WOK - end - end - class Search_request #% search_for - attr_accessor :text1,:keywords,:title,:author,:subject,:description,:publisher,:contributor,:date,:type,:format,:identifier,:source,:language,:relation,:coverage,:rights,:comment,:abstract,:owner,:date_created,:date_issued,:date_modified,:date_available,:date_valid,:filename - def initialize(search_field='',q='') - @search_field,@q=search_field,q - @text1=@keywords=@title=@author=@subject=@description=@publisher=@contributor=@date=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@comment=@abstract=@owner=@date_created=@date_issued=@date_modified=@date_available=@date_valid=@filename='' - if @search_field=~/\S/ - @text1=text_to_match('text:') - @keywords=text_to_match('key(?:words?)?:') - @title=text_to_match('title:') # DublinCore 1 - title - @author=text_to_match('(?:author|creator)s?:') # DublinCore 2 - creator/author - @subject=text_to_match('subj(?:ect)?:') # DublinCore 3 - subject - @description=text_to_match('description:') # DublinCore 4 - description - @publisher=text_to_match('pub(?:lisher)?:') # DublinCore 5 - publisher - @contributor=text_to_match('contributor:') # DublinCore 6 - contributor - @date=text_to_match('date:') # DublinCore 7 - date dd-mm-yy - @type=text_to_match('type:') # DublinCore 8 - type - @format=text_to_match('format:') # DublinCore 9 - format - @identifier=text_to_match('identifier:') # DublinCore 10 - identifier - @source=text_to_match('source:') # DublinCore 11 - source - @language=text_to_match('language:') # DublinCore 12 - language - @relation=text_to_match('relation:') # DublinCore 13 - relation - @coverage=text_to_match('coverage:') # DublinCore 14 - coverage - @rights=text_to_match('rights:') # DublinCore 15 - rights - @comment=text_to_match('comment:') - @abstract=text_to_match('abs(?:tract)?:') - @owner=text_to_match('owner:') - @date_created=text_to_match('date_created:') - @date_issued=text_to_match('date_issued:') - @date_modified=text_to_match('date_modified:') - @date_available=text_to_match('date_available:') - @date_valid=text_to_match('date_valid:') - @filename=text_to_match('filename:') - @text1=text_to_match unless @keywords or @author or @title or @text1 or @comment or @abstract or @rights or @subject or @publisher or @date or @filename - else - @text1=q['s1'] if q['s1']=~/\S/ - @keywords=q['key'] if q['key']=~/\S/ - @title=q['ti'] if q['ti']=~/\S/ - @author=q['au'] if q['au']=~/\S/ - @subject=q['sj'] if q['sj']=~/\S/ - @description=q['dsc'] if q['dsc']=~/\S/ - @publisher=q['pb'] if q['pb']=~/\S/ - @contributor=q['cntr'] if q['cntr']=~/\S/ - @date=q['dt'] if q['dt']=~/\S/ - @type=q['ty'] if q['ty']=~/\S/ - @identifier=q['id'] if q['id']=~/\S/ - @source=q['src'] if q['src']=~/\S/ - @language=q['lang'] if q['lang']=~/\S/ - @relation=q['rel'] if q['rel']=~/\S/ - @coverage=q['cov'] if q['cov']=~/\S/ - @rights=q['cr'] if q['cr']=~/\S/ - @comment=q['co'] if q['co']=~/\S/ - @abstract=q['ab'] if q['ab']=~/\S/ - @date_created=q['dtc'] if q['dtc']=~/\S/ - @date_issued=q['dti'] if q['dti']=~/\S/ - @date_modified=q['dtm'] if q['dtm']=~/\S/ - @date_available=q['dta'] if q['dta']=~/\S/ - @date_valid=q['dtv'] if q['dtv']=~/\S/ - @filename=q['fns'] if q['fns']=~/\S/ - @@limit=q['ltd'] if q['ltd']=~/\d+/ # 1000 - @@offset=q['off'] if q['off']=~/\d+/ # 0 - end - end - def text_to_match(identifier='') - m={ - :string => /#{identifier}\s*(.+?)/, - :string => /#{identifier}\s*(.+?)(?:;|\n|\r|$)/, - :word => /#{identifier}[\s(]*(\S+)/ - } - search_string=if @search_field =~m[:word] - search_string=if @search_field =~m[:braces]; m[:braces].match(@search_field)[1] - elsif @search_field =~m[:string]; m[:string].match(@search_field)[1] - else - str=m[:word].match(@search_field)[1] - str.gsub!(/[()]/,'') - str - end - search_string.strip! - search_string.gsub!(/\s+/,'+') - search_string - #else - # "__" - end - end - end - class Dbi_search_string - def initialize(l,t,q,cse=false) - @l,@t,@q,@c=l,t,q,cse - end - def string - search={ :search => [],:flag => false } - if @t =~/\S+/ or @q =~/\S+/ - if @t =~/\S+/; unescaped_search=CGI.unescape(@t) - elsif @q =~/\S+/; unescaped_search=CGI.unescape(@q) - end - search_construct=[] - if @c - unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #@l~\( '") - unescaped_search.gsub!(/(.+)/,"#@l~\( '\\1' \)") - else - unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #@l~*\( '") - unescaped_search.gsub!(/(.+)/,"#@l~*\( '\\1' \)") - end - search_construct << unescaped_search - search_construct=search_construct.join(' ') - search[:search] << search_construct - search[:flag]=true - search - end - search - end - end - class Dbi_search_statement - attr_reader :text_search_flag,:sql_select_body_format,:sql_select_endnotes_format,:sql_offset,:sql_limit - def initialize(conn,search_for,q,c) - @conn=conn - @text_search_flag=false - @sql_statement={ :body=>'',:endnotes=>'',:range=>'' } - #@offset||=@@offset - #@offset+=@@limit - search={ :text => [],:endnotes => [] } - cse=if c =~/\S/; true - else false - end - st=Dbi_search_string.new('documents.clean',search_for.text1,q['s1'],cse).string - se=Dbi_search_string.new('endnotes.clean',search_for.text1,q['s1'],cse).string - @text_search_flag=st[:flag] - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << se[:search] - end - st=Dbi_search_string.new('metadata.keywords',search_for.keywords,q['key'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.title',search_for.title,q['ti'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.creator',search_for.author,q['au'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.subject',search_for.subject,q['sj'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.description',search_for.description,q['dsc'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.publisher',search_for.publisher,q['pb'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.contributor',search_for.contributor,q['cntr'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.date',search_for.date,q['dt'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.type',search_for.type,q['ty'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.identifier',search_for.identifier,q['id'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.source',search_for.source,q['src'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.language',search_for.language,q['lang'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.relation',search_for.relation,q['rel'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.coverage',search_for.coverage,q['cov'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.rights',search_for.rights,q['cr'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.comment',search_for.comment,q['co'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.abstract',search_for.abstract,q['ab'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.filename',search_for.filename,q['fns'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - @@limit=q['ltd'] if q['ltd']=~/\d+/ # 1000 - @@offset=q['off'] if q['off']=~/\d+/ # 0 - @search_text,@search_endnotes=[],[] - #% - search[:text].each{|x| @search_text << "#{x} AND " } - @search_text=@search_text.to_s.gsub!(/AND\s+$/,'') - @search_text.gsub!(/(documents\.clean~\(\s*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+documents\.clean~\(\s*'[^']+'\s*\))+)/,'(\1)') - search[:endnotes].each{|x| @search_endnotes << "#{x} AND " } - @search_endnotes=@search_endnotes.to_s.gsub!(/AND\s+$/,'') - @search_endnotes.gsub!(/(endnotes\.clean~\(\s*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+endnotes\.clean~\(\s*'[^']+'\s*\))+)/,'(\1)') - end - def sql_offset - @@offset - end - def sql_limit - @@limit - end - def sql_canned_search - @offset_next=sql_offset.to_i + sql_limit.to_i - @offset_previous=sql_offset.to_i - sql_limit.to_i - def current - @@canned_search_url.to_s + '<d=' + sql_limit.to_s + '&off=' + sql_offset.to_s - end - def next - @@canned_search_url.to_s + '<d=' + sql_limit.to_s + '&off=' + @offset_next.to_s - end - def previous - @offset_previous >= 0 ? (@@canned_search_url.to_s + '<d=' + sql_limit.to_s + '&off=' + @offset_previous.to_s) : '' - end - def start - @@canned_search_url.to_s + '<d=' + sql_limit.to_s + '&off=' + 0.to_s - end - self - end - def sql_canned_search_url(ok) - if ok - can=sql_canned_search - page=(sql_offset.to_i + sql_limit.to_i)/sql_limit.to_i - case page.to_s - when /^1$/ - %{

- pg. #{page.to_s} -   > -
} - when /^2$/ - %{

- <   - pg. #{page.to_s} -   > -
} - else - %{

- |<   - <   - pg. #{page.to_s} -   > -
} - end - else '' - end - end - def sql_select_body - limit ||=@@limit - offset ||=@@offset - @sql_statement[:body]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, metadata.suffix, documents.body, documents.seg, documents.ocn, metadata.tid FROM documents, metadata WHERE (#@search_text) AND documents.metadata_tid = metadata.tid ORDER BY metadata.title, metadata.filename, documents.ocn} - @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;} - select=@sql_statement[:body] + ' ' + @sql_statement[:range] - select - end - def sql_select_endnotes - limit ||=@@limit - offset ||=@@offset - @sql_statement[:endnotes]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, endnotes.body, endnotes.nr, endnotes.ocn, endnotes.metadata_tid FROM metadata, endnotes WHERE (#@search_endnotes) AND metadata.tid = endnotes.metadata_tid ORDER BY metadata.title, metadata.filename, endnotes.nr} - @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;} - select=@sql_statement[:endnotes] + ' ' + @sql_statement[:range] - select - end - def sql_select_body_format - %{#{sql_select_body}} - end - def sql_select_endnotes_format - %{#{sql_select_endnotes}} - end - def contents - @conn.select_all(sql_select_body) - end - def endnotes - @conn.select_all(sql_select_endnotes) - end - end - def tail - <<-'WOK' -

- - - - - -
-

- - SiSU - -

-		 - -

- Generated by - - SiSU 0.55.3 2007-07-10 (2007w28/2) -
- - SiSU © Ralph Amissah - 1993, current 2007. - All Rights Reserved. -
- - SiSU - is software for document structuring, publishing and search, -
- - www.jus.uio.no/sisu - - and - - www.sisudoc.org - -
- w3 since October 3 1993 - - ralph@amissah.com - -

-		 -

- SiSU using: -
Standard SiSU markup syntax, -
Standard SiSU meta-markup syntax, and the -
Standard SiSU object citation numbering and system, (object/text positioning system) -
- © Ralph Amissah 1997, current 2007. - All Rights Reserved. -

-
-

- - GPLv3 - -

-		 -

- SiSU is released under - GPL v3 - or later, - - http://www.gnu.org/licenses/gpl.html - -

-		 -

- SiSU, developed using - - Ruby - - on - - Debian/Gnu/Linux - - software infrastructure, - with the usual GPL (or OSS) suspects. -
- Better - "performance, reliability, scalability, security & total cost of ownership" - [not to mention flexibility & choice] -
- Get With the Future - - Way Better! - -

-
- - - WOK - end - @tail=tail - @counter_txt_doc,@counter_txt_ocn,@counter_endn_doc,@counter_endn_ocn=0,0,0,0 - @counters_txt,@counters_endn,@sql_select_body,@sql_select_endnotes='','','','' - FCGI.each_cgi do |cgi| - begin # all code goes in begin section - @search={ :text => [],:endnotes => [] } - q=CGI.new - @db=if cgi['db'] =~/\S+/; - @stub=/SiSU_(\S+)/.match(cgi['db'])[1] - cgi['db'] - else - @stub='sisu' - 'SiSU_sisu' - end - checked_url,checked_stats,checked_searched,checked_tip,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,selected_db='','','','','','','','','' - if cgi['view']=~/text/; checked_index,checked_text='','checked' - else checked_index,checked_text='checked','' - end - checked_echo='checked' if cgi['echo'] =~/\S/ - checked_stats='checked' if cgi['stats'] =~/\S/ - checked_url='checked' if cgi['url'] =~/\S/ or cgi['u'].to_i==1 - checked_searched='checked' if cgi['searched'] =~/\S/ - checked_tip='checked' if cgi['tip'] =~/\S/ - checked_case='checked' if cgi['casesense'] =~/\S/ - checked_sql='checked' if cgi['sql'] =~/\S/ - if cgi['checks'] =~/check_all/ or cgi['check_all'] =~/\S/ or cgi['a'].to_i==1 - checked_all='checked' - checked_echo=checked_stats=checked_url=checked_searched=checked_tip=checked_sql='checked' - checked_none='' - elsif cgi['checks'] =~/check_none/ - checked_none='checked' - checked_all=checked_url=checked_stats=checked_searched=checked_tip=checked_echo=checked_sql='' - elsif cgi['checks'] =~/check_selected/ - checked_selected='checked' - elsif cgi['checks'] =~/check_default/ - checked_default='checked' - checked_echo=checked_stats=checked_url='checked' - checked_searched=checked_tip=checked_case=checked_sql='' - else - checked_selected='checked' - checked_echo=checked_stats=checked_url='checked' - checked_searched=checked_tip=checked_case=checked_sql='' - end - selected_db=case cgi['db'] - when /SiSU_pace/; '' - when /SiSU_sisu/; '' - end - dbi="dbi:Pg:database=#{@db};port=#{@port}" - @conn=DBI.connect(dbi,user) - search_field=cgi['find'] if cgi['find'] # =~/\S+/ - @search_for=Search_request.new(search_field,q) #.analyze #% search_for - #% searches - #Canned_search.new(@base,@search_for.text1,cgi) - if @search_for.text1=~/\S+/ or @search_for.author=~/\S+/ #and search_field =~/\S/ - s1='s1=' + CGI.escape(@search_for.text1) if @search_for.text1=~/\S/ - key='key=' + CGI.escape(@search_for.keywords) if @search_for.keywords=~/\S/ - ti='&ti=' + CGI.escape(@search_for.title) if @search_for.title=~/\S/ - au='&au=' + CGI.escape(@search_for.author) if @search_for.author=~/\S/ - sj='&sj=' + CGI.escape(@search_for.subject) if @search_for.subject=~/\S/ - dsc='&dsc=' + CGI.escape(@search_for.description) if @search_for.description=~/\S/ - pb='&pb=' + CGI.escape(@search_for.publisher) if @search_for.publisher=~/\S/ - cntr='&cntr=' + CGI.escape(@search_for.contributor) if @search_for.contributor=~/\S/ - dt='&dt=' + CGI.escape(@search_for.date) if @search_for.date=~/\S/ - ty='&ty=' + CGI.escape(@search_for.type) if @search_for.type=~/\S/ - id='&id=' + CGI.escape(@search_for.identifier) if @search_for.identifier=~/\S/ - src='&src=' + CGI.escape(@search_for.source) if @search_for.source=~/\S/ - lang='&lang=' + CGI.escape(@search_for.language) if @search_for.language=~/\S/ - rel='&rel=' + CGI.escape(@search_for.relation) if @search_for.relation=~/\S/ - cov='&cov=' + CGI.escape(@search_for.coverage) if @search_for.coverage=~/\S/ - cr='&cr=' + CGI.escape(@search_for.rights) if @search_for.rights=~/\S/ - co='&co=' + CGI.escape(@search_for.comment) if @search_for.comment=~/\S/ - ab='&ab=' + CGI.escape(@search_for.abstract) if @search_for.abstract=~/\S/ - dtc='&dtc=' + CGI.escape(@search_for.date_created) if @search_for.date_created=~/\S/ - dti='&dti=' + CGI.escape(@search_for.date_issued) if @search_for.date_issued=~/\S/ - dtm='&dtm=' + CGI.escape(@search_for.date_modified) if @search_for.date_modified=~/\S/ - dta='&dta=' + CGI.escape(@search_for.date_available) if @search_for.date_available=~/\S/ - dtv='&dtv=' + CGI.escape(@search_for.date_valid) if @search_for.date_valid=~/\S/ - fns='&fns=' + CGI.escape(@search_for.filename) if @search_for.filename=~/\S/ - @@canned_search_url=if checked_all =~/checked/ - "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}&a=1" - else "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}" - end - @canned_base_url="#@base?#{s1}&db=#{cgi['db']}" - if checked_case=~/\S/ - @search[:text][1]=%{documents.clean~'#{@search_for.text1}'} #s1 - @search[:endnotes][1]=%{endnotes.clean~'#{@search_for.text1}'} #s1 - else - @search[:text][1]=%{documents.clean~*'#{@search_for.text1}'} #s1 - @search[:endnotes][1]=%{endnotes.clean~*'#{@search_for.text1}'} #s1 - end - canned_note='search url:' - else - @@canned_search_url="#@base?s1=United+Nations&db=documents&view=index" - canned_note='search url example:' - end - if search_field =~/\S+/ - analyze_format=search_field.gsub(/\s*\n/,'; ') - elsif checked_all =~/checked/ or checked_url =~/checked/ - canned_search=@@canned_search_url.scan(/(?:s1|au|ti|fns)=[^&]+/) - af=canned_search.join('; ') - af.gsub!(/s1=/,'text: ') - af.gsub!(/au=/,'author: ') - af.gsub!(/ti=/,'title: ') - af.gsub!(/fns=/,'filename: ') - af.gsub!(/%2B/,' ') - analyze_format=af - st=af.split(/\s*;\s*/) - search_field=st.join("\n") - end - green=%{} - canned_search_url_txt=CGI.escapeHTML(@@canned_search_url) - the_can=%{#{canned_note} #{canned_search_url_txt}
} - p_text=p_keywords=p_title=p_author=p_subject=p_description=p_publisher=p_contributor=p_date=p_type=p_format=p_identifier=p_source=p_language=p_relation=p_coverage=p_rights=p_comment=p_abstract=p_subject=p_filename='' - p_text=%{text: #{green}#{@search_for.text1}
} if @search_for.text1 =~/\S+/ - p_keywords=%{keywords: #{green}#{@search_for.keywords}
} if @search_for.keywords =~/\S+/ - p_title=%{title: #{green}#{@search_for.title}
} if @search_for.title =~/\S+/ - p_author=%{author: #{green}#{@search_for.author}
} if @search_for.author =~/\S+/ - p_subject=%{subject: #{green}#{@search_for.subject}
} if @search_for.subject =~/\S+/ - p_description=%{description: #{green}#{@search_for.description}
} if @search_for.description =~/\S+/ - p_publisher=%{publisher: #{green}#{@search_for.publisher}
} if @search_for.publisher =~/\S+/ - p_contributor=%{contributor: #{green}#{@search_for.contributor}
} if @search_for.contributor =~/\S+/ - p_date=%{date: #{green}#{@search_for.date}
} if @search_for.date =~/\S+/ - p_type=%{type: #{green}#{@search_for.type}
} if @search_for.type =~/\S+/ - p_format=%{format: #{green}#{@search_for.format}
} if @search_for.format =~/\S+/ - p_identifier=%{identifier: #{green}#{@search_for.identifier}
} if @search_for.identifier =~/\S+/ - p_source=%{source: #{green}#{@search_for.source}
} if @search_for.source =~/\S+/ - p_language=%{language: #{green}#{@search_for.language}
} if @search_for.language =~/\S+/ - p_relation=%{relation: #{green}#{@search_for.relation}
} if @search_for.relation =~/\S+/ - p_coverage=%{coverage: #{green}#{@search_for.coverage}
} if @search_for.coverage =~/\S+/ - p_rights=%{rights: #{green}#{@search_for.rights}
} if @search_for.rights =~/\S+/ - p_comment=%{comment: #{green}#{@search_for.comment}
} if @search_for.comment =~/\S+/ - p_abstract=%{abstract: #{green}#{@search_for.abstract}
} if @search_for.abstract =~/\S+/ - p_filename=%{filename: #{green}#{@search_for.filename}
} if @search_for.filename =~/\S+/ - search_note=<<-WOK - - database: #{green}#@db; selected view: #{green}#{cgi['view']} - search string: "#{green}#{analyze_format}"
- #{p_text} #{p_keywords} #{p_title} #{p_author} #{p_subject} #{p_description} #{p_publisher} #{p_contributor} #{p_date} #{p_type} #{p_format} #{p_identifier} #{p_source} #{p_language} #{p_relation} #{p_coverage} #{p_rights} #{p_comment} #{p_abstract} #{p_filename} - - WOK - #eg = %{canned search e.g.:
#{url}
find: #{analyze}
database: #{database}} - #dbi_canning - @header=Form.new(@base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can).submission_form #% form - unless q['s1'] =~/\S/ or q['au'] =~/\S/ or @search[:text][1] =~/\S/ - print "Content-type: text/html\n\n" - puts (@header+@tail) - else #% searches - s1=if @search_for.text1 =~/\S/ - @search_for.text1 - else 'Unavailable' - end - if checked_case=~/\S/ - @search[:text]<<%{documents.clean~'#{CGI.unescape(s1)}'} - @search[:endnotes]<<%{endnotes.clean~'#{CGI.unescape(s1)}'} - else - @search[:text]<<%{documents.clean~*'#{CGI.unescape(s1)}'} - @search[:endnotes]<<%{endnotes.clean~*'#{CGI.unescape(s1)}'} - end - #dbi_request - dbi_statement=Dbi_search_statement.new(@conn,@search_for,q,checked_case) - @text_search_flag=false - @text_search_flag=dbi_statement.text_search_flag - s_contents=dbi_statement.contents - s_endnotes=dbi_statement.endnotes - @body_main,@endnotes=[],[] - @search_regx=nil - oldtid=0 - if @text_search_flag - if checked_sql =~/\S/ - sql_select_body=dbi_statement.sql_select_body_format - sql_select_endnotes=dbi_statement.sql_select_endnotes_format - else sql_select_body,sql_select_endnotes='','' - end - @body_main << '


Main Text:
' << sql_select_body - @endnotes << '


Endnotes:
' << sql_select_endnotes - else - end - #text_objects_body - s_contents.each do |c| #% text body - location=c['filename'][/(.+?)\.(?:_?sst|ssm)$/,1] - file_suffix=c['filename'][/.+?\.(_?sst|ssm)$/,1] - lang=if location =~ /\S+?~(\S\S\S?)$/ - l=location[/\S+?~(\S\S\S?)$/,1] - location.gsub!(/(\S+?)~\S\S\S?/,'\1') - l=".#{l}" - else '' - end - #metadata_found_body - if c['tid'].to_i != oldtid.to_i - ti=if c['subtitle'] =~/\S+/; "#{c['title']} - #{c['subtitle']}" - else c['title'] - end - can_txt_srch=if cgi['view']=~/index/; %{red bullet } - else %{red bullet } - end - title=%{toc html #{ti} by #{c['creator']} #{can_txt_srch}toc html pdf portrait pdf landscape odf manifest
} if file_suffix=~/s/ #hmm watch file_suffix - if @text_search_flag; title='
'+title - else title='
'+title - end - @counter_txt_doc+=1 - oldtid=c['tid'].to_i - else title='' - end - if @text_search_flag - if cgi['view']=~/text/ #% txt body - text=if c['suffix'] !~/1/ #seg - if @search_for.text1 =~/\S+/ or q['s1'] =~/\S+/ #% only this branch is working !! - unescaped_search=if @search_for.text1 =~/\S+/; CGI.unescape(@search_for.text1) - elsif q['s1'] =~/\S+/; CGI.unescape(q['s1']) - else nil - end - @search_regx=if unescaped_search #check - search_regex=[] - build=unescaped_search.scan(/\S+/).each do |g| - if g.to_s =~/(AND|OR)/ - search_regex << '|' - else search_regex << %{#{g.to_s}} - end - end - search_regex=search_regex.join(' ') - search_regex=search_regex.gsub(/\s*\|\s*/,'|') - Regexp.new(search_regex, Regexp::IGNORECASE) - else nil - end - else nil - end - matched_para=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/) - matched=c['body'].gsub(/(<\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{\\1}) - else c['body'] - end - %{

ocn #{c['ocn']}:

#{matched_para}} - elsif c['suffix'] =~/1/ #doc - %{#{title}

ocn #{c['ocn']}:#{c['body']}} - end - @counter_txt_ocn+=1 - output=if c['seg'] =~/\S+/; title+text - else text - end - elsif cgi['view']=~/index/ #% idx body - if c['suffix'] !~/1/ #seg - index=%{#{c['ocn']}, } if @text_search_flag - elsif c['suffix'] =~/1/ #doc - index=%{#{c['ocn']}, } - end - if c['seg'] =~/\S+/ - if @text_search_flag - @counter_txt_ocn+=1 - output=title+index - end - else - @counter_txt_ocn+=1 - output=unless c['suffix'] =~/1/; title+index - else %{#{title}#{c['ocn'].sort}, } - end - end - end - else output=title - end - @counters_txt=if @counter_txt_doc > 0 - if checked_stats =~/\S/ - @@lt_t=if @counter_txt_ocn == dbi_statement.sql_limit.to_i - over='over' - true - else - over='' - false - end - %{

Found in the main body of #@counter_txt_doc documents, and at #{over} #@counter_txt_ocn locations within.
} - else '' - end - else '' - end - @body_main << output #+ details - end - #text_objects_endnote - oldtid = 0 - s_endnotes.each do |e| #% endnotes - location=e['filename'][/(.+?)\.(?:_?sst|ssm)$/,1] - file_suffix=e['filename'][/.+?\.(_?sst|ssm)$/,1] - lang=if location =~ /\S+?~(\S\S\S?)$/ - l=location[/\S+?~(\S\S\S?)$/,1] - location.gsub!(/(\S+?)~\S\S\S?/,'\1') - l=".#{l}" - else '' - end - #metadata_found_endnotes - if @text_search_flag - if e['metadata_tid'].to_i != oldtid.to_i - ti=if e['subtitle'] =~/\S+/; "#{e['title']} - #{e['subtitle']}" - else e['title'] - end - can_txt_srch=if cgi['view']=~/index/; %{red bullet } - else %{red bullet } - end - title=%{
toc html #{ti} by #{e['creator']} #{can_txt_srch}toc html pdf portraitpdf landscape odf manifest
} if file_suffix=~/s/ - @counter_endn_doc+=1 - oldtid=e['metadata_tid'].to_i - else title = '' - end - if cgi['view']=~/text/ #% txt endnotes - @counter_endn_ocn+=1 - matched_endnote=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/) - matched=e['body'].gsub(/(<\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{\\1}) - else e['body'] - end - output=%{#{title}
note #{e['nr']} referred to from ocn #{e['ocn']}: #{matched_endnote}} - elsif cgi['view']=~/index/ #% idx endnotes - @counter_endn_ocn+=1 - output=%{#{title}#{e['nr']} [§ #{e['ocn']}], } - end - @counters_endn=if @counter_endn_doc > 0 - if checked_stats =~/\S/ - @@lt_e=if @counter_endn_ocn == dbi_statement.sql_limit.to_i - over='over' - true - else - over='' - false - end - %{Found in the endnotes of #@counter_endn_doc documents, and at #{over} #@counter_endn_ocn locations within.
} - else '' - end - end - @endnotes << output #+ details - else @endnotes=[] #does not take out yet - end - end - offset=dbi_statement.sql_offset.to_s - limit=dbi_statement.sql_limit.to_s - @@lt_t ||=false; @@lt_e ||=false - canned=if (@@lt_t or @@lt_e) - dbi_statement.sql_canned_search_url(true).to_s - else - dbi_statement.sql_canned_search_url(false).to_s - end - limit=dbi_statement.sql_limit.to_s - cgi.out{@header + @counters_txt + @counters_endn + @body_main.join + @endnotes.join + canned + @tail} #% print cgi_output_header+counters+body+endnotes - end - rescue Exception => e - s='
' + CGI::escapeHTML(e.backtrace.reverse.join("\n"))
-          s << CGI::escapeHTML(e.message) + '
' - cgi.out{s} - next - ensure # eg. disconnect from server - @conn.disconnect if @conn - end - end diff --git a/data/sisu/v2/conf/cgi-bin/sisu_search_sqlite.cgi b/data/sisu/v2/conf/cgi-bin/sisu_search_sqlite.cgi deleted file mode 100644 index 34bb3748..00000000 --- a/data/sisu/v2/conf/cgi-bin/sisu_search_sqlite.cgi +++ /dev/null @@ -1,901 +0,0 @@ -#!/usr/bin/env ruby -=begin - * Name: SiSU information Structuring Universe - * Author: Ralph Amissah - * http://www.jus.uio.no/sisu - * http://www.jus.uio.no/sisu/SiSU/download - - * Description: generates naive cgi search form for search of sisu database (sqlite) - * Name: SiSU generated sample cgi search form - - * Description: generated sample cgi search form for SiSU - (SiSU is a framework for document structuring, publishing and search) - - * Author: Ralph Amissah - - * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007 Ralph Amissah All Rights Reserved. - - * License: GPL 3 or later: - - SiSU, a framework for document structuring, publishing and search - - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007 Ralph Amissah - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation, either version 3 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along with - this program. If not, see . - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - - -=end - require 'cgi' - require 'fcgi' - require 'dbi' - @version='sisu_search_sqlite' - @image_src="http://localhost/sisu/_sisu/image" - @hosturl_db="http://localhost" - @hosturl_files="http://www.jus.uio.no" - @@limit,@@offset=1000,0 - @base="#@hosturl_db/cgi-bin/#@version.cgi" - @@canned_search_url=@base - @color_heading='#DDFFAA' - @color_match='#ffff48' - class Form - def initialize(base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can='') - search_note='' if checked_searched !~/\S/ - the_can='' if checked_url !~/\S/ - search_field='' if checked_echo !~/\S/ - @base,@search_field,@selected_db,@checked_index,@checked_text,@checked_tip,@checked_stats,@checked_searched,@checked_url,@checked_case,@checked_echo,@checked_sql,@checked_all,@checked_none,@checked_selected,@checked_default,@search_note,@the_can=base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can - @tip=if checked_tip =~/\S/ - 'text:__; keywords:__; title:__; author:__; subject:__; description:__; publisher:__; contributor:__; date:__; type:__; format:__; identifier:__; source:__; language:__; relation:__; coverage:__; rights:__; comment:__; abstract:__; filename:__;
' - else '' - end - end - def submission_form - search_form=<<-WOK - - - - - SiSU search form (sample): SiSU information Structuring Universe - - - - - - - - - - -
SiSU --> - - -
-
- - -
- - - #@tip - #@search_note - #@the_can -
- - - - - to search: select which database to search (drop-down menu below); enter your search query (in the form above); and click on the search button (below) -
- - - index - text / grep -
- echo query - result stats - search url - searched - available fields - sql statement -
- checks: - default - selected - all - none - - - -
- WOK - end - end - class Search_request #% search_for - attr_accessor :text1,:keywords,:title,:author,:subject,:description,:publisher,:contributor,:date,:type,:format,:identifier,:source,:language,:relation,:coverage,:rights,:comment,:abstract,:owner,:date_created,:date_issued,:date_modified,:date_available,:date_valid,:filename - def initialize(search_field='',q='') - @search_field,@q=search_field,q - @text1=@keywords=@title=@author=@subject=@description=@publisher=@contributor=@date=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@comment=@abstract=@owner=@date_created=@date_issued=@date_modified=@date_available=@date_valid=@filename='' - if @search_field=~/\S/ - @text1=text_to_match('text:') - @keywords=text_to_match('key(?:words?)?:') - @title=text_to_match('title:') # DublinCore 1 - title - @author=text_to_match('(?:author|creator)s?:') # DublinCore 2 - creator/author - @subject=text_to_match('subj(?:ect)?:') # DublinCore 3 - subject - @description=text_to_match('description:') # DublinCore 4 - description - @publisher=text_to_match('pub(?:lisher)?:') # DublinCore 5 - publisher - @contributor=text_to_match('contributor:') # DublinCore 6 - contributor - @date=text_to_match('date:') # DublinCore 7 - date dd-mm-yy - @type=text_to_match('type:') # DublinCore 8 - type - @format=text_to_match('format:') # DublinCore 9 - format - @identifier=text_to_match('identifier:') # DublinCore 10 - identifier - @source=text_to_match('source:') # DublinCore 11 - source - @language=text_to_match('language:') # DublinCore 12 - language - @relation=text_to_match('relation:') # DublinCore 13 - relation - @coverage=text_to_match('coverage:') # DublinCore 14 - coverage - @rights=text_to_match('rights:') # DublinCore 15 - rights - @comment=text_to_match('comment:') - @abstract=text_to_match('abs(?:tract)?:') - @owner=text_to_match('owner:') - @date_created=text_to_match('date_created:') - @date_issued=text_to_match('date_issued:') - @date_modified=text_to_match('date_modified:') - @date_available=text_to_match('date_available:') - @date_valid=text_to_match('date_valid:') - @filename=text_to_match('filename:') - @text1=text_to_match unless @keywords or @author or @title or @text1 or @comment or @abstract or @rights or @subject or @publisher or @date or @filename - else - @text1=q['s1'] if q['s1']=~/\S/ - @keywords=q['key'] if q['key']=~/\S/ - @title=q['ti'] if q['ti']=~/\S/ - @author=q['au'] if q['au']=~/\S/ - @subject=q['sj'] if q['sj']=~/\S/ - @description=q['dsc'] if q['dsc']=~/\S/ - @publisher=q['pb'] if q['pb']=~/\S/ - @contributor=q['cntr'] if q['cntr']=~/\S/ - @date=q['dt'] if q['dt']=~/\S/ - @type=q['ty'] if q['ty']=~/\S/ - @identifier=q['id'] if q['id']=~/\S/ - @source=q['src'] if q['src']=~/\S/ - @language=q['lang'] if q['lang']=~/\S/ - @relation=q['rel'] if q['rel']=~/\S/ - @coverage=q['cov'] if q['cov']=~/\S/ - @rights=q['cr'] if q['cr']=~/\S/ - @comment=q['co'] if q['co']=~/\S/ - @abstract=q['ab'] if q['ab']=~/\S/ - @date_created=q['dtc'] if q['dtc']=~/\S/ - @date_issued=q['dti'] if q['dti']=~/\S/ - @date_modified=q['dtm'] if q['dtm']=~/\S/ - @date_available=q['dta'] if q['dta']=~/\S/ - @date_valid=q['dtv'] if q['dtv']=~/\S/ - @filename=q['fns'] if q['fns']=~/\S/ - @@limit=q['ltd'] if q['ltd']=~/\d+/ # 1000 - @@offset=q['off'] if q['off']=~/\d+/ # 0 - end - end - def text_to_match(identifier='') - m={ - :string => /#{identifier}\s*(.+?)/, - :string => /#{identifier}\s*(.+?)(?:;|\n|\r|$)/, - :word => /#{identifier}[\s(]*(\S+)/ - } - search_string=if @search_field =~m[:word] - search_string=if @search_field =~m[:braces]; m[:braces].match(@search_field)[1] - elsif @search_field =~m[:string]; m[:string].match(@search_field)[1] - else - str=m[:word].match(@search_field)[1] - str.gsub!(/[()]/,'') - str - end - search_string.strip! - search_string.gsub!(/\s+/,'+') - search_string - #else - # "__" - end - end - end - class Dbi_search_string - def initialize(l,t,q,cse=false) - @l,@t,@q=l,t,q - end - def string - search={ :search => [],:flag => false } - if @t =~/\S+/ or @q =~/\S+/ - if @t =~/\S+/; unescaped_search=CGI.unescape(@t) - elsif @q =~/\S+/; unescaped_search=CGI.unescape(@q) - end - search_construct=[] - unescaped_search.gsub!(/\s*(AND|OR)\s*/,"%' \) \\1 #@l LIKE \( '%") - unescaped_search.gsub!(/(.+)/,"#@l LIKE \( '%\\1%' \)") - search_construct << unescaped_search - search_construct=search_construct.join(' ') - search[:search] << search_construct - search[:flag]=true - search - end - search - end - end - class Dbi_search_statement - attr_reader :text_search_flag,:sql_select_body_format,:sql_select_endnotes_format,:sql_offset,:sql_limit - def initialize(conn,search_for,q,c) - @conn=conn - @text_search_flag=false - @sql_statement={ :body=>'',:endnotes=>'',:range=>'' } - #@offset||=@@offset - #@offset+=@@limit - search={ :text => [],:endnotes => [] } - cse=if c =~/\S/; true - else false - end - st=Dbi_search_string.new('documents.clean',search_for.text1,q['s1'],cse).string - se=Dbi_search_string.new('endnotes.clean',search_for.text1,q['s1'],cse).string - @text_search_flag=st[:flag] - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << se[:search] - end - st=Dbi_search_string.new('metadata.keywords',search_for.keywords,q['key'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.title',search_for.title,q['ti'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.creator',search_for.author,q['au'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.subject',search_for.subject,q['sj'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.description',search_for.description,q['dsc'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.publisher',search_for.publisher,q['pb'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.contributor',search_for.contributor,q['cntr'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.date',search_for.date,q['dt'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.type',search_for.type,q['ty'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.identifier',search_for.identifier,q['id'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.source',search_for.source,q['src'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.language',search_for.language,q['lang'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.relation',search_for.relation,q['rel'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.coverage',search_for.coverage,q['cov'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.rights',search_for.rights,q['cr'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.comment',search_for.comment,q['co'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.abstract',search_for.abstract,q['ab'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - st=Dbi_search_string.new('metadata.filename',search_for.filename,q['fns'],cse).string - if st[:flag] - search[:text] << st[:search] - search[:endnotes] << st[:search] - end - @@limit=q['ltd'] if q['ltd']=~/\d+/ # 1000 - @@offset=q['off'] if q['off']=~/\d+/ # 0 - @search_text,@search_endnotes=[],[] - #% - search[:text].each{|x| @search_text << "#{x} AND " } - @search_text=@search_text.to_s.gsub!(/AND\s+$/,'') - @search_text.gsub!(/(documents\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\)\s+(?:(?:AND|OR)\s+documents\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\))+)/,'(\1)') - search[:endnotes].each{|x| @search_endnotes << "#{x} AND " } - @search_endnotes=@search_endnotes.to_s.gsub!(/AND\s+$/,'') - @search_text.gsub!(/(endnotes\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\)\s+(?:(?:AND|OR)\s+endnotes\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\))+)/,'(\1)') - end - def sql_offset - @@offset - end - def sql_limit - @@limit - end - def sql_canned_search - @offset_next=sql_offset.to_i + sql_limit.to_i - @offset_previous=sql_offset.to_i - sql_limit.to_i - def current - @@canned_search_url.to_s + '<d=' + sql_limit.to_s + '&off=' + sql_offset.to_s - end - def next - @@canned_search_url.to_s + '<d=' + sql_limit.to_s + '&off=' + @offset_next.to_s - end - def previous - @offset_previous >= 0 ? (@@canned_search_url.to_s + '<d=' + sql_limit.to_s + '&off=' + @offset_previous.to_s) : '' - end - def start - @@canned_search_url.to_s + '<d=' + sql_limit.to_s + '&off=' + 0.to_s - end - self - end - def sql_canned_search_url(ok) - if ok - can=sql_canned_search - page=(sql_offset.to_i + sql_limit.to_i)/sql_limit.to_i - case page.to_s - when /^1$/ - %{

- pg. #{page.to_s} -   > -
} - when /^2$/ - %{

- <   - pg. #{page.to_s} -   > -
} - else - %{

- |<   - <   - pg. #{page.to_s} -   > -
} - end - else '' - end - end - def sql_select_body - limit ||=@@limit - offset ||=@@offset - @sql_statement[:body]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, metadata.suffix, documents.body, documents.seg, documents.ocn, metadata.tid FROM documents, metadata WHERE #{@search_text} AND documents.metadata_tid = metadata.tid ORDER BY metadata.title, metadata.filename, documents.ocn} - @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;} - select=@sql_statement[:body] + ' ' + @sql_statement[:range] - select - end - def sql_select_endnotes - limit ||=@@limit - offset ||=@@offset - @sql_statement[:endnotes]= %{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, endnotes.body, endnotes.nr, endnotes.ocn, endnotes.metadata_tid FROM metadata, endnotes WHERE #{@search_endnotes} AND metadata.tid = endnotes.metadata_tid ORDER BY metadata.title, metadata.filename, endnotes.nr} - @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;} - select=@sql_statement[:endnotes] + ' ' + @sql_statement[:range] - select - end - def sql_select_body_format - %{#{sql_select_body}} - end - def sql_select_endnotes_format - %{#{sql_select_endnotes}} - end - def contents - @conn.select_all(sql_select_body) - end - def endnotes - @conn.select_all(sql_select_endnotes) - end - end - def tail - <<-'WOK' -

- - - - - -
-

- - SiSU - -

-		 - -

- Generated by - - SiSU 0.55.3 2007-07-10 (2007w28/2) -
- - SiSU © Ralph Amissah - 1993, current 2007. - All Rights Reserved. -
- - SiSU - is software for document structuring, publishing and search, -
- - www.jus.uio.no/sisu - - and - - www.sisudoc.org - -
- w3 since October 3 1993 - - ralph@amissah.com - -

-		 -

- SiSU using: -
Standard SiSU markup syntax, -
Standard SiSU meta-markup syntax, and the -
Standard SiSU object citation numbering and system, (object/text positioning system) -
- © Ralph Amissah 1997, current 2007. - All Rights Reserved. -

-
-

- - GPLv3 - -

-		 -

- SiSU is released under - GPL v3 - or later, - - http://www.gnu.org/licenses/gpl.html - -

-		 -

- SiSU, developed using - - Ruby - - on - - Debian/Gnu/Linux - - software infrastructure, - with the usual GPL (or OSS) suspects. -
- Better - "performance, reliability, scalability, security & total cost of ownership" - [not to mention flexibility & choice] -
- Get With the Future - - Way Better! - -

-
- - - WOK - end - @tail=tail - @counter_txt_doc,@counter_txt_ocn,@counter_endn_doc,@counter_endn_ocn=0,0,0,0 - @counters_txt,@counters_endn,@sql_select_body,@sql_select_endnotes='','','','' - FCGI.each_cgi do |cgi| - begin # all code goes in begin section - @search={ :text => [],:endnotes => [] } - q=CGI.new - @db=if cgi['db'] =~/\S+/; - @stub=/SiSU_(\S+)/.match(cgi['db'])[1] - cgi['db'] - else - @stub='sisu' - 'SiSU_sisu' - end - checked_url,checked_stats,checked_searched,checked_tip,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,selected_db='','','','','','','','','' - if cgi['view']=~/text/; checked_index,checked_text='','checked' - else checked_index,checked_text='checked','' - end - checked_echo='checked' if cgi['echo'] =~/\S/ - checked_stats='checked' if cgi['stats'] =~/\S/ - checked_url='checked' if cgi['url'] =~/\S/ or cgi['u'].to_i==1 - checked_searched='checked' if cgi['searched'] =~/\S/ - checked_tip='checked' if cgi['tip'] =~/\S/ - checked_case='checked' if cgi['casesense'] =~/\S/ - checked_sql='checked' if cgi['sql'] =~/\S/ - if cgi['checks'] =~/check_all/ or cgi['check_all'] =~/\S/ or cgi['a'].to_i==1 - checked_all='checked' - checked_echo=checked_stats=checked_url=checked_searched=checked_tip=checked_sql='checked' - checked_none='' - elsif cgi['checks'] =~/check_none/ - checked_none='checked' - checked_all=checked_url=checked_stats=checked_searched=checked_tip=checked_echo=checked_sql='' - elsif cgi['checks'] =~/check_selected/ - checked_selected='checked' - elsif cgi['checks'] =~/check_default/ - checked_default='checked' - checked_echo=checked_stats=checked_url='checked' - checked_searched=checked_tip=checked_case=checked_sql='' - else - checked_selected='checked' - checked_echo=checked_stats=checked_url='checked' - checked_searched=checked_tip=checked_case=checked_sql='' - end - selected_db=case cgi['db'] - when /SiSU_pace/; '' - when /SiSU_sisu/; '' - end - db_name='sisu_sqlite.db' - db_sqlite=case cgi['db'] - when /SiSU_pace/; "/home/ralph/sisu_www/pace/sisu_sqlite.db" - when /SiSU_sisu/; "/home/ralph/sisu_www/sisu/sisu_sqlite.db" - end - @dbi="DBI:SQLite:#{db_sqlite}" #sqlite3 ? - @conn=DBI.connect(@dbi) - search_field=cgi['find'] if cgi['find'] # =~/\S+/ - @search_for=Search_request.new(search_field,q) #.analyze #% search_for - #% searches - #Canned_search.new(@base,@search_for.text1,cgi) - if @search_for.text1=~/\S+/ or @search_for.author=~/\S+/ #and search_field =~/\S/ - s1='s1=' + CGI.escape(@search_for.text1) if @search_for.text1=~/\S/ - key='key=' + CGI.escape(@search_for.keywords) if @search_for.keywords=~/\S/ - ti='&ti=' + CGI.escape(@search_for.title) if @search_for.title=~/\S/ - au='&au=' + CGI.escape(@search_for.author) if @search_for.author=~/\S/ - sj='&sj=' + CGI.escape(@search_for.subject) if @search_for.subject=~/\S/ - dsc='&dsc=' + CGI.escape(@search_for.description) if @search_for.description=~/\S/ - pb='&pb=' + CGI.escape(@search_for.publisher) if @search_for.publisher=~/\S/ - cntr='&cntr=' + CGI.escape(@search_for.contributor) if @search_for.contributor=~/\S/ - dt='&dt=' + CGI.escape(@search_for.date) if @search_for.date=~/\S/ - ty='&ty=' + CGI.escape(@search_for.type) if @search_for.type=~/\S/ - id='&id=' + CGI.escape(@search_for.identifier) if @search_for.identifier=~/\S/ - src='&src=' + CGI.escape(@search_for.source) if @search_for.source=~/\S/ - lang='&lang=' + CGI.escape(@search_for.language) if @search_for.language=~/\S/ - rel='&rel=' + CGI.escape(@search_for.relation) if @search_for.relation=~/\S/ - cov='&cov=' + CGI.escape(@search_for.coverage) if @search_for.coverage=~/\S/ - cr='&cr=' + CGI.escape(@search_for.rights) if @search_for.rights=~/\S/ - co='&co=' + CGI.escape(@search_for.comment) if @search_for.comment=~/\S/ - ab='&ab=' + CGI.escape(@search_for.abstract) if @search_for.abstract=~/\S/ - dtc='&dtc=' + CGI.escape(@search_for.date_created) if @search_for.date_created=~/\S/ - dti='&dti=' + CGI.escape(@search_for.date_issued) if @search_for.date_issued=~/\S/ - dtm='&dtm=' + CGI.escape(@search_for.date_modified) if @search_for.date_modified=~/\S/ - dta='&dta=' + CGI.escape(@search_for.date_available) if @search_for.date_available=~/\S/ - dtv='&dtv=' + CGI.escape(@search_for.date_valid) if @search_for.date_valid=~/\S/ - fns='&fns=' + CGI.escape(@search_for.filename) if @search_for.filename=~/\S/ - @@canned_search_url=if checked_all =~/checked/ - "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}&a=1" - else "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}" - end - @canned_base_url="#@base?#{s1}&db=#{cgi['db']}" - if checked_case=~/\S/ - @search[:text][1]=%{documents.clean~'#{@search_for.text1}'} #s1 - @search[:endnotes][1]=%{endnotes.clean~'#{@search_for.text1}'} #s1 - else - @search[:text][1]=%{documents.clean~*'#{@search_for.text1}'} #s1 - @search[:endnotes][1]=%{endnotes.clean~*'#{@search_for.text1}'} #s1 - end - canned_note='search url:' - else - @@canned_search_url="#@base?s1=United+Nations&db=documents&view=index" - canned_note='search url example:' - end - if search_field =~/\S+/ - analyze_format=search_field.gsub(/\s*\n/,'; ') - elsif checked_all =~/checked/ or checked_url =~/checked/ - canned_search=@@canned_search_url.scan(/(?:s1|au|ti|fns)=[^&]+/) - af=canned_search.join('; ') - af.gsub!(/s1=/,'text: ') - af.gsub!(/au=/,'author: ') - af.gsub!(/ti=/,'title: ') - af.gsub!(/fns=/,'filename: ') - af.gsub!(/%2B/,' ') - analyze_format=af - st=af.split(/\s*;\s*/) - search_field=st.join("\n") - end - green=%{} - canned_search_url_txt=CGI.escapeHTML(@@canned_search_url) - the_can=%{#{canned_note} #{canned_search_url_txt}
} - p_text=p_keywords=p_title=p_author=p_subject=p_description=p_publisher=p_contributor=p_date=p_type=p_format=p_identifier=p_source=p_language=p_relation=p_coverage=p_rights=p_comment=p_abstract=p_subject=p_filename='' - p_text=%{text: #{green}#{@search_for.text1}
} if @search_for.text1 =~/\S+/ - p_keywords=%{keywords: #{green}#{@search_for.keywords}
} if @search_for.keywords =~/\S+/ - p_title=%{title: #{green}#{@search_for.title}
} if @search_for.title =~/\S+/ - p_author=%{author: #{green}#{@search_for.author}
} if @search_for.author =~/\S+/ - p_subject=%{subject: #{green}#{@search_for.subject}
} if @search_for.subject =~/\S+/ - p_description=%{description: #{green}#{@search_for.description}
} if @search_for.description =~/\S+/ - p_publisher=%{publisher: #{green}#{@search_for.publisher}
} if @search_for.publisher =~/\S+/ - p_contributor=%{contributor: #{green}#{@search_for.contributor}
} if @search_for.contributor =~/\S+/ - p_date=%{date: #{green}#{@search_for.date}
} if @search_for.date =~/\S+/ - p_type=%{type: #{green}#{@search_for.type}
} if @search_for.type =~/\S+/ - p_format=%{format: #{green}#{@search_for.format}
} if @search_for.format =~/\S+/ - p_identifier=%{identifier: #{green}#{@search_for.identifier}
} if @search_for.identifier =~/\S+/ - p_source=%{source: #{green}#{@search_for.source}
} if @search_for.source =~/\S+/ - p_language=%{language: #{green}#{@search_for.language}
} if @search_for.language =~/\S+/ - p_relation=%{relation: #{green}#{@search_for.relation}
} if @search_for.relation =~/\S+/ - p_coverage=%{coverage: #{green}#{@search_for.coverage}
} if @search_for.coverage =~/\S+/ - p_rights=%{rights: #{green}#{@search_for.rights}
} if @search_for.rights =~/\S+/ - p_comment=%{comment: #{green}#{@search_for.comment}
} if @search_for.comment =~/\S+/ - p_abstract=%{abstract: #{green}#{@search_for.abstract}
} if @search_for.abstract =~/\S+/ - p_filename=%{filename: #{green}#{@search_for.filename}
} if @search_for.filename =~/\S+/ - search_note=<<-WOK - - database: #{green}#@db; selected view: #{green}#{cgi['view']} - search string: "#{green}#{analyze_format}"
- #{p_text} #{p_keywords} #{p_title} #{p_author} #{p_subject} #{p_description} #{p_publisher} #{p_contributor} #{p_date} #{p_type} #{p_format} #{p_identifier} #{p_source} #{p_language} #{p_relation} #{p_coverage} #{p_rights} #{p_comment} #{p_abstract} #{p_filename} - - WOK - #eg = %{canned search e.g.:
#{url}
find: #{analyze}
database: #{database}} - #dbi_canning - @header=Form.new(@base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can).submission_form #% form - unless q['s1'] =~/\S/ or q['au'] =~/\S/ or @search[:text][1] =~/\S/ - print "Content-type: text/html\n\n" - puts (@header+@tail) - else #% searches - s1=if @search_for.text1 =~/\S/ - @search_for.text1 - else 'Unavailable' - end - if checked_case=~/\S/ - @search[:text]<<%{documents.clean~'#{CGI.unescape(s1)}'} - @search[:endnotes]<<%{endnotes.clean~'#{CGI.unescape(s1)}'} - else - @search[:text]<<%{documents.clean~*'#{CGI.unescape(s1)}'} - @search[:endnotes]<<%{endnotes.clean~*'#{CGI.unescape(s1)}'} - end - #dbi_request - dbi_statement=Dbi_search_statement.new(@conn,@search_for,q,checked_case) - @text_search_flag=false - @text_search_flag=dbi_statement.text_search_flag - s_contents=dbi_statement.contents - s_endnotes=dbi_statement.endnotes - @body_main,@endnotes=[],[] - @search_regx=nil - oldtid=0 - if @text_search_flag - if checked_sql =~/\S/ - sql_select_body=dbi_statement.sql_select_body_format - sql_select_endnotes=dbi_statement.sql_select_endnotes_format - else sql_select_body,sql_select_endnotes='','' - end - @body_main << '


Main Text:
' << sql_select_body - @endnotes << '


Endnotes:
' << sql_select_endnotes - else - end - #text_objects_body - s_contents.each do |c| #% text body - location=c['filename'][/(.+?)\.(?:_?sst|ssm)$/,1] - file_suffix=c['filename'][/.+?\.(_?sst|ssm)$/,1] - lang=if location =~ /\S+?~(\S\S\S?)$/ - l=location[/\S+?~(\S\S\S?)$/,1] - location.gsub!(/(\S+?)~\S\S\S?/,'\1') - l=".#{l}" - else '' - end - #metadata_found_body - if c['tid'].to_i != oldtid.to_i - ti=if c['subtitle'] =~/\S+/; "#{c['title']} - #{c['subtitle']}" - else c['title'] - end - can_txt_srch=if cgi['view']=~/index/; %{red bullet } - else %{red bullet } - end - title=%{toc html #{ti} by #{c['creator']} #{can_txt_srch}toc html pdf portrait pdf landscape odf manifest
} if file_suffix=~/s/ #hmm watch file_suffix - if @text_search_flag; title='
'+title - else title='
'+title - end - @counter_txt_doc+=1 - oldtid=c['tid'].to_i - else title='' - end - if @text_search_flag - if cgi['view']=~/text/ #% txt body - text=if c['suffix'] !~/1/ #seg - if @search_for.text1 =~/\S+/ or q['s1'] =~/\S+/ #% only this branch is working !! - unescaped_search=if @search_for.text1 =~/\S+/; CGI.unescape(@search_for.text1) - elsif q['s1'] =~/\S+/; CGI.unescape(q['s1']) - else nil - end - @search_regx=if unescaped_search #check - search_regex=[] - build=unescaped_search.scan(/\S+/).each do |g| - if g.to_s =~/(AND|OR)/ - search_regex << '|' - else search_regex << %{#{g.to_s}} - end - end - search_regex=search_regex.join(' ') - search_regex=search_regex.gsub(/\s*\|\s*/,'|') - Regexp.new(search_regex, Regexp::IGNORECASE) - else nil - end - else nil - end - matched_para=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/) - matched=c['body'].gsub(/(<\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{\\1}) - else c['body'] - end - %{

ocn #{c['ocn']}:

#{matched_para}} - elsif c['suffix'] =~/1/ #doc - %{#{title}

ocn #{c['ocn']}:#{c['body']}} - end - @counter_txt_ocn+=1 - output=if c['seg'] =~/\S+/; title+text - else text - end - elsif cgi['view']=~/index/ #% idx body - if c['suffix'] !~/1/ #seg - index=%{#{c['ocn']}, } if @text_search_flag - elsif c['suffix'] =~/1/ #doc - index=%{#{c['ocn']}, } - end - if c['seg'] =~/\S+/ - if @text_search_flag - @counter_txt_ocn+=1 - output=title+index - end - else - @counter_txt_ocn+=1 - output=unless c['suffix'] =~/1/; title+index - else %{#{title}#{c['ocn'].sort}, } - end - end - end - else output=title - end - @counters_txt=if @counter_txt_doc > 0 - if checked_stats =~/\S/ - @@lt_t=if @counter_txt_ocn == dbi_statement.sql_limit.to_i - over='over' - true - else - over='' - false - end - %{

Found in the main body of #@counter_txt_doc documents, and at #{over} #@counter_txt_ocn locations within.
} - else '' - end - else '' - end - @body_main << output #+ details - end - #text_objects_endnote - oldtid = 0 - s_endnotes.each do |e| #% endnotes - location=e['filename'][/(.+?)\.(?:_?sst|ssm)$/,1] - file_suffix=e['filename'][/.+?\.(_?sst|ssm)$/,1] - lang=if location =~ /\S+?~(\S\S\S?)$/ - l=location[/\S+?~(\S\S\S?)$/,1] - location.gsub!(/(\S+?)~\S\S\S?/,'\1') - l=".#{l}" - else '' - end - #metadata_found_endnotes - if @text_search_flag - if e['metadata_tid'].to_i != oldtid.to_i - ti=if e['subtitle'] =~/\S+/; "#{e['title']} - #{e['subtitle']}" - else e['title'] - end - can_txt_srch=if cgi['view']=~/index/; %{red bullet } - else %{red bullet } - end - title=%{
toc html #{ti} by #{e['creator']} #{can_txt_srch}toc html pdf portraitpdf landscape odf manifest
} if file_suffix=~/s/ - @counter_endn_doc+=1 - oldtid=e['metadata_tid'].to_i - else title = '' - end - if cgi['view']=~/text/ #% txt endnotes - @counter_endn_ocn+=1 - matched_endnote=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/) - matched=e['body'].gsub(/(<\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{\\1}) - else e['body'] - end - output=%{#{title}
note #{e['nr']} referred to from ocn #{e['ocn']}: #{matched_endnote}} - elsif cgi['view']=~/index/ #% idx endnotes - @counter_endn_ocn+=1 - output=%{#{title}#{e['nr']} [§ #{e['ocn']}], } - end - @counters_endn=if @counter_endn_doc > 0 - if checked_stats =~/\S/ - @@lt_e=if @counter_endn_ocn == dbi_statement.sql_limit.to_i - over='over' - true - else - over='' - false - end - %{Found in the endnotes of #@counter_endn_doc documents, and at #{over} #@counter_endn_ocn locations within.
} - else '' - end - end - @endnotes << output #+ details - else @endnotes=[] #does not take out yet - end - end - offset=dbi_statement.sql_offset.to_s - limit=dbi_statement.sql_limit.to_s - @@lt_t ||=false; @@lt_e ||=false - canned=if (@@lt_t or @@lt_e) - dbi_statement.sql_canned_search_url(true).to_s - else - dbi_statement.sql_canned_search_url(false).to_s - end - limit=dbi_statement.sql_limit.to_s - cgi.out{@header + @counters_txt + @counters_endn + @body_main.join + @endnotes.join + canned + @tail} #% print cgi_output_header+counters+body+endnotes - end - rescue Exception => e - s='
' + CGI::escapeHTML(e.backtrace.reverse.join("\n"))
-          s << CGI::escapeHTML(e.message) + '
' - cgi.out{s} - next - ensure # eg. disconnect from server - @conn.disconnect if @conn - end - end diff --git a/data/sisu/v2/conf/completion/README b/data/sisu/v2/conf/completion/README deleted file mode 100644 index d723a140..00000000 --- a/data/sisu/v2/conf/completion/README +++ /dev/null @@ -1,7 +0,0 @@ -_sisu (naive zsh completion for SiSU) - on Debian file is located at /usr/share/sisu/conf/completion - installation: works if copied somewhere within your $fpath - do it yourself on Debian copy to ~/.zfunc or - /usr/local/share/zsh/site-functions and run compinit - - note zsh is not installed by default on a Debian system diff --git a/data/sisu/v2/conf/completion/_sisu b/data/sisu/v2/conf/completion/_sisu deleted file mode 100644 index 076795cb..00000000 --- a/data/sisu/v2/conf/completion/_sisu +++ /dev/null @@ -1,64 +0,0 @@ -#compdef sisu -# Copyright (C) 2006 Ralph Amissah -# sisu, version 0.46.1 -# same license as Zsh or SiSU -local curcontext="$curcontext" state line ret=1 -typeset -A opt_args -_arguments -s -C -M 'r:|[_-]=* r:|=*' \ - '(--convert --to -C)-U[prints to screen url output map of available output possibilities]' \ - '(--convert --to -C)-u[url mapping of output files for requested processing flags]' \ - '(--convert --to -C)-V[more verbose than -v]' \ - '(--convert --to -C)-v[verbose]' \ - '--no-ocn[-\[hHp\]switches off object citation numbering]' \ - '--no-annotate[-\[mhHpoxXabN\] strips output text of additional editors endnotes]' \ - '(--convert --to -C)-A[plaintext with dos line-feeds, footnotes follow paragraphs in which they occur]' \ - '(--convert --to -C)-a[plaintext with Unix line-feeds, footnotes follow paragraphs in which they occur]' \ - '(--convert --to -C)-b[XHTML output]' \ - '(- *)-C[initialise site]' \ - '(--convert --to -C)-c[toggle screen color on or off depending on set default]' \ - '(--convert --to -C)-E[plaintext with dos line-feeds, endnotes following main text]' \ - '(--convert --to -C)-e[plaintext with Unix line-feeds, endnotes following main text]' \ - '(--convert --to -C)-F[generate sample cgi web search form \[--webserv=webrick for sisu webrick url\]]' \ - '(--convert --to -C -h)-H[HTML output, without link suffixes]' \ - '(--convert --to -C -H)-h[HTML output]' \ - '(--convert --to -C)-I[texinfo output, not maintained]' \ - '(--convert --to -C)-L[print license info]' \ - '(--convert --to -C)-M[maintenance mode, retain intermediate processing files]' \ - '(--convert --to -C)-m[create intermediate markup file, metaverse, assumed for most output instuctions]' \ - '(--convert --to -C)-N[document content certificate, output document digests]' \ - '(--convert --to -C)-n[skip intermediate markup, skip -m]' \ - '(--convert --to -C)-o[Open Document text format output]' \ - '(--convert --to -C)-p[LaTeX pdf output]' \ - '(--convert --to -C)-q[quiet mode]' \ - '(--convert --to -C)-R[post output to remote host using rsync, requires pre-configuration]' \ - '(--convert --to -C)-r[post output to remote host using scp, requires pre-configuration]' \ - '(--convert --to -C)-S[produces and shares tarred gzipped markup source document with associated images etc.]' \ - '(--convert --to -C)-s[shares markup source]' \ - '(--convert --to -C)-t[termsheet, preprocessing]' \ - '(- *)-W[starts ruby webrick server]' \ - '(--convert --to -C)-w[concordance file]' \ - '(--convert --to -C)-X[XML dom style]' \ - '(--convert --to -C)-x[XML sax style]' \ - '(--convert --to -C)-y[output summary page, manifest of existing generated output]' \ - '(--convert --to -C)-Z[Zap delete/destroy output]' \ - '--import[-\[Dd\] imports document to database]' \ - '--update[-\[Dd\] updates document in database]' \ - '--remove[-\[Dd\] removes document from database]' \ - '--dropall[-\[Dd\] drops database, tables, indexes, all!]' \ - '--create[-\[Dd\] creates new database - tables, indexes, etc.]' \ - '--recreate[-\[Dd\] drops database, killing data and creates new empty database - tables, indexes, etc.]' \ - '(--convert --to -C)-D[postgresql database instruction]' \ - '(--convert --to -C)-d[sqlite database instruction]' \ - '(- *)--help[display help information]' \ - '(--convert --to -C -2 -3 -4 -5)-1[shortcut, initial default -mNHwpy]' \ - '(--convert --to -C -1 -3 -4 -5)-2[shortcut, initial default -mNHwpaoy]' \ - '(--convert --to -C -1 -2 -4 -5)-3[shortcut, initial default -mNHwpaobxXy]' \ - '(--convert --to -C -1 -2 -3 -5)-4[shortcut, initial default -mNHwpaobxXDy --import]' \ - '(--convert --to -C -1 -2 -3 -4)-5[shortcut, initial default -mNHwpaobxXDy --update]' \ - '--to=node[XML node based input representation, experimental]' \ - '--to=sax[XML sax based input representation, experimental]' \ - '--to=dom[XML dom based input representation, experimental]' \ - '--convert=footnotes[embedded footnotes]' \ - '--to=current[current markup]' \ - '--to=xml2sst[from sisu xml to sst]' \ - '*:SiSU files:_files -g "*.(sst|ssm)(.)"' diff --git a/data/sisu/v2/conf/convert/kdissert_to_sisu b/data/sisu/v2/conf/convert/kdissert_to_sisu deleted file mode 100644 index 35921c3e..00000000 --- a/data/sisu/v2/conf/convert/kdissert_to_sisu +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/env ruby -=begin - * Name: modify.rb - * Author: Ralph Amissah - * http://www.jus.uio.no/sisu - * http://www.jus.uio.no/sisu/SiSU/download - * Description: Conversion script from kdissert .kdi to sisu markup .sst - * Copyright (C) 2004, 2006 Ralph Amissah - * Packaged with: SiSU information Structuring Universe - - Structured information, Serialized Units - * SiSU Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Ralph Amissah - - * License: GPL 3 or later - - Summary of GPL 3 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 3 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - http://www.fsf.org/licenses/gpl.html - http://www.gnu.org/copyleft/gpl.html - http://www.jus.uio.no/sisu/gpl3.fsf - - © Ralph Amissah 1997, current 2006. - All Rights Reserved. - - * Ralph Amissah: ralph@amissah.com - ralph.amissah@gmail.com -=end -require 'rexml/document' -include REXML -argv=$* -@sisu,@sisu_base=Array.new,Array.new -unless argv.empty? - argv.each do |kdi| - if kdi =~/\.kdi$/ - system("cp #{kdi} #{kdi}.tar.gz && tar xzvf #{kdi}.tar.gz && rm #{kdi}.tar.gz") - file=File.new("maindoc.xml") - #system("cp #{kdi} /tmp/. && cd /tmp && tar xzvf /tmp/#{kdi} && cd -") - #file=File.new("/tmp/maindoc.xml") - @output=File.new("#{kdi}.sst",'w') - doc=Document.new(file) - root=doc.root - @el=Array.new - root.each do |x| - end - root.each_with_index do |content,idx| - if root.elements["item[#{idx}]/summary"] - id,ma,ch=nil,nil,Array.new - if root.elements["item[#{idx}]/id"] - id=root.elements["item[#{idx}]/id"].text.to_i - end - if root.elements["item[#{idx}]/parent"] - ma=root.elements["item[#{idx}]/parent"].text.to_s - end - if root.elements["item[#{idx}]/child"] #problem only get one child, even where several - root.get_elements("item[#{idx}]/child").each do |x| - ch << x.text - end - end - if root.elements["item[#{idx}]/summary"] - sum=root.elements["item[#{idx}]/summary"].text.to_s.strip - end - if root.elements["item[#{idx}]/text"] - txt=root.elements["item[#{idx}]/text"].text.to_s.strip - end - @el[id]=Hash.new - @el[id][:id]=id - @el[id][:ma]=ma - @el[id][:ch]=ch - @el[id][:sum]=sum - @el[id][:txt]=txt - if ma == '-1' - @el[id][:lev]=':A' - @top=id - end - end - end - @doc=Array.new - @title=@el[@top][:sum] - p @el[@top][:sum] - @doc << ':A~ ' + @el[@top][:sum] - @el[@top][:ch].each do |x| - @el[x.to_i][:lev]='1' - @doc << '1~ ' + @el[x.to_i][:sum] - @doc << @el[x.to_i][:txt] - @el[x.to_i][:ch].each do |y| - @el[y.to_i][:lev]='2' - @doc << '2~ ' + @el[y.to_i][:sum] - @doc << @el[y.to_i][:txt] - @el[y.to_i][:ch].each do |z| - @el[z.to_i][:lev]='3' - @doc << '3~ ' + @el[z.to_i][:sum] - @doc << @el[z.to_i][:txt] - @el[z.to_i][:ch].each do |za| #unsupported... consder - @el[za.to_i][:lev]='4' - @doc << '!_ ' + @el[za.to_i][:sum] - @doc << @el[za.to_i][:txt] - end - end - end - end - #@el.each_with_index do |x,i| - # if x: puts "#{i}: lev: #{x[:lev]}, id: #{x[:id]}, ma: #{x[:ma]}, ch: #{x[:ch].join(',')}" - # end - #end -# regexs strip most kdissert markup, and provide minimal info for sisu markup --> - @doc.each do |c,idx| - c.gsub!(/<\/summary>/,'') - c.gsub!(/.+?\n|<\/body>|<\/html>|

/m,'') - c.gsub!(/<\/p>/,"\n") - c.gsub!(/(.+?)<\/span>/," *{ \\1 }* ") - c.gsub!(/(.+?)<\/span>/," _{ \\1 }_ ") - c.gsub!(/(.+?)<\/span>/," /{ \\1 }/ ") - c.gsub!(/