From 013140d9ff53209013da5ed4d8a440abca333bfc Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 1 Jan 2009 10:19:10 -0500 Subject: year rollover --- lib/sisu/v0/harvest_topics.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sisu/v0/harvest_topics.rb') diff --git a/lib/sisu/v0/harvest_topics.rb b/lib/sisu/v0/harvest_topics.rb index 918c289f..7e11dbf2 100644 --- a/lib/sisu/v0/harvest_topics.rb +++ b/lib/sisu/v0/harvest_topics.rb @@ -10,7 +10,7 @@ * Author: Ralph Amissah * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 Ralph Amissah All Rights Reserved. + 2007, 2008, 2009 Ralph Amissah All Rights Reserved. * License: GPL 3 or later: -- cgit v1.2.3 From c0f250241b62175e242715ef5ea93b96935635b2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 1 Jan 2009 19:22:47 -0500 Subject: harvest, other language filenames --- lib/sisu/v0/harvest_topics.rb | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'lib/sisu/v0/harvest_topics.rb') diff --git a/lib/sisu/v0/harvest_topics.rb b/lib/sisu/v0/harvest_topics.rb index 7e11dbf2..11d7aa9c 100644 --- a/lib/sisu/v0/harvest_topics.rb +++ b/lib/sisu/v0/harvest_topics.rb @@ -132,16 +132,23 @@ module HARVEST_topics if @title and @author_format and @idx_list creator=FORMAT::Author.new(@author_format.strip).author_details @authors,@authorship=creator[:authors],creator[:authorship] - file=filename.sub(/\.ss[mt]$/,'') + file=if filename=~/~[a-z]{2,3}\.ss[mt]$/ + lang='.' + /~([a-z]{2,3})\.ss[mt]$/.match(filename)[1] + filename.sub(/~[a-z]{2,3}\.ss[mt]$/,'') + else + lang='' + filename.sub(/\.ss[mt]$/,'') + end + page="sisu_manifest#{lang}.html" idx_array <<=if @idx_list =~/;/ g=@idx_list.scan(/[^;]+/) idxl=[] g.each do |i| i.strip! - idxl << { :filename => filename, :file => file, :rough_idx => i, :title => @fulltitle, :author => creator } + idxl << { :filename => filename, :file => file, :rough_idx => i, :title => @fulltitle, :author => creator, :page => page} end idxl - else { :filename => filename, :file => file, :rough_idx => @idx_list, :title => @fulltitle, :author => creator } + else { :filename => filename, :file => file, :rough_idx => @idx_list, :title => @fulltitle, :author => creator, :page => page } end else p "missing author field: #@filename title: #@title; author: #@author_format; idx: #@idx_list" @@ -164,7 +171,7 @@ module HARVEST_topics s=n.sub(/(.+?)(?:,.+|$)/,'\1').gsub(/\s+/,'_') names += %{#{n}, } end - hash << { :filename => idx[:filename], :file => idx[:file], :author => names, :title => idx[:title] } + hash << { :filename => idx[:filename], :file => idx[:file], :author => names, :title => idx[:title], :page => idx[:page] } end def construct_book_topic_index idx_array=@idx_array @@ -250,7 +257,6 @@ module HARVEST_topics @opt,@the_idx=opt,the_idx @env=SiSU_Env::Info_env.new @rc=Get_init.instance.yamlrc - @page='sisu_manifest.html' @alph=%W[9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] @letter=@alph.shift @vz=SiSU_Env::Get_init.instance.skin @@ -382,12 +388,12 @@ WOK end end def do_hash_md(attrib,hash) - html=%{#{hash[:title]} - #{hash[:author]}} + html=%{#{hash[:title]} - #{hash[:author]}} do_string_default(attrib,html) end def do_hash_md_maintenance(attrib,hash) if @output[:html_mnt].class == File #should not be run for presentation output - html=%{[src]  #{hash[:title]} - #{hash[:author]}} + html=%{[src]  #{hash[:title]} - #{hash[:author]}} do_string_maintenance(attrib,html) end end @@ -397,7 +403,7 @@ WOK hash.each_key do |m| if m == :md do_case(lv,hash[m]) - elsif m != :title and m != :author and m != :filename and m != :file and m != :rough_idx + elsif m != :title and m != :author and m != :filename and m != :file and m != :rough_idx and m != :page key << m elsif m == :title do_hash_md('work',hash) @@ -460,7 +466,7 @@ WOK hash.each_key do |m| if m == :md do_case(lv,hash[m]) - elsif m != :title and m != :author and m != :filename and m != :file and m != :rough_idx + elsif m != :title and m != :author and m != :filename and m != :file and m != :rough_idx and m != :page key << m elsif m == :title do_hash_md(lv,hash) @@ -514,7 +520,7 @@ WOK if m == :md do_case(lv,hash[m]) else - if m != :title and m != :author and m != :filename and m != :file and m != :rough_idx + if m != :title and m != :author and m != :filename and m != :file and m != :rough_idx and m != :page do_string(lv,m) do_case(lv,hash[m]) elsif m == :title -- cgit v1.2.3 From a98914765ba6fa5f787dd5147576aa8ced0e2df4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 18 Jan 2009 12:46:52 -0500 Subject: copyright presentation changed, remains substantively the same; minor sisu version bump copyright file uses (debian) machine parsable format use: * Copyright: (C) 1997 - 2009 Ralph Amissah All Rights Reserved. to mean: * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Ralph Amissah All Rights Reserved. CHANGELOG updated and minor version bump 0.70.5 --- lib/sisu/v0/harvest_topics.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/sisu/v0/harvest_topics.rb') diff --git a/lib/sisu/v0/harvest_topics.rb b/lib/sisu/v0/harvest_topics.rb index 11d7aa9c..85067e55 100644 --- a/lib/sisu/v0/harvest_topics.rb +++ b/lib/sisu/v0/harvest_topics.rb @@ -9,8 +9,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009 Ralph Amissah All Rights Reserved. + * Copyright: (C) 1997 - 2009 Ralph Amissah All Rights Reserved. * License: GPL 3 or later: -- cgit v1.2.3