cgi-common, match fixes, rest removal of hanging whitespace

20 files changed, 124 insertions, 124 deletions

diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb
index 66786cea..3e27c1d2 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb
@@ -3,7 +3,7 @@
  * Author: Ralph@Amissah.com
    * http://www.jus.uio.no/sisu
    * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin for SiSU descriptive pages, ... 
+ * Description: Document skin for SiSU descriptive pages, ...
  * License: Same as SiSU see http://www.jus.uio.no/sisu
  * Notes: Site default appearance variables set in defaults.rb
      Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
@@ -35,7 +35,7 @@ module SiSU_Viz
     end
     def url_site                                                                     # used in pdf header
 #puts "#{__LINE__} #{__FILE__}"
-      'http://www.jus.uio.no/sisu' 
+      'http://www.jus.uio.no/sisu'
     end
     def url_txt                                                                      # text to go with url usually stripped url
 #puts "#{__LINE__} #{__FILE__}"
@@ -50,7 +50,7 @@ module SiSU_Viz
     #end
     #% color
     def color_band1
-      '"#ffffff"'      
+      '"#ffffff"'
     end
     def color_band2
       '"#ffffff"'
@@ -60,7 +60,7 @@ module SiSU_Viz
     	' SiSU'
     end
     def text_home
-      'SiSU' 
+      'SiSU'
     end
     #% icon
     def icon_home_button
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb
index 50516f85..9f12228f 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb
@@ -42,14 +42,14 @@ module SiSU_Viz
     end
     # color
     def color_band1
-      '"#000070"'      
+      '"#000070"'
     end
     #% txt
     def txt_hp
     	'Free Software Foundation'
     end
     def txt_home                                                                     # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
-      #"www.jus.uio.no/sisu/" 
+      #"www.jus.uio.no/sisu/"
     	'Free Software Foundation'
     end
     #% icon
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb
index 0df9c7ff..261f924a 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb
@@ -3,7 +3,7 @@
  * Author: Ralph Amissah
    * http://www.jus.uio.no/sisu
    * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin sample prepared for Gutenberg Project (first used with "War and Peace") 
+ * Description: Document skin sample prepared for Gutenberg Project (first used with "War and Peace")
  * License: Same as SiSU see http://www.jus.uio.no/sisu
  * Notes: Site default appearance variables set in defaults.rb
      Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
@@ -13,7 +13,7 @@ module SiSU_Viz
   class Skin
     #% path
     def path_root                                                                     # the only parameter that cannot be changed here
-      './sisu/'  
+      './sisu/'
     end
     def path_rel
       '../'
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb
index 87d371f2..3d8c0485 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb
@@ -37,14 +37,14 @@ module SiSU_Viz
     end
     #% color
     def color_band1
-      '"#ffffff"'      
+      '"#ffffff"'
     end
     #% txt
     def txt_hp
     	'Kdissert, Document Mapping'
     end
     def txt_home                                                                     # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
-      #"www.jus.uio.no/sisu/" 
+      #"www.jus.uio.no/sisu/"
     	'SiSU (document prepared using Kdissert)'
     end
     #% icon
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb
index 2ec6c841..2a87c3a5 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb
@@ -3,7 +3,7 @@
  * Author: Ralph Amissah
    * http://www.jus.uio.no/sisu
    * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin used for Free as in Freedom 
+ * Description: Document skin used for Free as in Freedom
  * License: Same as SiSU see http://www.jus.uio.no/sisu
  * Notes: Site default appearance variables set in defaults.rb
      Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
@@ -45,15 +45,15 @@ module SiSU_Viz
     #end
     #% color
     def color_band1
-      '"#cccccc"'      
-      #'"#000070"'      
+      '"#cccccc"'
+      #'"#000070"'
     end
     #% txt
     def txt_hp
     	'Free as in Freedom'
     end
     def txt_home                                                                     # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
-      #"www.jus.uio.no/sisu/" 
+      #"www.jus.uio.no/sisu/"
     	'Free as in Freedom'
     end
     #% icon
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb
index 66786cea..3e27c1d2 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb
@@ -3,7 +3,7 @@
  * Author: Ralph@Amissah.com
    * http://www.jus.uio.no/sisu
    * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin for SiSU descriptive pages, ... 
+ * Description: Document skin for SiSU descriptive pages, ...
  * License: Same as SiSU see http://www.jus.uio.no/sisu
  * Notes: Site default appearance variables set in defaults.rb
      Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
@@ -35,7 +35,7 @@ module SiSU_Viz
     end
     def url_site                                                                     # used in pdf header
 #puts "#{__LINE__} #{__FILE__}"
-      'http://www.jus.uio.no/sisu' 
+      'http://www.jus.uio.no/sisu'
     end
     def url_txt                                                                      # text to go with url usually stripped url
 #puts "#{__LINE__} #{__FILE__}"
@@ -50,7 +50,7 @@ module SiSU_Viz
     #end
     #% color
     def color_band1
-      '"#ffffff"'      
+      '"#ffffff"'
     end
     def color_band2
       '"#ffffff"'
@@ -60,7 +60,7 @@ module SiSU_Viz
     	' SiSU'
     end
     def text_home
