From 4db4dcc886b85bf9db43d66025452fb33c94a9dd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 26 Nov 2014 09:12:11 -0500 Subject: c&d: project dir structure, libs moved under new branch names * libs & version files under new branch names: current & develop * previously under branch version numbers (v5|v6) * version .yml files moved * associated adjustments made as required, notably to: bin/sisu se* qi* (file headers); breakage potential, testing required * [on dir names, want release to (alphabetically) precede next/development, considered (cur|dev) (current|(dev|development|progress|next)) (stable|unstable), alpha sorting fail (release|(next|develop))] --- lib/sisu/v5/dbi.rb | 166 ----------------------------------------------------- 1 file changed, 166 deletions(-) delete mode 100644 lib/sisu/v5/dbi.rb (limited to 'lib/sisu/v5/dbi.rb') diff --git a/lib/sisu/v5/dbi.rb b/lib/sisu/v5/dbi.rb deleted file mode 100644 index 392f8472..00000000 --- a/lib/sisu/v5/dbi.rb +++ /dev/null @@ -1,166 +0,0 @@ -# encoding: utf-8 -=begin - -* Name: SiSU - -** Description: documents, structuring, processing, publishing, search -*** postgresql module, dbi import frame - -** Author: Ralph Amissah - - - -** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah, - All Rights Reserved. - -** License: GPL 3 or later: - - SiSU, a framework for document structuring, publishing and search - - Copyright (C) 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: - - - -** Git - - - -=end -module SiSU_DBI #% database building - require_relative 'se' # se.rb - include SiSU_Env; include SiSU_Screen - require_relative 'dp' # dp.rb - include SiSU_Param - require_relative 'db_dbi' # db_dbi.rb - include SiSU_DbDBI - require_relative 'html_lite_shared' # html_lite_shared.rb - include SiSU_FormatShared - class SQL - def initialize(opt) - @opt=opt - @db=SiSU_Env::InfoDb.new - if @opt.act[:psql][:set]==:on \ - or @opt.act[:sqlite][:set]==:on - @sql_type=if @opt.act[:psql][:set]==:on - maintenance_check(@opt,__FILE__,__LINE__) if @opt.act[:maintenance][:set]==:on - :pg - elsif @opt.act[:psql][:set]==:on - maintenance_check(@opt,__FILE__,__LINE__) if @opt.act[:maintenance][:set]==:on - :pg - elsif @opt.act[:sqlite][:set]==:on - maintenance_check(@opt,__FILE__,__LINE__) if @opt.act[:maintenance][:set]==:on - :sqlite - elsif @opt.act[:sqlite][:set]==:on - maintenance_check(@opt,__FILE__,__LINE__) if @opt.act[:maintenance][:set]==:on - :sqlite - else - maintenance_check(@opt,__FILE__,__LINE__) if @opt.act[:maintenance][:set]==:on - :sqlite - end - if @sql_type==:pg then SiSU_Env::Load.new('pg',true).prog - elsif @sql_type==:sqlite then SiSU_Env::Load.new('sqlite3',true).prog - end - end - end - def maintenance_check(opt,file,line) - p opt.selections.str - p "at #{file} #{line}" - end - def read_psql - begin - begin - require 'pg' - rescue LoadError - SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). - error('pg NOT FOUND (LoadError)') - end - @conn=@db.psql.conn_pg - rescue - if @opt.act[:psql_create][:set]==:on - cX=SiSU_Screen::Ansi.new(@opt.act[:color_state][:set]).cX - puts <<-WOK -manually create the database: "#{cX.green}#{@db.db}#{cX.off}" if it does not yet exist - #{cX.yellow}createdb #{@db.db}#{cX.off} - WOK - #sudo su -p postgres; createdb #{@db.db}; #[createuser?] - end - ensure - end - end - def read_sqlite - begin - begin - begin - require 'sqlite3' - rescue LoadError - SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). - error('sqlite3 NOT FOUND (LoadError)') - end - @conn=@db.sqlite.conn_sqlite3 - rescue LoadError - errmsg='sqlite3 NOT FOUND (LoadError)' - if @opt.act[:no_stop][:set]==:on - SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). - error(errmsg + ', ' + 'attempt to proceed without sqlite output (as requested)') - else - SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). - error(errmsg + ', ' + 'STOPPING') - exit - end - end - end - end - def connect - case @sql_type - when :pg then read_psql #read_pg - when :sqlite then read_sqlite - end - SiSU_Screen::Ansi.new( - @opt.act[:color_state][:set], - "SQL DB #{@sql_type.upcase}", - @opt.fno - ).dbi_title unless @opt.act[:quiet][:set]==:on - begin - SiSU_DbDBI::Case.new(@opt,@conn,@sql_type).cases - rescue - SiSU_Errors::Rescued.new($!,$@,@cf,@opt.fns).location do - __LINE__.to_s + ':' + __FILE__ - end - ensure - end - begin - rescue - connect - end - end - end -end -__END__ -- cgit v1.2.3