Merge branch 'upstream' into debian/sid

1 files changed, 8 insertions, 5 deletions

diff --git a/lib/sisu/v0/db_load_tuple.rb b/lib/sisu/v0/db_load_tuple.rb
index 510dd94e..d85346cc 100644
--- a/lib/sisu/v0/db_load_tuple.rb
+++ b/lib/sisu/v0/db_load_tuple.rb
@@ -31,9 +31,12 @@
 
    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.fsf.org/licensing/licenses/gpl.html>
    <http://www.gnu.org/copyleft/gpl.html>
-   <http://www.jus.uio.no/sisu/gpl.fsf>
+
+   <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
+   <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
+   <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
 
  * SiSU uses:
    * Standard SiSU markup syntax,
@@ -86,8 +89,8 @@ module SiSU_DB_tuple
         })
         end
         if @opt.cmd =~/v/
-          if @col[:lev].to_s =~/[1235678]/
-            lev=case @col[:lev].to_s
+          if @col[:lev].inspect =~/[1235678]/
+            lev=case @col[:lev].inspect
             when /1/; ':A'
             when /2/; ':B'
             when /3/; ':C'
@@ -95,7 +98,7 @@ module SiSU_DB_tuple
             when /6/; ' 3'
             end
             puts %{#{lev}>\t#{@col[:lv1]}\t#{@col[:lv2]}\t#{@col[:lv3]}\t#{@col[:lv4]}\t#{@col[:lv5]}\t#{@col[:lv6]}\t#{@col[:ocn]}\t#{@col[:ocnd]}\t#{@col[:ocns]}}
-          elsif @col[:lev].to_s =~/[4]/
+          elsif @col[:lev].inspect =~/[4]/
             puts %{ #{@cX.green}1>#{@cX.off}\t#{@col[:lv1]}\t#{@col[:lv2]}\t#{@col[:lv3]}\t#{@col[:lv4]}\t#{@col[:lv5]}\t#{@col[:lv6]}\t#{@col[:ocn]}\t#{@col[:ocnd]}\t#{@col[:ocns]}\t#{@col[:seg]}}
           end
         end