From 52f8b9c0b1e1606a4260ef2e0df4d525497691b1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 7 Jul 2007 09:21:47 +0100
Subject: cgi-sample search form; texinfo fix; xml scaffold; help, man pages
 etc. visited; screen output, color set to true; docbook entries removed

* cgi generated sample search form
  * order results on files of the same title, in multiple files (with
    different filenames)
  * postgresql, character case sensitivity, control, on/off
  * tail decoration, gplv3 & sisu info

* texinfo/info (pinfo) module starts to do something vaguely useful again
  [not a much used module, testing required]

* print XML rendition of document structure to screen -T

* sisurc.yml default, color set to true
  [apologies if this causes anyone any inconvenience, it is configurable in
  sisurc.yml]

* help, man pages, README (man(8) related and env, 'sisu -V')

* docbook entries removed for the present time

* sisu-install (install ruby rant script renamed) and permissions set to
  executable
---
 lib/sisu/v0/sysenv.rb | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'lib/sisu/v0/sysenv.rb')

diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index f1aa19fc..c2d694f2 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -92,7 +92,7 @@ module SiSU_Env
     out=Config::CONFIG['localstatedir']
     etc=Config::CONFIG['sysconfdir'] + '/sisu'
     share=Config::CONFIG['datadir'] + '/sisu'
-    data=Config::CONFIG['datadir'] + '/sisu-examples/sample'
+    data=Config::CONFIG['datadir'] + '/doc/sisu'
     m=/.+\/(\S+)/m
     @stub_pwd ||=@@pwd[m,1]
     prcss_dir='_sisu_processing'
@@ -506,7 +506,7 @@ module SiSU_Env
     def rcs                                                                    #rcs for document markup data
       program='rcs'
       program_ref="\n\t\tdocument version information requested"
-      if program_found?(rcs); true
+      if program_found?(program); true
       else puts "\tWARN: #{program} is not installed #{program_ref}"               #if @cmd =~/v/
         false
       end
@@ -514,7 +514,7 @@ module SiSU_Env
     def cvs                                                                    #cvs for document markup data
       program='cvs'
       program_ref="\n\t\tdocument version information requested"
-      if program_found?(cvs); true
+      if program_found?(program); true
       else puts "\tWARN: #{program} is not installed #{program_ref}"               #if @cmd =~/v/
         false
       end
@@ -574,6 +574,14 @@ module SiSU_Env
       else                        puts "\tWARN: #{program} is not installed #{program_ref}" if cmd =~/V/
       end
     end
+    def rmagick                                                                    #rmagick is a ruby library
+      program='identify'
+      program_ref="\n\t\tsee http://www.imagemagick.org/"
+      if program_found?(program); true
+      else puts "\tWARN: #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+        false
+      end
+    end
     def well_formed?                                                           #tidy - check for well formed xml xhtml etc.
       program=@prog.tidy
       program_ref="\n\t\tsee http://tidy.sourceforge.net/"
@@ -610,7 +618,7 @@ module SiSU_Env
     def makeinfo                                                               #texinfo
       program='makeinfo'
       program_ref="\n\t\tsee http://www.gnu.org/software/texinfo/"
-      if program_found?(program); system("makeinfo #@input\n")
+      if program_found?(program); system("#{program} #@input\n")
       else                        puts "\tWARN: #{program} is not installed #{program_ref}"
       end
     end
@@ -1556,6 +1564,13 @@ module SiSU_Env
         end
         is
       end
+      def rmagick
+        if defined? @rc['program_set']['rmagick'];        is=@rc['program_set']['rmagick']
+        end
+        if is.nil? or is==true;                           is='rmagick'
+        end
+        is
+      end
       def rexml                                                                  #should be part of ruby 1.8 but apparently not always
         is=if FileTest.directory?("#{Config::CONFIG['rubylibdir']}/rexml") #Config::CONFIG['sitedir']
           true
-- 
cgit v1.2.3