v5 v6: moved files: harvest* to html_harvest*
authorRalph Amissah <ralph@amissah.com>
Sun, 12 Oct 2014 14:29:43 +0000 (10:29 -0400)
committerRalph Amissah <ralph@amissah.com>
Sun, 12 Oct 2014 14:29:43 +0000 (10:29 -0400)
12 files changed:
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
lib/sisu/v5/html_harvest.rb [moved from lib/sisu/v5/harvest.rb with 95% similarity]
lib/sisu/v5/html_harvest_author_format.rb [moved from lib/sisu/v5/harvest_author_format.rb with 100% similarity]
lib/sisu/v5/html_harvest_authors.rb [moved from lib/sisu/v5/harvest_authors.rb with 99% similarity]
lib/sisu/v5/html_harvest_topics.rb [moved from lib/sisu/v5/harvest_topics.rb with 99% similarity]
lib/sisu/v5/hub_actions.rb
lib/sisu/v6/html_harvest.rb [moved from lib/sisu/v6/harvest.rb with 95% similarity]
lib/sisu/v6/html_harvest_author_format.rb [moved from lib/sisu/v6/harvest_author_format.rb with 100% similarity]
lib/sisu/v6/html_harvest_authors.rb [moved from lib/sisu/v6/harvest_authors.rb with 99% similarity]
lib/sisu/v6/html_harvest_topics.rb [moved from lib/sisu/v6/harvest_topics.rb with 99% similarity]
lib/sisu/v6/hub_actions.rb

index 133a621a8ef4f7f124e33d7b289ed5f4ff211e8a..0e15c942b5cc8a0cedf7a40197ec22c02e0aa76d 100644 (file)
@@ -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
index 4d2a70e0e83e078287c6f622bfefba09ef83ce0b..62abf4d93979965b4055c6a7e97396e7a3a10999 100644 (file)
@@ -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
similarity index 95%
rename from lib/sisu/v5/harvest.rb
rename to lib/sisu/v5/html_harvest.rb
index 87f81bc9664c372420021b74c5e98767939d7842..c3a4030bc62179c43d6acd4f3714ff2582f9b908 100644 (file)
@@ -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)
similarity index 99%
rename from lib/sisu/v5/harvest_authors.rb
rename to lib/sisu/v5/html_harvest_authors.rb
index 8db14eee954e8bf57c025fdfbf491e3d1e9a60a0..427ef4d3f2c178ac7ceef3da67106e3fd3988303 100644 (file)
@@ -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)
similarity index 99%
rename from lib/sisu/v5/harvest_topics.rb
rename to lib/sisu/v5/html_harvest_topics.rb
index b2e836833bb8c6ef958cfb806f14d75f3083b580..59812c68bf997d460ad3ea506a5ee0b5e44186de 100644 (file)
@@ -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={}
index 6c97aa4b97e2a8593572ff485c70805277f9e2f9..7781ef6310738f6bf841d9ad125959618c2f3b3e 100644 (file)
@@ -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'
similarity index 95%
rename from lib/sisu/v6/harvest.rb
rename to lib/sisu/v6/html_harvest.rb
index 09c1b8833319459c08a68320fcebe57ab011cc46..b1bd7ca53019003da0ac2db3e6a1ce82bfd68ee8 100644 (file)
@@ -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)
similarity index 99%
rename from lib/sisu/v6/harvest_authors.rb
rename to lib/sisu/v6/html_harvest_authors.rb
index e48c4f78e9c4c6d0882d47c708dc0537e3709430..f748f400ca708520e6bb551fd9c24ccd6f4ceb7a 100644 (file)
@@ -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)
similarity index 99%
rename from lib/sisu/v6/harvest_topics.rb
rename to lib/sisu/v6/html_harvest_topics.rb
index 2b80565ecabf6c7a69f5a94bbf040a5346520271..87ed931ac5883f7c109b2d515ea2bebd89b40c8c 100644 (file)
@@ -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={}
index e7e42bd2b96e1510107261d7c0042977a8f17a40..076461dbba127e21e72342f04f9aa2fc78654fa5 100644 (file)
@@ -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'