Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / script / ls_helper.rb

diff --git a/script/ls_helper.rb b/script/ls_helper.rb
index b181fc4..bd44f97 100644 (file)
--- a/script/ls_helper.rb
+++ b/script/ls_helper.rb
@@ -20,11 +20,10 @@ lg.each do |k, g|
   puts k\r
   g['licenses_attributes'].each do |lk, l|\r
     puts lk\r
-    puts 'follow license_group_classname' + g['classname']\r
-    l['license_group_classname'] = g['classname']\r
+    puts 'follow license_group_module_name' + g['module_name']\r
+    l['license_group_module_name'] = g['module_name']\r
     if l['license_group_settings']\r
       puts 'license_group_settings to json'\r
-      l['license_group_settings'] = l['license_group_settings'].to_json.to_s\r
     end\r
     if l['system_picture_file']\r
       fn = File.expand_path(wd + '/' + l['system_picture_file'])\r
@@ -34,16 +33,16 @@ lg.each do |k, g|
       l['system_picture_id'] = {"text" => b}\r
       l.delete 'system_picture_file'\r
     end\r
-    if l['credit_pictures']\r
-      credit_pictures = {}\r
-      l['credit_pictures'].each do |n, v|\r
+    if l['credit_picture_settings']\r
+      credit_picture_settings = {}\r
+      l['credit_picture_settings'].each do |n, v|\r
         fn = File.expand_path(wd + '/' + v)\r
         puts 'open system picture file ' + fn\r
         d = File.open(fn, 'rb').read\r
         b = Base64.encode64(d).gsub(/\r/, '').gsub(/\n/, '')\r
-        credit_pictures[n] = {"text" => b}\r
+        credit_picture_settings[n] = {"text" => b}\r
       end\r
-      l['credit_pictures'] = credit_pictures\r
+      l['credit_picture_settings'] = credit_picture_settings\r
     end\r
   end\r
 end\r