-      'SiSU' 
+      'SiSU'
     end
     #% icon
     def icon_home_button
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_countries.yml b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_countries.yml
index a68903e1..179b9978 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_countries.yml
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_countries.yml
@@ -1,4 +1,4 @@
-# arch-tag: yaml country list 
+# arch-tag: yaml country list
 # Author: Ralph@Amissah.com
 # License: Same as SiSU see http://www.jus.uio.no/sisu
 id: AF
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_country.yml b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_country.yml
index ebaf8ace..dc835465 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_country.yml
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_country.yml
@@ -1,4 +1,4 @@
-# arch-tag: yaml country list array 
+# arch-tag: yaml country list array
 # Author: Ralph@Amissah.com
 # License: Same as SiSU see http://www.jus.uio.no/sisu
 -
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/sisu_output_overview.ssi b/data/doc/sisu/sisu_markup_samples/dfsg/sisu_output_overview.ssi
index 4cc32196..e2c90529 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/sisu_output_overview.ssi
+++ b/data/doc/sisu/sisu_markup_samples/dfsg/sisu_output_overview.ssi
@@ -49,7 +49,7 @@ group{
   Done
   * yes/done
   . partial
-  
+
   - not available/appropriate
 
   Not Done
diff --git a/data/sisu/conf/cgi-bin/sisu_search_pgsql.cgi b/data/sisu/conf/cgi-bin/sisu_search_pgsql.cgi
index 0d2ed982..6ac1bac4 100644
--- a/data/sisu/conf/cgi-bin/sisu_search_pgsql.cgi
+++ b/data/sisu/conf/cgi-bin/sisu_search_pgsql.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 =begin
- * Name: SiSU information Structuring Universe   
+ * Name: SiSU information Structuring Universe
  * Author: Ralph Amissah
    * http://www.jus.uio.no/sisu
    * http://www.jus.uio.no/sisu/SiSU/download
@@ -39,11 +39,11 @@
   SiSU was first released to the public on January 4th 2005
 
   SiSU uses:
-  
+
   *  Standard SiSU markup syntax,
   *  Standard SiSU meta-markup syntax, and the
   *  Standard SiSU object citation numbering and system
-  
+
   © Ralph Amissah 1997, current 2006.
   All Rights Reserved.
 
@@ -69,7 +69,7 @@ class Form
     @base,@search_field,@selected_db,@checked_index,@checked_text,@checked_tip,@checked_searched,@checked_url,@checked_echo,@checked_sql,@checked_all,@checked_none,@checked_ignore,@search_note,@the_can=base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_searched,checked_url,checked_echo,checked_sql,checked_all,checked_none,checked_ignore,search_note,the_can
     @tip=if checked_tip =~/\S/
       '<font size="2" color="#666666">text:__; keywords:__; title:__; author:__; subject:__; description:__; publisher:__; contributor:__; date:__; type:__; format:__; identifier:__; source:__; language:__; relation:__; coverage:__; rights:__; comment:__; abstract:__; </font>'
-    else '' 
+    else ''
     end
   end
   def submission_form
@@ -101,7 +101,7 @@ class Form
   </td><td valign=\"top\">
     #@tip
   </td></tr>
-</table>           
+</table>
       <font size="2" color="#222222">
       <input type="checkbox" name="echo" #@checked_echo> echo
       <input type="checkbox" name="searched" #@checked_searched> searched
@@ -335,10 +335,10 @@ class Dbi_search_statement
     %{SELECT metadata.title, 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, endnotes.nr ;}
   end
   def sql_select_body_format
-    %{<font color="#666666" size="2">#{sql_select_body}</font>} 
+    %{<font color="#666666" size="2">#{sql_select_body}</font>}
   end
   def sql_select_endnotes_format
-    %{<font color="#666666" size="2">#{sql_select_endnotes}</font>} 
+    %{<font color="#666666" size="2">#{sql_select_endnotes}</font>}
   end
   def contents
     @conn.select_all(sql_select_body)
@@ -670,8 +670,8 @@ FCGI.each_cgi do |cgi|
     @search=Hash.new
     @search[:text],@search[:endnotes]=Array.new,Array.new
     q=CGI.new
-    @db=if cgi['db'] =~/\S+/: 
-      @stub=/SiSU_(\S+)/.match(cgi['db'])[1] 
+    @db=if cgi['db'] =~/\S+/:
+      @stub=/SiSU_(\S+)/.match(cgi['db'])[1]
       cgi['db']
     else
       @stub='sisu'
@@ -681,17 +681,17 @@ FCGI.each_cgi do |cgi|
     if cgi['view']=~/text/: checked_index,checked_text='','checked'
     else                    checked_index,checked_text='checked',''
     end
-    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_echo='checked' if cgi['echo'] =~/\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_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_echo='checked' if cgi['echo'] =~/\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_url=checked_searched=checked_tip=checked_echo=checked_sql='checked'
-      checked_none='' 
-    elsif cgi['checks'] =~/check_none/ #or cgi['a'].to_i==0 
+      checked_none=''
+    elsif cgi['checks'] =~/check_none/ #or cgi['a'].to_i==0
       checked_none='checked'