satthi /
csv-combine-plugin-for-CakePHP
| @@ 67-71 (lines=5) @@ | ||
| 64 | } |
|
| 65 | $start_point = 0; |
|
| 66 | $column_list = $fixed_options; |
|
| 67 | if (array_key_exists($row + 1, $extra_fixed_options)) { |
|
| 68 | $column_list = $extra_fixed_options[$row + 1]; |
|
| 69 | } elseif (array_key_exists($row - $list_count + 1, $extra_fixed_options)) { |
|
| 70 | $column_list = $extra_fixed_options[$row - $list_count + 1]; |
|
| 71 | } |
|
| 72 | ||
| 73 | foreach ($column_list as $column_info) { |
|
| 74 | $return_info[$row][$column_info['name']] = rtrim(substr($text, $start_point, $column_info['length'])); |
|
| @@ 105-109 (lines=5) @@ | ||
| 102 | $return_text = ''; |
|
| 103 | foreach ($list as $row => $list_val) { |
|
| 104 | $column_options = $fixed_options; |
|
| 105 | if (array_key_exists($row + 1, $extra_fixed_options)) { |
|
| 106 | $column_options = $extra_fixed_options[$row + 1]; |
|
| 107 | } elseif (array_key_exists($row - $list_count, $extra_fixed_options)) { |
|
| 108 | $column_options = $extra_fixed_options[$row - $list_count]; |
|
| 109 | } |
|
| 110 | ||
| 111 | foreach ($column_options as $fixed_option_key => $fixed_info) { |
|
| 112 | if (!array_key_exists($fixed_option_key, $list_val)) { |
|
