From 8edbb1387588fadd3469a450dd00362c4455d639 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 24 Sep 2011 07:37:00 -0400
Subject: v2 v3: param, matching of date, years 1400 - 21\d\d

---
 data/doc/sisu/CHANGELOG_v2 |  2 ++
 data/doc/sisu/CHANGELOG_v3 |  2 ++
 lib/sisu/v2/param.rb       | 12 ++++++------
 lib/sisu/v3/param.rb       |  8 ++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index a4ad02b7..dc571770 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -16,6 +16,8 @@ Reverse Chronological:
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu-3.0.19
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.0.19-1
 
+  * param, matching of date, years 1400 - 21\d\d
+
   * remote, image source url fix
 
 %% 2.9.7.orig.tar.gz (2011-06-26:25/7) [see 3.0.13]
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index c68a481a..9b960c46 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.19.orig.tar.xz
   sisu_3.0.19-1.dsc
   sisu_3.0.19-1.debian.tar.gz
 
+  * param, matching of date, years 1400 - 21\d\d
+
 %% 3.0.18.orig.tar.xz (2011-01-13:37/2)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu-3.0.18
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.0.18-1
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index 656490d9..60663830 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -120,9 +120,9 @@ module SiSU_Param
         def all
           s=nil
           if @author
-            s ||=((@date =~/([12][890]\d{2})/ ) \
-            ? ("Copyright (C) #{$1} #{@author}") \
-            : ('Copyright (C)' + @author))                     #matches years 1800 through 20\d\d 2004w19
+            s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \
+            ? ("Copyright (C) #{$1} #{@author}")
+            : ('Copyright (C)' + @author))                     #matches years 1400 through 21\d\d
           end
           s
         end
@@ -133,9 +133,9 @@ module SiSU_Param
           def all
             s=nil
             if @author
-              s ||=((@date =~/([12][890]\d{2})/ ) \
-              ? ("Copyright (C) #{$1} #{@author}") \
-              : ('Copyright (C)' + @author))                     #matches years 1800 through 20\d\d 2004w19
+              s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \
+              ? ("Copyright (C) #{$1} #{@author}")
+              : ('Copyright (C)' + @author))                     #matches years 1400 through 21\d\d
             end
             s
           end
diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index f9d7ecb0..3911f85e 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -131,9 +131,9 @@ module SiSU_Param
         def all
           s=nil
           if @author
-            s ||=((@date =~/([12][890]\d{2})/ ) \
+            s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \
             ? ("Copyright (C) #{$1} #{@author}")
-            : ('Copyright (C)' + @author))                     #matches years 1800 through 20\d\d 2004w19
+            : ('Copyright (C)' + @author))                     #matches years 1400 through 21\d\d
           end
           s
         end
@@ -144,9 +144,9 @@ module SiSU_Param
           def all
             s=nil
             if @author
-              s ||=((@date =~/([12][890]\d{2})/ ) \
+              s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \
               ? ("Copyright (C) #{$1} #{@author}")
-              : ('Copyright (C)' + @author))                     #matches years 1800 through 20\d\d 2004w19
+              : ('Copyright (C)' + @author))                     #matches years 1400 through 21\d\d
             end
             s
           end
-- 
cgit v1.2.3