migrate.rb in arxutils-0.1.36

- old
+ new

@@ -8,30 +8,29 @@
 
 module Arxutils
   class Migrate
     attr_accessor :dbinit , :dbconfig_dest_path , :dbconfig_dest_fname , :dbconfig_src_path , :dbconfig_src_fname
     
-    def Migrate.migrate( data_ary , relation_def_fpath , module_name, count_classname_downcase , count_field , dbconfig , forced )
+    def Migrate.migrate( data_ary , relation_def_fpath , module_name, count_classname_downcase , dbconfig , forced )
       src_config_dir = Arxutils.configdir
       mig = Migrate.new( Dbutil::MIGRATE_DIR , src_config_dir , dbconfig, Dbutil::DATABASELOG, forced )
       # dbconfigのテンプレートは内容が固定である。convertを呼び出し、Arxのインスタンスを作成するときに、適切なdata_aryの要素を与える必要がある（ただしテンプレートへの埋め込みには用いられない
       mig.make_dbconfig( dbconfig )
       
       data_ary.reduce(0) { |next_num , x| 
         mig.make( next_num , x )
       }
 
       content_array = data_ary.map { |x| 
-        mig.make_relation( x , "count", "end_count_id" )
+        mig.make_relation( x , "count" )
       }.select{ |x| x.size > 0 }
       need_count_class_plural = content_array.reduce([]){ |s,x|
         s << x[:need_count_class_plural] if x[:need_count_class_plural] != nil
         s
       }
       if content_array.size > 0
         data_count = {count_classname: "Count" ,
-                      count_field: count_field,
                       need_count_class_plural: need_count_class_plural,
                      }
         ary = content_array.collect{|x| x[:content] }.flatten
         count_content = mig.convert_count_class_relation( data_count , "relation_count.tmpl" )
         ary.unshift( count_content )
@@ -76,19 +75,18 @@
       File.open( @dbconfig_dest_path , 'w' , {:encoding => Encoding::UTF_8}){ |f|
         f.puts( content )
       }
     end
 
-    def make_relation( data , count_classname_downcase , count_field )
+    def make_relation( data , count_classname_downcase )
       if data[:classname_downcase] != count_classname_downcase
         data[:flist].reduce( { content: [], need_count_class: nil } ){ |s, x|
           case x
           when "base" , "noitem"
             name_base = "relation"
             data[:relation] = [] unless data[:relation]
           else
             data[:count_classname_downcase] = count_classname_downcase
-            data[:count_field] = count_field
             name_base = "relation_#{x}"
             s[:need_count_class_plural] ||= data[:plural]
           end
           content = convert( data , @src_path , "#{name_base}.tmpl" )
           s[:content] << content