param, header reading more robust (re: commented out parts)

4 files changed, 41 insertions, 25 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 88d87f2a..3a546322 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,7 +12,15 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
-%% 2.6.1.orig.tar.gz (2010-07-08:27/4)
+%% 2.6.2.orig.tar.gz (2010-07-11:27/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
+  sisu_2.6.2.orig.tar.gz
+  sisu_2.6.2-1.dsc
+  sisu_2.6.2-1.diff.gz
+
+  * param, header reading more robust (re: commented out parts)
+
+%% 2.6.1.orig.tar.gz (2010-07-09:27/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
   95fe09b870e23f922bf7d02b8aa83827ef9592f06f844ba4df5c808e283c8590 2728806 sisu_2.6.1.orig.tar.gz
   bffd97dda3a8b4eb71201c47590ef363570f018a2517be359e28bcd9c82ff97c 1151 sisu_2.6.1-1.dsc
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 71e6f1e2..d2a9932e 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,7 +12,15 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
-%% 2.6.1.orig.tar.gz (2010-07-08:27/4)
+%% 2.6.2.orig.tar.gz (2010-07-11:27/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
+  sisu_2.6.2.orig.tar.gz
+  sisu_2.6.2-1.dsc
+  sisu_2.6.2-1.diff.gz
+
+  * param, header reading more robust (re: commented out parts)
+
+%% 2.6.1.orig.tar.gz (2010-07-09:27/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
   95fe09b870e23f922bf7d02b8aa83827ef9592f06f844ba4df5c808e283c8590 2728806 sisu_2.6.1.orig.tar.gz
   bffd97dda3a8b4eb71201c47590ef363570f018a2517be359e28bcd9c82ff97c 1151 sisu_2.6.1-1.dsc
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 6e8d23f7..3aec5fd4 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.6.1
-:date_stamp: 2010w27/5
-:date: "2010-07-09"
+:version: 2.6.2
+:date_stamp: 2010w27/6
+:date: "2010-07-10"
 :project: SiSU
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index 8b75edfc..a313fa1c 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -224,7 +224,7 @@ module SiSU_Param
         @h
       end
       def title
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         def main
           s=@h['main']
@@ -269,7 +269,7 @@ module SiSU_Param
         self
       end
       def creator #there are sub categories that need to be catered for and sometimes more than one author etc.; implement array.to_s.length validation test later, current test on string approximate as string is not used
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         def author
           @h['author']=(@h['author'] ? @h['author'] : @h['main'])
@@ -378,7 +378,7 @@ module SiSU_Param
         self
       end
       def rights
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         def copyright
           def text #you may wish to expand to take from all
@@ -468,7 +468,7 @@ module SiSU_Param
         self
       end
       def classify
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         def coverage
           s=@h['coverage']
@@ -528,14 +528,14 @@ module SiSU_Param
         self
       end
       def publisher
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         s=@h['main']
         l,n=Db[:col_name],'publisher'
         validate_length(s,l,n)
       end
       def date
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         def added_to_site
           s=@h['added_to_site']
@@ -575,7 +575,7 @@ module SiSU_Param
         self
       end
       def language                     # as things stand this should really be populated from title.language and original.language, resolve
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         def document
           s=@h['document']=(@h['document'] ? @h['document'] : @h['main'])
@@ -600,24 +600,24 @@ module SiSU_Param
         self
       end
       def make
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         def headings
           lv=[]
-          s=@s
-          s=((s =~/;/) ? (s.split(/;\s*/)) : [ s ])
-          lv[0]=s
-          lv1=s[0] ||='1~ '                                                                                     #some arbitrary changes made
+          x=@h['headings']
+          x=((x =~/;/) ? (x.split(/;\s*/)) : [ x ])
+          lv[0]=x
+          lv1=x[0] ||='1~ '                                                                                     #some arbitrary changes made
           lv[1]=/^#{lv1}/
-          lv2=s[1] ||='2~ '
+          lv2=x[1] ||='2~ '
           lv[2]=/^#{lv2}/
-          lv3=s[2] ||='3~ '
+          lv3=x[2] ||='3~ '
           lv[3]=/^#{lv3}/
-          lv4=s[3] ||='4~ '
+          lv4=x[3] ||='4~ '
           lv[4]=/^#{lv4}/
-          lv5=s[4] ||='5~ '
+          lv5=x[4] ||='5~ '
           lv[5]=/^#{lv5}/
-          lv6=s[5] ||='6~ '
+          lv6=x[5] ||='6~ '
           lv[6]=/^#{lv6}/
           lv
         end
@@ -720,7 +720,7 @@ module SiSU_Param
         @s
       end
       def original
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         def publisher
           s=@h['publisher']
@@ -755,11 +755,11 @@ module SiSU_Param
         self
       end
       def links
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         a
       end
       def notes
-        a=@s.split(/[ ]*\n[ ]*/m)
+        a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
         @h=build_hash(a)
         def abstract
           @h['abstract']