v5 v6: moved files: harvest* to html_harvest*

12 files changed, 14 insertions, 10 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 133a621a..0e15c942 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.0.orig.tar.xz
   sisu_5.7.0.orig.tar.xz
   sisu_5.7.0-1.dsc
 
+* moved files: harvest* to html_harvest*
+
 * --maintenance revisited, bin/sisu, hub, urls --maintenance, fix required
 
 * db, --maintenance sql, separated out postgresql & sqlite
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 4d2a70e0..62abf4d9 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.3.0.orig.tar.xz
   sisu_6.3.0.orig.tar.xz
   sisu_6.3.0-1.dsc
 
+* moved files: harvest* to html_harvest*
+
 * --maintenance revisited, bin/sisu, hub, urls --maintenance, fix required
 
 * db, --maintenance sql, separated out postgresql & sqlite
diff --git a/lib/sisu/v5/harvest.rb b/lib/sisu/v5/html_harvest.rb
index 87f81bc9..c3a4030b 100644
--- a/lib/sisu/v5/harvest.rb
+++ b/lib/sisu/v5/html_harvest.rb
@@ -63,8 +63,8 @@ module SiSU_Harvest
   @@the_idx_topics,@@the_idx_authors={},{}
   class Source
     require_relative 'hub_options'                          # hub_options.rb
-    require_relative 'harvest_topics'                       # harvest_topics.rb
-    require_relative 'harvest_authors'                      # harvest_authors.rb
+    require_relative 'html_harvest_topics'                  # html_harvest_topics.rb
+    require_relative 'html_harvest_authors'                 # html_harvest_authors.rb
     require_relative 'se'                                   # se.rb
       include SiSU_Env
     def initialize(opt)
diff --git a/lib/sisu/v5/harvest_author_format.rb b/lib/sisu/v5/html_harvest_author_format.rb
index 92709673..92709673 100644
--- a/lib/sisu/v5/harvest_author_format.rb
+++ b/lib/sisu/v5/html_harvest_author_format.rb
diff --git a/lib/sisu/v5/harvest_authors.rb b/lib/sisu/v5/html_harvest_authors.rb
index 8db14eee..427ef4d3 100644
--- a/lib/sisu/v5/harvest_authors.rb
+++ b/lib/sisu/v5/html_harvest_authors.rb
@@ -59,7 +59,7 @@
 
 =end
 module SiSU_HarvestAuthors
-  require_relative 'harvest_author_format'              # harvest_author_format.rb
+  require_relative 'html_harvest_author_format'          # html_harvest_author_format.rb
   class Songsheet
     @@the_idx_authors={}
     def initialize(opt,env)
diff --git a/lib/sisu/v5/harvest_topics.rb b/lib/sisu/v5/html_harvest_topics.rb
index b2e83683..59812c68 100644
--- a/lib/sisu/v5/harvest_topics.rb
+++ b/lib/sisu/v5/html_harvest_topics.rb
@@ -60,7 +60,7 @@
 
 =end
 module SiSU_HarvestTopics
-  require_relative 'harvest_author_format'              # harvest_author_format.rb
+  require_relative 'html_harvest_author_format'         # html_harvest_author_format.rb
   include SiSU_Viz
   class Songsheet
     @@the_idx_topics={}
diff --git a/lib/sisu/v5/hub_actions.rb b/lib/sisu/v5/hub_actions.rb
index 6c97aa4b..7781ef63 100644
--- a/lib/sisu/v5/hub_actions.rb
+++ b/lib/sisu/v5/hub_actions.rb
@@ -559,7 +559,7 @@ module SiSU_Hub_Actions
         def harvest?
           if @opt.act[:harvest][:set]==:on               #% --harvest
             if @opt.f_pths.length > 0
-              require_relative 'harvest'                 # harvest.rb
+              require_relative 'html_harvest'            # html_harvest.rb
               SiSU_Harvest::Source.new(@opt).read
             else
               msg='harvest request requires sisu markup files'
diff --git a/lib/sisu/v6/harvest.rb b/lib/sisu/v6/html_harvest.rb
index 09c1b883..b1bd7ca5 100644
--- a/lib/sisu/v6/harvest.rb
+++ b/lib/sisu/v6/html_harvest.rb
@@ -63,8 +63,8 @@ module SiSU_Harvest
   @@the_idx_topics,@@the_idx_authors={},{}
   class Source
     require_relative 'hub_options'                          # hub_options.rb
-    require_relative 'harvest_topics'                       # harvest_topics.rb
-    require_relative 'harvest_authors'                      # harvest_authors.rb
+    require_relative 'html_harvest_topics'                  # html_harvest_topics.rb
+    require_relative 'html_harvest_authors'                 # html_harvest_authors.rb
     require_relative 'se'                                   # se.rb
       include SiSU_Env
     def initialize(opt)
diff --git a/lib/sisu/v6/harvest_author_format.rb b/lib/sisu/v6/html_harvest_author_format.rb
index c5081193..c5081193 100644
--- a/lib/sisu/v6/harvest_author_format.rb
+++ b/lib/sisu/v6/html_harvest_author_format.rb
diff --git a/lib/sisu/v6/harvest_authors.rb b/lib/sisu/v6/html_harvest_authors.rb
index e48c4f78..f748f400 100644
--- a/lib/sisu/v6/harvest_authors.rb
+++ b/lib/sisu/v6/html_harvest_authors.rb
@@ -59,7 +59,7 @@
 
 =end
 module SiSU_HarvestAuthors
-  require_relative 'harvest_author_format'              # harvest_author_format.rb
+  require_relative 'html_harvest_author_format'          # html_harvest_author_format.rb
   class Songsheet
     @@the_idx_authors={}
     def initialize(opt,env)
diff --git a/lib/sisu/v6/harvest_topics.rb b/lib/sisu/v6/html_harvest_topics.rb
index 2b80565e..87ed931a 100644
--- a/lib/sisu/v6/harvest_topics.rb
+++ b/lib/sisu/v6/html_harvest_topics.rb
@@ -60,7 +60,7 @@
 
 =end
 module SiSU_HarvestTopics
-  require_relative 'harvest_author_format'              # harvest_author_format.rb
+  require_relative 'html_harvest_author_format'         # html_harvest_author_format.rb
   include SiSU_Viz
   class Songsheet
     @@the_idx_topics={}
diff --git a/lib/sisu/v6/hub_actions.rb b/lib/sisu/v6/hub_actions.rb
index e7e42bd2..076461db 100644
--- a/lib/sisu/v6/hub_actions.rb
+++ b/lib/sisu/v6/hub_actions.rb
@@ -559,7 +559,7 @@ module SiSU_Hub_Actions
         def harvest?
           if @opt.act[:harvest][:set]==:on               #% --harvest
             if @opt.f_pths.length > 0
-              require_relative 'harvest'                 # harvest.rb
+              require_relative 'html_harvest'            # html_harvest.rb
               SiSU_Harvest::Source.new(@opt).read
             else
               msg='harvest request requires sisu markup files'