From a34b7c62f3ccc48ba473aaebd3634a10f4e25fe3 Mon Sep 17 00:00:00 2001
From: Ralph Amissah
Date: Thu, 20 Dec 2007 00:35:09 +0000
Subject: sisu-0.63.0 + md5s
---
CHANGELOG | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9743aa8f..a159d1cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,9 +11,9 @@ Reverse Chronological:
%% sisu_0.63.0.orig.tar.gz (2007-12-20:51/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0.orig.tar.gz
- sisu_0.63.0.orig.tar.gz
- sisu_0.63.0-1.dsc
- sisu_0.63.0-1.diff.gz
+ 280792a14893ba5a912a7d300a9c2d74 1484075 sisu_0.63.0.orig.tar.gz
+ 27523129a29d1d27e8b3b343f525a5d6 629 sisu_0.63.0-1.dsc
+ 958736cfeaf188806a0933c775de1294 145944 sisu_0.63.0-1.diff.gz
* texpdf, (latex pdf) generate sisu latex output in a single pass
--
cgit v1.2.3
From 1dd09c8731bdef87885260a77091e5e0e9918bfe Mon Sep 17 00:00:00 2001
From: Ralph Amissah
Date: Mon, 31 Dec 2007 13:41:20 +0000
Subject: change primary key indexes to bigint (requested)
---
lib/sisu/v0/db_create.rb | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/lib/sisu/v0/db_create.rb b/lib/sisu/v0/db_create.rb
index 68d0ae3d..ac8f78bf 100644
--- a/lib/sisu/v0/db_create.rb
+++ b/lib/sisu/v0/db_create.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
@@ -98,7 +98,7 @@ module SiSU_DB_create
} unless @opt.cmd =~/q/
@conn.execute(%{
CREATE TABLE metadata (
- tid INT4 PRIMARY KEY,
+ tid BIGINT PRIMARY KEY,
title VARCHAR(#{lt_title}) NULL,
subtitle VARCHAR(#{lt_subtitle}) NULL,
creator VARCHAR(#{lt_creator}) NULL,
@@ -163,8 +163,8 @@ module SiSU_DB_create
} unless @opt.cmd =~/q/
@conn.execute(%{
CREATE TABLE documents (
- lid INT4 PRIMARY KEY,
- metadata_tid INT4 REFERENCES metadata,
+ lid BIGINT PRIMARY KEY,
+ metadata_tid BIGINT REFERENCES metadata,
ocn SMALLINT,
ocnd VARCHAR(6),
ocns VARCHAR(6),
@@ -193,14 +193,14 @@ module SiSU_DB_create
end
def endnotes
print %{
- to be populated from documents files
+ to be populated from document files
create tables endnotes
data import through ruby transfer
} unless @opt.cmd =~/q/
@conn.execute(%{
CREATE TABLE endnotes (
- nid INT4 PRIMARY KEY,
- document_lid INT4 REFERENCES documents,
+ nid BIGINT PRIMARY KEY,
+ document_lid BIGINT REFERENCES documents,
nr SMALLINT,
clean TEXT NULL,
body TEXT NULL,
@@ -208,21 +208,21 @@ module SiSU_DB_create
ocnd VARCHAR(6),
ocns VARCHAR(6),
digest_clean CHAR(#{@@dl}),
- metadata_tid INT4 REFERENCES metadata
+ metadata_tid BIGINT REFERENCES metadata
);
#{@comment.endnotes}
})
end
def endnotes_asterisk
print %{
- to be populated from documents files
+ to be populated from document files
create tables endnotes_asterisk
data import through ruby transfer
} unless @opt.cmd =~/q/
@conn.execute(%{
CREATE TABLE endnotes_asterisk (
- nid INT4 PRIMARY KEY,
- document_lid INT4 REFERENCES documents,
+ nid BIGINT PRIMARY KEY,
+ document_lid BIGINT REFERENCES documents,
nr SMALLINT,
clean TEXT NULL,
body TEXT NULL,
@@ -230,21 +230,21 @@ module SiSU_DB_create
ocnd VARCHAR(6),
ocns VARCHAR(6),
digest_clean CHAR(#{@@dl}),
- metadata_tid INT4 REFERENCES metadata
+ metadata_tid BIGINT REFERENCES metadata
);
#{@comment.endnotes_asterisk}
})
end
def endnotes_plus
print %{
- to be populated from documents files
+ to be populated from document files
create tables endnotes_plus
data import through ruby transfer
} unless @opt.cmd =~/q/
@conn.execute(%{
CREATE TABLE endnotes_plus (
- nid INT4 PRIMARY KEY,
- document_lid INT4 REFERENCES documents,
+ nid BIGINT PRIMARY KEY,
+ document_lid BIGINT REFERENCES documents,
nr SMALLINT,
clean TEXT NULL,
body TEXT NULL,
@@ -252,7 +252,7 @@ module SiSU_DB_create
ocnd VARCHAR(6),
ocns VARCHAR(6),
digest_clean CHAR(#{@@dl}),
- metadata_tid INT4 REFERENCES metadata
+ metadata_tid BIGINT REFERENCES metadata
);
#{@comment.endnotes_plus}
})
@@ -266,7 +266,7 @@ module SiSU_DB_create
} unless @opt.cmd =~/q/
@conn.execute(%{
CREATE TABLE urls (
- metadata_tid INT4 REFERENCES metadata,
+ metadata_tid BIGINT REFERENCES metadata,
plaintext varchar(512),
html_toc varchar(512),
html_doc varchar(512),
--
cgit v1.2.3
From 79ec1b334485eb29fc19d8fb13c2e27d238edbb1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah
Date: Mon, 31 Dec 2007 13:47:58 +0000
Subject: adjustments for ruby1.9 (xmas), in sysenv moved default location of
processing directory
sysenv, processing in subdirectory under /tmp/_sisu_processing~ [instead
of within home], (subdirectory) named after owner with permissions
restricted to owner
---
lib/sisu/v0/hub.rb | 10 +-
lib/sisu/v0/param.rb | 8 +-
lib/sisu/v0/sysenv.rb | 340 ++++++++++++++++++++++++++++----------------------
lib/sisu/v0/texpdf.rb | 12 +-
4 files changed, 211 insertions(+), 159 deletions(-)
diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v0/hub.rb
index 475d626a..da1c6324 100644
--- a/lib/sisu/v0/hub.rb
+++ b/lib/sisu/v0/hub.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
@@ -546,8 +546,10 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
end
end
begin #% select what to do
- require 'jcode'
- $KCODE='UTF8'
+ if RUBY_VERSION < '1.9'
+ require 'jcode'
+ $KCODE='UTF8'
+ end
require "#{SiSU_lib}/options"
require "#{SiSU_lib}/sysenv"
include SiSU_Env
diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb
index 8bf0d760..2f2043fb 100644
--- a/lib/sisu/v0/param.rb
+++ b/lib/sisu/v0/param.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
@@ -60,7 +60,9 @@
module SiSU_Param
require 'uri'
require 'pstore'
- require 'ftools'
+ if RUBY_VERSION < '1.9'
+ require 'ftools'
+ end
require "#{SiSU_lib}/sysenv"
include SiSU_Env
require "#{SiSU_lib}/param_identify_markup"
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index fa6be6cb..b4252e28 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
@@ -88,7 +88,7 @@ module SiSU_Env
@t.month
end
def year_static
- '2007'
+ '2008'
end
end
class Info_system
@@ -101,24 +101,22 @@ module SiSU_Env
data=Config::CONFIG['datadir'] + '/doc/sisu'
m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
@stub_pwd ||=@@pwd[m,1]
- prcss_dir='_sisu_processing'
+ prcss_dir='_sisu_processing~'
prcss_dir_tmp_root="/tmp/#{prcss_dir}"
prcss_dir_stub="#{prcss_dir}/#{@stub_pwd}"
- @processing_dir=if @@home \
+ if @@user
+ tmp_processing="#{prcss_dir_tmp_root}/#{@@user}/#{@stub_pwd}"
+ tmp_processing_individual="#{prcss_dir_tmp_root}/#{@@user}/#{@stub_pwd}"
+ else #error
+ tmp_processing=tmp_processing_individual="/tmp/#{prcss_dir_stub}"
+ end
+ tmp_processing_home=if @@home \
and File.writable?("#{@@home}/.")
"#{@@home}/#{prcss_dir_stub}"
- #elsif File.writable?("#{@@pwd}/."); "#{@@pwd}/#{prcss_dir}"
else prcss_dir_stub
end
- tmp_processing_base=if @@user; "#{prcss_dir_tmp_root}/#{@@user}/#{@stub_pwd}"
- else "#{prcss_dir_stub}"
- end
- tmp_processing_base_user=if @@user; "#{prcss_dir_tmp_root}/#{@@user}/#{@stub_pwd}"
- else "/tmp/#{prcss_dir_stub}"
- end
- tmp_processing=if @@user; "#{prcss_dir_tmp_root}/#{@@user}/#{@stub_pwd}"
- else "/tmp/#{prcss_dir_stub}"
- end
+ processing_path=tmp_processing_individual
+ processing_dir=prcss_dir
user=ENV['USER']
port_pgsql=if defined? ENV['PGPORT'] \
and not (ENV['PGPORT'].nil? \
@@ -141,9 +139,9 @@ module SiSU_Env
WEBSERV_RSS=:webserv_rss
WEBSERV_SQLITE=:webserv_sqlite
OUTPUT_LOCAL=:output_local
+ PROCESSING_DIR=:processing_dir
PROCESSING_PATH=:processing_path
PROCESSING_DIR_TMP_ROOT=:processing_dir_tmp_root
- PROCESSING_PATH_TMP=:processing_path_tmp
PROCESSING_PATH_TMP_BASE=:processing_path_tmp_base
PROCESSING_DAL=:processing_dal
PROCESSING_TUNE=:processing_tune
@@ -165,47 +163,47 @@ module SiSU_Env
SQLITE_PATH=:sqlite_path
SQLITE_PORT=:sqlite_port
DEFAULT_DIR={
- IMAGES => '_sisu/image',
- SISU_ETC => etc,
- SISU_SHARE => share,
- SAMPLE_DATA_PATH => data,
- IMAGE_STUB => '_sisu/image',
- STYLESHEET_STUB => '_sisu/css',
- IMAGE_LOCAL => @@pwd + '/_sisu/image',
- WEBSERV_PATH => out + '/www',
- #WEBSERV_DIR => www, # uncomment for urls...
- #WEBSERV_IMAGE => out + '/www/_sisu/image',
- WEBSERV_MAN => out + '/www/man', #alter
- WEBSERV_PHP => out + '/www/php',
- WEBSERV_CGI => '/usr/lib/cgi-bin',
- WEBSERV_RSS => out + '/www/feed',
- WEBSERV_SQLITE => out + '/www/sqlite',
- OUTPUT_LOCAL => @@home + '/sisu_www',
- PROCESSING_PATH => @processing_dir,
+ IMAGES => '_sisu/image',
+ SISU_ETC => etc,
+ SISU_SHARE => share,
+ SAMPLE_DATA_PATH => data,
+ IMAGE_STUB => '_sisu/image',
+ STYLESHEET_STUB => '_sisu/css',
+ IMAGE_LOCAL => @@pwd + '/_sisu/image',
+ WEBSERV_PATH => out + '/www',
+ #WEBSERV_DIR => www, # uncomment for urls...
+ #WEBSERV_IMAGE => out + '/www/_sisu/image',
+ WEBSERV_MAN => out + '/www/man', #alter
+ WEBSERV_PHP => out + '/www/php',
+ WEBSERV_CGI => '/usr/lib/cgi-bin',
+ WEBSERV_RSS => out + '/www/feed',
+ WEBSERV_SQLITE => out + '/www/sqlite',
+ OUTPUT_LOCAL => @@home + '/sisu_www',
+ PROCESSING_DIR => processing_dir,
+ PROCESSING_PATH => processing_path,
PROCESSING_DIR_TMP_ROOT => prcss_dir_tmp_root,
- PROCESSING_PATH_TMP_BASE => tmp_processing_base,
- PROCESSING_PATH_TMP => tmp_processing,
- PROCESSING_DAL => 'dal',
- PROCESSING_TUNE => 'tune',
- PROCESSING_LATEX => 'tex',
- PROCESSING_TEXINFO => 'texinfo',
- PROCESSING_LOUT => 'lout',
- PROCESSING_ENCODING => 'encoding',
- #TEXINFO_STUB => 'texinfo',
- PAPERSIZE => 'A4', #A4, US_letter, book_b5, book_a5, US_legal
- LANGUAGE => 'English',
- LANGUAGE_CODE => 'en', #change, unecessary duplication though currently used
- MULTILINGUAL => true,
- CONCORD_MAX => 260000,
- DIGEST => 'md5',
- WEBSERV_HOST_CGI => 'http://localhost',
- WEBSERV_PORT_CGI => 8081, #8111,8123,8081
- POSTGRESQL_USER => @@user, #'ralph', # change user !!!
- POSTGRESQL_PORT => port_pgsql,
- #POSGRESQL_LINKS_PATH => '',
- SQLITE_USER => @@user,
- SQLITE_PATH => @@user, #??
- SQLITE_PORT => '**',
+ PROCESSING_PATH_TMP_BASE => processing_path,
+ PROCESSING_DAL => 'dal',
+ PROCESSING_TUNE => 'tune',
+ PROCESSING_LATEX => 'tex',
+ PROCESSING_TEXINFO => 'texinfo',
+ PROCESSING_LOUT => 'lout',
+ PROCESSING_ENCODING => 'encoding',
+ #TEXINFO_STUB => 'texinfo',
+ PAPERSIZE => 'A4', #A4, US_letter, book_b5, book_a5, US_legal
+ LANGUAGE => 'English',
+ LANGUAGE_CODE => 'en', #change, unecessary duplication though currently used
+ MULTILINGUAL => true,
+ CONCORD_MAX => 260000,
+ DIGEST => 'md5',
+ WEBSERV_HOST_CGI => ' http://localhost',
+ WEBSERV_PORT_CGI => 8081, #8111,8123,8081
+ POSTGRESQL_USER => @@user, #'ralph', # change user !!!
+ POSTGRESQL_PORT => port_pgsql,
+ #POSGRESQL_LINKS_PATH => '',
+ SQLITE_USER => @@user,
+ SQLITE_PATH => @@user, #??
+ SQLITE_PORT => '**',
}
@@default_dir=DEFAULT_DIR
m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
@@ -1340,33 +1338,70 @@ WOK
def processing_dir_tmp_root
defaults[:processing_dir_tmp_root]
end
- def processing #processing directory, used/needed for sisu work files, has sub-directories (dal,tex etc)
- unless FileTest.directory?(defaults[:processing_dir_tmp_root])
- File.mkpath(defaults[:processing_dir_tmp_root])
- File.chmod(0777,defaults[:processing_dir_tmp_root])
- end
- File.mkpath(defaults[:processing_path]) unless FileTest.directory?(defaults[:processing_path])
- File.mkpath(defaults[:processing_path_tmp]) unless FileTest.directory?(defaults[:processing_path_tmp])
- path_processing=if defined? @rc['processing']['path'] \
- and @rc['processing']['path']
- unless FileTest.directory?("#{path.home}/#{@rc['processing']['path']}")
- File.mkpath("#{path.home}/#{@rc['processing']['path']}")
+ def processing_path_root
+ proposed_path_base=if defined? @rc['processing']['path'] \
+ and not @rc['processing']['path'].nil? \
+ and not @rc['processing']['path'].empty?
+ x=if @rc['processing']['path'] =~/^(?:~|home)$/
+ home #fix
+ else @rc['processing']['path']
+ end
+ else nil
+ end
+ proposed_dir=if defined? @rc['processing']['dir'] \
+ and not @rc['processing']['dir'].nil? \
+ and not @rc['processing']['dir'].empty?
+ @rc['processing']['dir']
+ else defaults[:processing_dir]
+ end
+ path=if proposed_path_base \
+ and FileTest.directory?(proposed_path_base) \
+ and File.writable?("#{proposed_path_base}/.")
+ x=if proposed_dir
+ "#{proposed_path_base}/#{proposed_dir}"
+ else
+ "#{proposed_path_base}/#{defaults[:processing_dir]}"
end
- ["#{path.home}/#{@rc['processing']['path']}",defaults[:processing_path],defaults[:processing_path_tmp]]
- else [defaults[:processing_path],defaults[:processing_path_tmp]]
+ else defaults[:processing_dir_tmp_root]
+ end
+ end
+ def processing_path_usr?
+ case processing_path_root
+ when /^\/home/; false
+ else true
+ end
+ end
+ def processing_path
+ if processing_path_usr?
+ "#{processing_path_root}/#{user}/#{stub_pwd}"
+ else
+ "#{processing_path_root}/#{stub_pwd}" # see defaults[:processing_path]
end
- @processing=nil
+ end
+ def processing #processing directory, used/needed for sisu work files, has sub-directories (dal,tex etc)
+ unless FileTest.directory?(processing_path_root)
+ File.mkpath(processing_path_root)
+ File.chmod(0777,processing_path_root)
+ end
+ if processing_path_usr?
+ processing_path_usr="#{processing_path_root}/#{user}"
+ File.mkpath(processing_path_usr) unless FileTest.directory?(processing_path_usr)
+ File.chmod(0700,processing_path_usr)
+ end
+ File.mkpath(processing_path) unless FileTest.directory?(processing_path)
+ File.chmod(0700,processing_path)
+ path_processing=[processing_path,defaults[:processing_path],defaults[:processing_path_home]]
+ processing=nil
path_processing.each do |v| #
- #if File.writable?("#{v}/.") #check now is earlier
- @processing=v
- unless FileTest.directory?(@processing)
- puts "a processing directory (#@processing) is being created for use by sisu"
- File.mkpath(@processing)
- end
- break
- #end
+ processing=v
+ unless FileTest.directory?(processing)
+ puts "a processing directory (#{processing}) is being created for use by sisu"
+ File.mkpath(processing)
+ File.chmod(0700,processing)
+ end
+ break
end
- @processing
+ processing
end
def composite_file
pth=path.dal #"#{processing}/composite"
@@ -1374,15 +1409,15 @@ WOK
pth
end
def dal
- pth=if defined? @rc['processing']['dal']; "#{processing}/#{@rc['processing']['dal']}"
- else "#{processing}/#{defaults[:processing_dal]}"
+ pth=if defined? @rc['processing']['dal']; "#{processing}/#{@rc['processing']['dal']}"
+ else "#{processing}/#{defaults[:processing_dal]}"
end
File.mkpath(pth) unless FileTest.directory?(pth)
pth
end
def tune
- pth=if defined? @rc['processing']['tune']; "#{processing}/#{@rc['processing']['tune']}"
- else "#{processing}/#{defaults[:processing_tune]}"
+ pth=if defined? @rc['processing']['tune']; "#{processing}/#{@rc['processing']['tune']}"
+ else "#{processing}/#{defaults[:processing_tune]}"
end
File.mkpath(pth) unless FileTest.directory?(pth)
pth
@@ -1391,15 +1426,15 @@ WOK
"#{processing}/odf"
end
def tex
- pth=if defined? @rc['processing']['latex']; "#{processing}/#{@rc['processing']['latex']}"
- else "#{processing}/#{defaults[:processing_latex]}"
+ pth=if defined? @rc['processing']['latex']; "#{processing}/#{@rc['processing']['latex']}"
+ else "#{processing}/#{defaults[:processing_latex]}"
end
File.mkpath(pth) unless FileTest.directory?(pth)
pth
end
def texi
- pth=if defined? @rc['processing']['texinfo']; "#{processing}/#{@rc['processing']['texinfo']}"
- else "#{processing}/#{defaults[:processing_texinfo]}"
+ pth=if defined? @rc['processing']['texinfo']; "#{processing}/#{@rc['processing']['texinfo']}"
+ else "#{processing}/#{defaults[:processing_texinfo]}"
end
File.mkpath(pth) unless FileTest.directory?(pth)
pth
@@ -1408,15 +1443,15 @@ WOK
"#{processing}/#{defaults[:processing_texinfo]}"
end
def lout
- pth=if defined? @rc['processing']['lout']; "#{processing}/#{@rc['processing']['lout']}"
- else "#{processing}/#{defaults[:processing_lout]}"
+ pth=if defined? @rc['processing']['lout']; "#{processing}/#{@rc['processing']['lout']}"
+ else "#{processing}/#{defaults[:processing_lout]}"
end
File.mkpath(pth) unless FileTest.directory?(pth)
pth
end
def feed
- if defined? @rc['webserv']['feed']; "#{public_output}/#{@rc['webserv']['feed']}"
- else defaults[:webserv_feed]
+ if defined? @rc['webserv']['feed']; "#{public_output}/#{@rc['webserv']['feed']}"
+ else defaults[:webserv_feed]
end
end
def feed_home
@@ -1435,8 +1470,8 @@ WOK
end
end
def php
- if defined? @rc['webserv']['php']; "#{public_output}/#{@rc['webserv']['php']}"
- else defaults[:webserv_php]
+ if defined? @rc['webserv']['php']; "#{public_output}/#{@rc['webserv']['php']}"
+ else defaults[:webserv_php]
end
end
# programs
@@ -1653,15 +1688,15 @@ WOK
else 'filesystem'
end
output=case output_type
- when /^filesystem(?:_url)?/; url.dir_url
- when /^remote(?:_webserv)?/; url.remote
- when /^(?:webserv|local_webserv)/; url.local
- when /^local(:\d+)/; url.hostname + $1 + '/' + stub_pwd
- when /^localhost(:\d+)/; url.localhost + $1 + '/' + stub_pwd
- when /^localhost/; url.localhost
- when /^webrick/; url.webrick
- when /^path/; url.webserv_map_pwd
- else url.webserv_map_pwd
+ when /^filesystem(?:_url)?/; url.dir_url
+ when /^remote(?:_webserv)?/; url.remote
+ when /^(?:webserv|local_webserv)/; url.local
+ when /^local(:\d+)/; url.hostname + $1 + '/' + stub_pwd
+ when /^localhost(:\d+)/; url.localhost + $1 + '/' + stub_pwd
+ when /^localhost/; url.localhost
+ when /^webrick/; url.webrick
+ when /^path/; url.webserv_map_pwd
+ else url.webserv_map_pwd
end
end
def images
@@ -1670,7 +1705,9 @@ WOK
def images_local
if FileTest.directory?(defaults[:image_local])
if @@image_flag
- require 'ftools'
+ if RUBY_VERSION < '1.9'
+ require 'ftools'
+ end
images=Dir.glob("#{defaults[:image_local]}/*.{png,jpg,gif}")
pth="#{path.webserv}/#@stub_pwd"
File.mkpath("#{pth}/_sisu/image") unless FileTest.directory?("#{pth}/_sisu/image")
@@ -1696,7 +1733,9 @@ WOK
def images_external
if FileTest.directory?(image_external)
if @@image_flag
- require 'ftools'
+ if RUBY_VERSION < '1.9'
+ require 'ftools'
+ end
images=Dir.glob("#{image_external}/*.{png,jpg,gif}")
pth="#{path.webserv}/#@stub_pwd"
File.mkpath("#{pth}/_sisu/image_external") unless FileTest.directory?("#{pth}/_sisu/image_external")
@@ -1777,7 +1816,7 @@ WOK
elsif defined? @rc['program_select']['console_web_browser'] \
and @rc['program_select']['console_web_browser'] =~/\S\S+/
@rc['program_select']['console_web_browser']
- else 'console-www-browser' #'links2' 'elinks' 'epiphany'
+ else 'console-www-browser' #'lynx' 'links2' 'elinks' 'epiphany'
end
end
def console_www_browser
@@ -1874,7 +1913,7 @@ WOK
is
end
def postgresql
- is=if defined? @rc['program_set']['postgresql']; @rc['program_set']['postgresql']
+ is=if defined? @rc['program_set']['postgresql']; @rc['program_set']['postgresql']
else ''
end
if is.nil? \
@@ -1884,7 +1923,7 @@ WOK
is
end
def sqlite
- is=if defined? @rc['program_set']['sqlite']; @rc['program_set']['sqlite']
+ is=if defined? @rc['program_set']['sqlite']; @rc['program_set']['sqlite']
else ''
end
if is.nil? \
@@ -1903,16 +1942,16 @@ WOK
conf=if defined? @rc['default']['language']; @rc['default']['language']
else nil
end
- l=if pwd=~m ; pwd[m1,1] #2 directory: by visible directory name
- elsif conf; @rc['default']['language'] #3 config: from sisurc.yaml
- else defaults[:language] #4 sisu: program default
+ l=if pwd=~m ; pwd[m1,1] #2 directory: by visible directory name
+ elsif conf; @rc['default']['language'] #3 config: from sisurc.yaml
+ else defaults[:language] #4 sisu: program default
end #1 document: param gets
SiSU_Env::Standardise_language.new(l)
end
def multilingual
if defined? @rc['default']['multilingual'] \
- and @rc['default']['multilingual'] != nil; @rc['default']['multilingual']
- else defaults[:multilingual]
+ and @rc['default']['multilingual'] != nil; @rc['default']['multilingual']
+ else defaults[:multilingual]
end
end
def lang_filename(l)
@@ -1926,12 +1965,12 @@ WOK
end
if (l != defaults[:language_code]) \
or (language.code != defaults[:language_code]) #watch
- if x==1; @lang[:pre],@lang[:mid],@lang[:post]="#{l}.",'',''
- elsif x==2; @lang[:pre],@lang[:mid],@lang[:post]='',".#{l}",''
- elsif x==3; @lang[:pre],@lang[:mid],@lang[:post]='','',".#{l}"
- else @lang[:pre],@lang[:mid],@lang[:post]='','',''
+ if x==1; @lang[:pre],@lang[:mid],@lang[:post]="#{l}.",'',''
+ elsif x==2; @lang[:pre],@lang[:mid],@lang[:post]='',".#{l}",''
+ elsif x==3; @lang[:pre],@lang[:mid],@lang[:post]='','',".#{l}"
+ else @lang[:pre],@lang[:mid],@lang[:post]='','',''
end
- else @lang[:pre],@lang[:mid],@lang[:post]='','',''
+ else @lang[:pre],@lang[:mid],@lang[:post]='','',''
end
@lang
end
@@ -2036,12 +2075,12 @@ WOK
class Info_settings < Info_env
def permission?(prog) #program defaults
if defined? @rc['permission_set'][prog]; @rc['permission_set'][prog]
- else false
+ else false
end
end
def program?(prog) #program defaults
if defined? @rc['program_set'][prog]; @rc['program_set'][prog]
- else false
+ else false
end
end
end
@@ -2074,33 +2113,33 @@ WOK
and @md.cmd !~ /[hH]/
ft << @md.fn[:manifest]
end
- if @md.cmd =~ /p/; ft << @md.fn[:pdf_l] << @md.fn[:pdf_p]
+ if @md.cmd =~ /p/; ft << @md.fn[:pdf_l] << @md.fn[:pdf_p]
end
- if @md.cmd =~ /x/; ft << @md.fn[:sax]
+ if @md.cmd =~ /x/; ft << @md.fn[:sax]
end
- if @md.cmd =~ /X/; ft << @md.fn[:dom]
+ if @md.cmd =~ /X/; ft << @md.fn[:dom]
end
- if @md.cmd =~ /b/; ft << @md.fn[:xhtml]
+ if @md.cmd =~ /b/; ft << @md.fn[:xhtml]
end
- if @md.cmd =~ /a/; ft << @md.fn[:plain]
+ if @md.cmd =~ /a/; ft << @md.fn[:plain]
end
- if @md.cmd =~ /i/; ft << @md.fn[:manpage]
+ if @md.cmd =~ /i/; ft << @md.fn[:manpage]
end
- if @md.cmd =~ /[g]/; ft << @md.fn[:wiki]
+ if @md.cmd =~ /g/; ft << @md.fn[:wiki]
end
- if @md.cmd =~ /N/; ft << @md.fn[:digest]
+ if @md.cmd =~ /N/; ft << @md.fn[:digest]
end
- if @md.cmd =~ /o/; ft << @md.fn[:odf]
+ if @md.cmd =~ /o/; ft << @md.fn[:odf]
end
- if @md.cmd =~ /O/; ft << @md.fn[:oai_pmh]
+ if @md.cmd =~ /O/; ft << @md.fn[:oai_pmh]
end
- if @md.cmd =~ /s/; ft << @md.fns
+ if @md.cmd =~ /s/; ft << @md.fns
end
- if @md.cmd =~ /S/; ft << @md.fn[:sisupod] << '.kdi'
+ if @md.cmd =~ /S/; ft << @md.fn[:sisupod] << '.kdi'
end
@fnb=@md.fnb
else # still needed where/when param is not parsed
- if @opt.cmd =~ /[hH]/; ft << '.html' << '.html.??'
+ if @opt.cmd =~ /[hH]/; ft << '.html' << '.html.??'
end
if @opt.cmd =~ /w/ \
and @opt.cmd !~ /[hH]/
@@ -2110,29 +2149,29 @@ WOK
and @opt.cmd !~ /[hH]/
ft << 'sisu_manifest.html' << '??.sisu_manifest.html' << 'sisu_manifest.??.html'
end
- if @opt.cmd =~ /p/; ft << 'landscape.pdf' << 'portrait.pdf' << '.pdf'
+ if @opt.cmd =~ /p/; ft << 'landscape.pdf' << 'portrait.pdf' << '.pdf'
end
- if @opt.cmd =~ /x/; ft << 'sax.xml' << '??.sax.xml' << 'sax.??.xml'
+ if @opt.cmd =~ /x/; ft << 'sax.xml' << '??.sax.xml' << 'sax.??.xml'
end
- if @opt.cmd =~ /X/; ft << 'dom.xml' << '??.dom.xml' << 'dom.??.xml'
+ if @opt.cmd =~ /X/; ft << 'dom.xml' << '??.dom.xml' << 'dom.??.xml'
end
- if @opt.cmd =~ /b/; ft << 'scroll.xhtml' << '??.scroll.xhtml' << 'scroll.??.xhtml'
+ if @opt.cmd =~ /b/; ft << 'scroll.xhtml' << '??.scroll.xhtml' << 'scroll.??.xhtml'
end
- if @opt.cmd =~ /i/; ft << '.1' << '??.man.1' << 'man.??.1'
+ if @opt.cmd =~ /i/; ft << '.1' << '??.man.1' << 'man.??.1'
end
- if @opt.cmd =~ /a/; ft << 'plain.txt' << '??.plain.txt' << 'plain.??.txt'
+ if @opt.cmd =~ /a/; ft << 'plain.txt' << '??.plain.txt' << 'plain.??.txt'
end
- if @opt.cmd =~ /[g]/; ft << 'wiki.txt' << '??.wiki.txt' << 'wiki.??.txt'
+ if @opt.cmd =~ /g/; ft << 'wiki.txt' << '??.wiki.txt' << 'wiki.??.txt'
end
- if @opt.cmd =~ /N/; ft << 'digest.txt' << '??.digest.txt' << 'digest.??.txt'
+ if @opt.cmd =~ /N/; ft << 'digest.txt' << '??.digest.txt' << 'digest.??.txt'
end
- if @opt.cmd =~ /o/; ft << 'opendocument.odt' << '??.opendocument.odt' << 'opendocument.??.odt'
+ if @opt.cmd =~ /o/; ft << 'opendocument.odt' << '??.opendocument.odt' << 'opendocument.??.odt'
end
- if @opt.cmd =~ /O/; ft << 'oai_pmh.xml'
+ if @opt.cmd =~ /O/; ft << 'oai_pmh.xml'
end
- if @opt.cmd =~ /s/; ft << '.sst' << '.ssi' << '.ssm'
+ if @opt.cmd =~ /s/; ft << '.sst' << '.ssi' << '.ssm'
end
- if @opt.cmd =~ /S/; ft << '.zip' << '.kdi'
+ if @opt.cmd =~ /S/; ft << '.zip' << '.kdi'
end
if @opt.mod.inspect =~ /sxm|sxs|xml/; ft << @fnb << '.sxs.xml'
end
@@ -2146,7 +2185,7 @@ WOK
@filetypes=if filetypes !~/..+/; '' # -r called alone, copy all
elsif @opt.cmd =~/u/; '' # -u added, copy all, (used to create remote directory tree see output path), not the usual function of -u
elsif filetypes =~/\S+?,\S+/; '*{' + filetypes + '}' # more than one relevant file type
- else '*' + filetypes # one relevant file type
+ else '*' + filetypes # one relevant file type
end
@source_path=if @fnb \
and not @fnb.empty?
@@ -2498,7 +2537,9 @@ WOK
class Info_version
Date: Mon, 31 Dec 2007 13:53:26 +0000
Subject: year updated to 2008 - happy new year
---
CHANGELOG | 18 ++++++++++++++++++
bin/sisu | 6 +++---
bin/sisu_termsheet | 6 +++---
bin/sisu_webrick | 6 +++---
data/doc/sisu/copyright | 2 +-
.../sisu_markup_samples/sisu_manual/_sisu/sisurc.yml | 3 ++-
lib/sisu/v0/cgi.rb | 4 ++--
lib/sisu/v0/cgi_pgsql.rb | 4 ++--
lib/sisu/v0/cgi_sql_common.rb | 12 ++++++------
lib/sisu/v0/cgi_sqlite.rb | 4 ++--
lib/sisu/v0/character_encoding.rb | 4 ++--
lib/sisu/v0/composite.rb | 4 ++--
lib/sisu/v0/concordance.rb | 4 ++--
lib/sisu/v0/conf.rb | 4 ++--
lib/sisu/v0/css.rb | 4 ++--
lib/sisu/v0/dal.rb | 4 ++--
lib/sisu/v0/dal_doc_str.rb | 4 ++--
lib/sisu/v0/dal_doc_str_code.rb | 4 ++--
lib/sisu/v0/dal_doc_str_tables.rb | 4 ++--
lib/sisu/v0/dal_syntax.rb | 4 ++--
lib/sisu/v0/db_columns.rb | 4 ++--
lib/sisu/v0/db_dbi.rb | 4 ++--
lib/sisu/v0/db_drop.rb | 4 ++--
lib/sisu/v0/db_import.rb | 4 ++--
lib/sisu/v0/db_indexes.rb | 4 ++--
lib/sisu/v0/db_load_tuple.rb | 4 ++--
lib/sisu/v0/db_remove.rb | 4 ++--
lib/sisu/v0/db_select.rb | 4 ++--
lib/sisu/v0/db_tests.rb | 4 ++--
lib/sisu/v0/dbi.rb | 4 ++--
lib/sisu/v0/defaults.rb | 4 ++--
lib/sisu/v0/digests.rb | 4 ++--
lib/sisu/v0/embedded.rb | 4 ++--
lib/sisu/v0/errors.rb | 4 ++--
lib/sisu/v0/help.rb | 8 ++++----
lib/sisu/v0/html.rb | 4 ++--
lib/sisu/v0/html_format.rb | 4 ++--
lib/sisu/v0/html_format_css.rb | 4 ++--
lib/sisu/v0/html_promo.rb | 4 ++--
lib/sisu/v0/html_scroll.rb | 4 ++--
lib/sisu/v0/html_segments.rb | 4 ++--
lib/sisu/v0/html_table.rb | 4 ++--
lib/sisu/v0/html_tune.rb | 4 ++--
lib/sisu/v0/i18n.rb | 4 ++--
lib/sisu/v0/manifest.rb | 4 ++--
lib/sisu/v0/manpage.rb | 4 ++--
lib/sisu/v0/manpage_format.rb | 4 ++--
lib/sisu/v0/odf.rb | 4 ++--
lib/sisu/v0/odf_format.rb | 4 ++--
lib/sisu/v0/options.rb | 4 ++--
lib/sisu/v0/param_identify_markup.rb | 4 ++--
lib/sisu/v0/plaintext.rb | 4 ++--
lib/sisu/v0/plaintext_format.rb | 4 ++--
lib/sisu/v0/relaxng.rb | 8 ++++----
lib/sisu/v0/remote.rb | 4 ++--
lib/sisu/v0/response.rb | 4 ++--
lib/sisu/v0/rexml.rb | 4 ++--
lib/sisu/v0/screen_text_color.rb | 4 ++--
lib/sisu/v0/share_src.rb | 4 ++--
lib/sisu/v0/share_src_kdissert.rb | 4 ++--
lib/sisu/v0/shared_html.rb | 4 ++--
lib/sisu/v0/shared_html_lite.rb | 4 ++--
lib/sisu/v0/shared_txt.rb | 4 ++--
lib/sisu/v0/shared_xml.rb | 4 ++--
lib/sisu/v0/sisupod_make.rb | 4 ++--
lib/sisu/v0/sitemaps.rb | 4 ++--
lib/sisu/v0/spell.rb | 4 ++--
lib/sisu/v0/sst_convert_markup.rb | 4 ++--
lib/sisu/v0/sst_do_inline_footnotes.rb | 4 ++--
lib/sisu/v0/sst_from_kdissert.rb | 4 ++--
lib/sisu/v0/sst_from_xml.rb | 4 ++--
lib/sisu/v0/sst_identify_markup.rb | 4 ++--
lib/sisu/v0/sst_to_s_xml_dom.rb | 4 ++--
lib/sisu/v0/sst_to_s_xml_node.rb | 4 ++--
lib/sisu/v0/sst_to_s_xml_sax.rb | 4 ++--
lib/sisu/v0/termsheet.rb | 4 ++--
lib/sisu/v0/texinfo.rb | 4 ++--
lib/sisu/v0/texinfo_format.rb | 4 ++--
lib/sisu/v0/texpdf_format.rb | 4 ++--
lib/sisu/v0/update.rb | 4 ++--
lib/sisu/v0/urls.rb | 4 ++--
lib/sisu/v0/webrick.rb | 4 ++--
lib/sisu/v0/wikispeak.rb | 4 ++--
lib/sisu/v0/xhtml.rb | 4 ++--
lib/sisu/v0/xml.rb | 4 ++--
lib/sisu/v0/xml_dom.rb | 4 ++--
lib/sisu/v0/xml_fictionbook.rb | 4 ++--
lib/sisu/v0/xml_format.rb | 4 ++--
lib/sisu/v0/xml_md_oai_pmh_dc.rb | 4 ++--
lib/sisu/v0/xml_scaffold.rb | 4 ++--
lib/sisu/v0/xml_tables.rb | 4 ++--
lib/sisu/v0/zap.rb | 4 ++--
92 files changed, 210 insertions(+), 191 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index a159d1cd..3ab4c973 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,24 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.63.1.orig.tar.gz (2007-12-28:52/5)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.1.orig.tar.gz
+ sisu_0.63.1.orig.tar.gz
+ sisu_0.63.1-1.dsc
+ sisu_0.63.1-1.diff.gz
+
+ * processing, default processing directory moved to /tmp and renamed
+ _sisu_processing~ [previously was in user's home ~/_sisu_processing]
+ a user subdirectory is made and permissions set to user 700
+ pros: get rid of an unattractive directory in user's home
+ cons: /tmp is usually in / which is frequently a relatively small directory
+ compromise: is possible to set an alternative path for processing in
+ sisurc.yml
+
+ * sql (postgresql, sqlite), switch primary keys to bigint (as requested)
+
+ * copyright dates updated
+
%% sisu_0.63.0.orig.tar.gz (2007-12-20:51/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0.orig.tar.gz
280792a14893ba5a912a7d300a9c2d74 1484075 sisu_0.63.0.orig.tar.gz
diff --git a/bin/sisu b/bin/sisu
index 7d99f2cb..670cf36c 100755
--- a/bin/sisu
+++ b/bin/sisu
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-#SiSU: copyright (C) 1997..2007 Ralph Amissah; License GPL, see appended program information
+#SiSU: copyright (C) 1997..2008 Ralph Amissah; License GPL, see appended program information
raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
$VERBOSE=nil
$KCODE='u'
@@ -15,14 +15,14 @@ __END__
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/bin/sisu_termsheet b/bin/sisu_termsheet
index 032e386c..32395401 100755
--- a/bin/sisu_termsheet
+++ b/bin/sisu_termsheet
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-#SiSU: copyright (C) 1997..2007 Ralph Amissah; License GPL, see appended program information
+#SiSU: copyright (C) 1997..2008 Ralph Amissah; License GPL, see appended program information
raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
$VERBOSE=nil
branch='v0'
@@ -14,14 +14,14 @@ __END__
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/bin/sisu_webrick b/bin/sisu_webrick
index 6eb04447..ed467c0d 100755
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-#SiSU: copyright (C) 1997..2007 Ralph Amissah; License GPL, see appended program information
+#SiSU: copyright (C) 1997..2008 Ralph Amissah; License GPL, see appended program information
raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
$VERBOSE=nil
branch='v0'
@@ -14,14 +14,14 @@ __END__
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/data/doc/sisu/copyright b/data/doc/sisu/copyright
index 9681feda..844aa839 100644
--- a/data/doc/sisu/copyright
+++ b/data/doc/sisu/copyright
@@ -13,7 +13,7 @@ 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
+ 2007, 2008 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
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
index 18d562e3..183c61c1 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
@@ -49,7 +49,8 @@ show_output_on: 'filesystem_url'
# stub: 'texinfo'
#% processing directories, main path and subdirectories
processing:
-# path: 'sisu_processing'
+# path: '~'
+# dir: '.sisu_processing~'
# metaverse: 'metaverse'
# tune: 'tune'
# latex: 'tex'
diff --git a/lib/sisu/v0/cgi.rb b/lib/sisu/v0/cgi.rb
index 44a643d8..4b917360 100644
--- a/lib/sisu/v0/cgi.rb
+++ b/lib/sisu/v0/cgi.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/cgi_pgsql.rb b/lib/sisu/v0/cgi_pgsql.rb
index 32ea1762..540e5d72 100644
--- a/lib/sisu/v0/cgi_pgsql.rb
+++ b/lib/sisu/v0/cgi_pgsql.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/cgi_sql_common.rb b/lib/sisu/v0/cgi_sql_common.rb
index 946d5e35..d4be484e 100644
--- a/lib/sisu/v0/cgi_sql_common.rb
+++ b/lib/sisu/v0/cgi_sql_common.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
@@ -80,14 +80,14 @@ module SiSU_CGI_sql
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
@@ -536,7 +536,7 @@ module SiSU_CGI_sql
#{v[:project]} © Ralph Amissah
- 1993, current 2007.
+ 1993, current 2008.
All Rights Reserved.
@@ -563,7 +563,7 @@ module SiSU_CGI_sql
Standard SiSU meta-markup syntax, and the
Standard SiSU object citation numbering and system, (object/text positioning system)
- © Ralph Amissah 1997, current 2007.
+ © Ralph Amissah 1997, current 2008.
All Rights Reserved.
diff --git a/lib/sisu/v0/cgi_sqlite.rb b/lib/sisu/v0/cgi_sqlite.rb
index 248f14d0..e94986d4 100644
--- a/lib/sisu/v0/cgi_sqlite.rb
+++ b/lib/sisu/v0/cgi_sqlite.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/character_encoding.rb b/lib/sisu/v0/character_encoding.rb
index 949bd95e..e7e1d0ec 100644
--- a/lib/sisu/v0/character_encoding.rb
+++ b/lib/sisu/v0/character_encoding.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v0/composite.rb
index 630378bc..fb393384 100644
--- a/lib/sisu/v0/composite.rb
+++ b/lib/sisu/v0/composite.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/concordance.rb b/lib/sisu/v0/concordance.rb
index 9f108f71..814e2b88 100644
--- a/lib/sisu/v0/concordance.rb
+++ b/lib/sisu/v0/concordance.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/conf.rb b/lib/sisu/v0/conf.rb
index 75311869..a11cb807 100644
--- a/lib/sisu/v0/conf.rb
+++ b/lib/sisu/v0/conf.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/css.rb b/lib/sisu/v0/css.rb
index 7a1ce22b..75aa3330 100644
--- a/lib/sisu/v0/css.rb
+++ b/lib/sisu/v0/css.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb
index 6fb96c13..6bd11568 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v0/dal.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/dal_doc_str.rb b/lib/sisu/v0/dal_doc_str.rb
index a299899f..a59800c4 100644
--- a/lib/sisu/v0/dal_doc_str.rb
+++ b/lib/sisu/v0/dal_doc_str.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/dal_doc_str_code.rb b/lib/sisu/v0/dal_doc_str_code.rb
index d70497c1..65da8d1f 100644
--- a/lib/sisu/v0/dal_doc_str_code.rb
+++ b/lib/sisu/v0/dal_doc_str_code.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/dal_doc_str_tables.rb b/lib/sisu/v0/dal_doc_str_tables.rb
index 09e97edb..7289543e 100644
--- a/lib/sisu/v0/dal_doc_str_tables.rb
+++ b/lib/sisu/v0/dal_doc_str_tables.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb
index 5b2bb6e4..4224973d 100644
--- a/lib/sisu/v0/dal_syntax.rb
+++ b/lib/sisu/v0/dal_syntax.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/db_columns.rb b/lib/sisu/v0/db_columns.rb
index ec160814..9adcaa4d 100644
--- a/lib/sisu/v0/db_columns.rb
+++ b/lib/sisu/v0/db_columns.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/db_dbi.rb b/lib/sisu/v0/db_dbi.rb
index ac187ff2..82b0750c 100644
--- a/lib/sisu/v0/db_dbi.rb
+++ b/lib/sisu/v0/db_dbi.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/db_drop.rb b/lib/sisu/v0/db_drop.rb
index 90feaa85..eb027fb7 100644
--- a/lib/sisu/v0/db_drop.rb
+++ b/lib/sisu/v0/db_drop.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/db_import.rb b/lib/sisu/v0/db_import.rb
index 680bd5f8..38cbb45d 100644
--- a/lib/sisu/v0/db_import.rb
+++ b/lib/sisu/v0/db_import.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/db_indexes.rb b/lib/sisu/v0/db_indexes.rb
index 344f325a..457ad124 100644
--- a/lib/sisu/v0/db_indexes.rb
+++ b/lib/sisu/v0/db_indexes.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/db_load_tuple.rb b/lib/sisu/v0/db_load_tuple.rb
index 3d7b8ab5..c69f279b 100644
--- a/lib/sisu/v0/db_load_tuple.rb
+++ b/lib/sisu/v0/db_load_tuple.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/db_remove.rb b/lib/sisu/v0/db_remove.rb
index 1c1d5d9c..867f5d22 100644
--- a/lib/sisu/v0/db_remove.rb
+++ b/lib/sisu/v0/db_remove.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/db_select.rb b/lib/sisu/v0/db_select.rb
index 9f57cb89..337fb3e0 100644
--- a/lib/sisu/v0/db_select.rb
+++ b/lib/sisu/v0/db_select.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/db_tests.rb b/lib/sisu/v0/db_tests.rb
index 8b5402fb..6974455e 100644
--- a/lib/sisu/v0/db_tests.rb
+++ b/lib/sisu/v0/db_tests.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/dbi.rb b/lib/sisu/v0/dbi.rb
index ec1d173e..c787a60e 100644
--- a/lib/sisu/v0/dbi.rb
+++ b/lib/sisu/v0/dbi.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb
index 17ab8186..1671bf8b 100644
--- a/lib/sisu/v0/defaults.rb
+++ b/lib/sisu/v0/defaults.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/digests.rb b/lib/sisu/v0/digests.rb
index a21d0f8a..2382fb88 100644
--- a/lib/sisu/v0/digests.rb
+++ b/lib/sisu/v0/digests.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/embedded.rb b/lib/sisu/v0/embedded.rb
index c48012d5..82c0317f 100644
--- a/lib/sisu/v0/embedded.rb
+++ b/lib/sisu/v0/embedded.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/errors.rb b/lib/sisu/v0/errors.rb
index 67d8a986..0b7b7a21 100644
--- a/lib/sisu/v0/errors.rb
+++ b/lib/sisu/v0/errors.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
diff --git a/lib/sisu/v0/help.rb b/lib/sisu/v0/help.rb
index 379f9d54..c4037431 100644
--- a/lib/sisu/v0/help.rb
+++ b/lib/sisu/v0/help.rb
@@ -7,14 +7,14 @@
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
+ 2007, 2008 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
+ 2007, 2008 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
@@ -159,7 +159,7 @@ module SiSU_Help
end
def summary
print <
Date: Wed, 2 Jan 2008 19:45:03 +0000
Subject: sql, postgresql allow tcp/ip connections, parameters from rc file,
sisurc.yml
---
CHANGELOG | 5 ++++-
conf/sisu/sisurc.yml | 10 ++++++----
.../sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml | 6 ++++--
lib/sisu/v0/dbi.rb | 4 ++--
lib/sisu/v0/sysenv.rb | 13 +++++++++++++
5 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 3ab4c973..4b09e37d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,7 +9,7 @@ Reverse Chronological:
%% STABLE MANIFEST
-%% sisu_0.63.1.orig.tar.gz (2007-12-28:52/5)
+%% sisu_0.63.1.orig.tar.gz (2008-01-02:00/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.1.orig.tar.gz
sisu_0.63.1.orig.tar.gz
sisu_0.63.1-1.dsc
@@ -23,6 +23,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.1.orig.tar.gz
compromise: is possible to set an alternative path for processing in
sisurc.yml
+ * sql, postgresql allow tcp/ip connections... take relevant parameters from
+ resource configuration file, sisurc.yml
+
* sql (postgresql, sqlite), switch primary keys to bigint (as requested)
* copyright dates updated
diff --git a/conf/sisu/sisurc.yml b/conf/sisu/sisurc.yml
index c135f270..82915369 100644
--- a/conf/sisu/sisurc.yml
+++ b/conf/sisu/sisurc.yml
@@ -45,7 +45,8 @@ show_output_on: 'filesystem_url'
# stub: 'texinfo'
##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
#processing:
-# path: '_sisu_processing'
+# path: '~'
+# dir: '.sisu_processing~'
# metaverse: 'metaverse'
# tune: 'tune'
# latex: 'tex'
@@ -56,7 +57,6 @@ flag:
color: true # making colour default -c is toggle, and will now toggle colour off
default: '-NhwpoabxXyYv' # includes verbose; -m would in any event be run by default
i: '-hwpoyv' # includes verbose; -m run by default
- i: '-Nhwpoayv' # includes verbose; -m run by default
ii: '-NhwpoabxXyv' # includes verbose; -m run by default
iii: '-NhwpoabxXyYv' # includes verbose; -m run by default
iv: '-NhwpoabxXYDyv --import' # includes verbose; -m run by default
@@ -84,8 +84,10 @@ default:
#% sql database info, postgresql and sqlite
#db:
# postgresql:
-# user: '[username]'
-# port: '[port (default is 5432]'
+# 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: "**"
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
index 183c61c1..fa0987d1 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
@@ -86,8 +86,10 @@ default:
##sql database info, postgresql and sqlite
#db:
# postgresql:
-# user: '[provide username]'
-# port: '5432'
+# 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: "**"
diff --git a/lib/sisu/v0/dbi.rb b/lib/sisu/v0/dbi.rb
index c787a60e..2e633bad 100644
--- a/lib/sisu/v0/dbi.rb
+++ b/lib/sisu/v0/dbi.rb
@@ -93,8 +93,8 @@ module SiSU_DBI
end
def read_psql
begin
- db,user,dbi=@db.psql.db,@db.psql.user,@db.psql.dbi
- @conn=DBI.connect(dbi,user,db)
+ db,user,dbi,pass=@db.psql.db,@db.psql.user,@db.psql.dbi,@db.psql.password
+ @conn=DBI.connect(dbi,user,pass)
rescue
if @opt.mod.inspect=~/--(createall|create)/
puts %{manually create the database: "#{db}" if it does not yet exist}
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index b4252e28..4187f6e9 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -2648,6 +2648,19 @@ WOK
else ''
end
end
+ def host
+ if defined? @rc['db']['postgresql']['host'] \
+ and @rc['db']['postgresql']['host']=~/(?:\S{1,3}\.){3}\S{1,3}|\S+?\.\S+/
+ @rc['db']['postgresql']['host']
+ else ''
+ end
+ end
+ def dbi
+ if psql.host =~/(?:\S{1,3}\.){3}\S{1,3}|\S+?\.\S+/
+ "DBI:Pg:database=#{psql.db};host=#{psql.host};port=#{psql.port}"
+ else "DBI:Pg:database=#{psql.db};port=#{psql.port}"
+ end
+ end
self
end
def mysql
--
cgit v1.2.3
From 58084d17d833e35f3a44319862d5c76085eac320 Mon Sep 17 00:00:00 2001
From: Ralph Amissah
Date: Wed, 2 Jan 2008 20:22:50 +0000
Subject: bump version number
---
CHANGELOG | 20 ++++++++++----------
conf/sisu/sisurc.yml | 2 +-
.../sisu_markup_samples/sisu_manual/_sisu/sisurc.yml | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4b09e37d..adf269e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,11 +9,16 @@ Reverse Chronological:
%% STABLE MANIFEST
-%% sisu_0.63.1.orig.tar.gz (2008-01-02:00/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.1.orig.tar.gz
- sisu_0.63.1.orig.tar.gz
- sisu_0.63.1-1.dsc
- sisu_0.63.1-1.diff.gz
+%% sisu_0.64.0.orig.tar.gz (2008-01-02:00/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
+ sisu_0.64.0.orig.tar.gz
+ sisu_0.64.0-1.dsc
+ sisu_0.64.0-1.diff.gz
+
+ * sql, postgresql allow tcp/ip connections... take relevant parameters from
+ resource configuration file, sisurc.yml
+
+ * sql (postgresql, sqlite), switch primary keys to bigint (as requested)
* processing, default processing directory moved to /tmp and renamed
_sisu_processing~ [previously was in user's home ~/_sisu_processing]
@@ -23,11 +28,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.1.orig.tar.gz
compromise: is possible to set an alternative path for processing in
sisurc.yml
- * sql, postgresql allow tcp/ip connections... take relevant parameters from
- resource configuration file, sisurc.yml
-
- * sql (postgresql, sqlite), switch primary keys to bigint (as requested)
-
* copyright dates updated
%% sisu_0.63.0.orig.tar.gz (2007-12-20:51/4)
diff --git a/conf/sisu/sisurc.yml b/conf/sisu/sisurc.yml
index 82915369..d5c186e8 100644
--- a/conf/sisu/sisurc.yml
+++ b/conf/sisu/sisurc.yml
@@ -84,7 +84,7 @@ default:
#% sql database info, postgresql and sqlite
#db:
# postgresql:
-# port: # '[port (default is 5432]'
+# 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]'
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
index fa0987d1..ab6d99d0 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
@@ -86,7 +86,7 @@ default:
##sql database info, postgresql and sqlite
#db:
# postgresql:
-# port: # '[port (default is 5432]'
+# 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]'
--
cgit v1.2.3