enju_leaf 1.1.0.rc14 → 1.1.0.rc15

Sign up to get free protection for your applications and to get access to all the features.
Files changed (162) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/enju_leaf.js +0 -1
  3. data/app/assets/stylesheets/enju.css +5 -2
  4. data/app/assets/stylesheets/images/ajax-loader.gif +0 -0
  5. data/app/assets/stylesheets/images/border.png +0 -0
  6. data/app/assets/stylesheets/images/controls.png +0 -0
  7. data/app/assets/stylesheets/images/icons-18-black.png +0 -0
  8. data/app/assets/stylesheets/images/icons-18-white.png +0 -0
  9. data/app/assets/stylesheets/images/icons-36-black.png +0 -0
  10. data/app/assets/stylesheets/images/icons-36-white.png +0 -0
  11. data/app/assets/stylesheets/images/loading.gif +0 -0
  12. data/app/assets/stylesheets/images/loading_background.png +0 -0
  13. data/app/assets/stylesheets/images/overlay.png +0 -0
  14. data/app/assets/stylesheets/images/spinner_bar.gif +0 -0
  15. data/app/assets/stylesheets/pagination.css +2 -2
  16. data/app/controllers/page_controller.rb +6 -2
  17. data/app/controllers/user_import_results_controller.rb +1 -0
  18. data/app/mailers/notifier.rb +3 -3
  19. data/app/models/enju_leaf/ability.rb +3 -3
  20. data/app/models/profile.rb +3 -1
  21. data/app/models/role.rb +9 -3
  22. data/app/models/user_export_file.rb +2 -1
  23. data/app/models/user_group.rb +2 -2
  24. data/app/models/user_has_role.rb +2 -2
  25. data/app/models/user_import_file.rb +19 -17
  26. data/app/models/user_import_result.rb +3 -3
  27. data/app/views/page/_include.html.erb +40 -0
  28. data/app/views/page/_menu.html.erb +6 -3
  29. data/app/views/page/configuration.html.erb +1 -1
  30. data/app/views/page/{opensearch.builder → opensearch.xml.builder} +4 -4
  31. data/app/views/page/statistics.html.erb +2 -2
  32. data/app/views/user_import_results/show.html.erb +1 -1
  33. data/config/locales/translation_en.yml +2 -1
  34. data/config/locales/translation_ja.yml +3 -1
  35. data/lib/enju_leaf/master_model.rb +3 -3
  36. data/lib/enju_leaf/user.rb +6 -5
  37. data/lib/enju_leaf/version.rb +1 -1
  38. data/lib/enju_leaf.rb +11 -7
  39. data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb +11 -11
  40. data/lib/generators/enju_leaf/setup/setup_generator.rb +21 -14
  41. data/lib/generators/enju_leaf/setup/templates/db/seeds.rb +5 -1
  42. data/lib/tasks/enju_leaf_tasks.rake +7 -11
  43. data/spec/controllers/my_accounts_controller_spec.rb +2 -2
  44. data/spec/controllers/page_controller_spec.rb +2 -2
  45. data/spec/dummy/config/application.rb +1 -1
  46. data/spec/dummy/config/boot.rb +2 -2
  47. data/spec/dummy/config/initializers/friendly_id.rb +90 -0
  48. data/spec/dummy/db/development.sqlite3 +0 -0
  49. data/spec/dummy/db/migrate/090_create_search_histories.rb +31 -0
  50. data/spec/dummy/db/migrate/20100623173800_rename_search_history_version_to_sru_version.rb +9 -0
  51. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +1 -1
  52. data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +5 -0
  53. data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +9 -0
  54. data/spec/dummy/db/schema.rb +29 -2
  55. data/spec/dummy/db/test.sqlite3 +0 -0
  56. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140820-9103-mfcugd.txt +8 -0
  57. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140822-13160-wz7o56.txt +8 -0
  58. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140824-39018-fw3fdj.txt +8 -0
  59. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140828-69043-tbwoqv.txt +8 -0
  60. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140915-22971-1jmyywh.txt +8 -0
  61. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140915-23153-j4x3ru.txt +8 -0
  62. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140915-67244-1uo8pkb.txt +8 -0
  63. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-80298-14af9pc.txt +8 -0
  64. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-80450-1qhv5cf.txt +8 -0
  65. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-80529-1hahtrn.txt +8 -0
  66. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-80725-tqmhnv.txt +8 -0
  67. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-81018-wl1hgj.txt +8 -0
  68. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-81246-wll5s.txt +8 -0
  69. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-81371-8uz50r.txt +8 -0
  70. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-84122-1u96hw6.txt +8 -0
  71. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140926-7716-bbs13d.txt +8 -0
  72. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141002-57000-yu6qop.txt +8 -0
  73. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141002-57206-2j8sg2.txt +8 -0
  74. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141002-57328-p8lryh.txt +8 -0
  75. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141002-57609-1j3dd67.txt +8 -0
  76. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141003-78097-dw5i2k.txt +8 -0
  77. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140820-9103-tuuox.txt +8 -0
  78. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140822-13160-17b5dbh.txt +8 -0
  79. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140824-39018-o12xa4.txt +8 -0
  80. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140915-22971-d4ul8o.txt +8 -0
  81. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140915-23153-1qmzqi6.txt +8 -0
  82. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140915-67244-1ps1qsi.txt +8 -0
  83. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-80298-121rh7h.txt +8 -0
  84. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-80450-wdetsg.txt +8 -0
  85. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-80529-lmet02.txt +8 -0
  86. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-80725-1l6tliy.txt +8 -0
  87. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-81018-azm74f.txt +8 -0
  88. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-81246-1rjpksn.txt +8 -0
  89. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-81371-aroaof.txt +8 -0
  90. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-84122-7d6kls.txt +8 -0
  91. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140926-7716-1nap0l.txt +8 -0
  92. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141002-57000-3nb1bj.txt +8 -0
  93. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141002-57206-197ca0p.txt +8 -0
  94. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141002-57328-1kra77f.txt +8 -0
  95. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141002-57609-iymry0.txt +8 -0
  96. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141003-78097-1ocngi2.txt +8 -0
  97. data/spec/dummy/solr/default/data/index/_7b.fdt +0 -0
  98. data/spec/dummy/solr/default/data/index/{_5b.fdx → _7b.fdx} +0 -0
  99. data/spec/dummy/solr/default/data/index/{_5b.fnm → _7b.fnm} +0 -0
  100. data/spec/dummy/solr/default/data/index/{_5b.nvd → _7b.nvd} +0 -0
  101. data/spec/dummy/solr/default/data/index/{_5b.nvm → _7b.nvm} +0 -0
  102. data/spec/dummy/solr/default/data/index/{_5b.si → _7b.si} +0 -0
  103. data/spec/dummy/solr/default/data/index/{_5b_Lucene41_0.doc → _7b_Lucene41_0.doc} +0 -0
  104. data/spec/dummy/solr/default/data/index/{_5b_Lucene41_0.pos → _7b_Lucene41_0.pos} +0 -0
  105. data/spec/dummy/solr/default/data/index/{_5b_Lucene41_0.tim → _7b_Lucene41_0.tim} +0 -0
  106. data/spec/dummy/solr/default/data/index/{_5b_Lucene41_0.tip → _7b_Lucene41_0.tip} +0 -0
  107. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  108. data/spec/dummy/solr/default/data/index/segments_ev +0 -0
  109. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000524 +0 -0
  110. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000525 +0 -0
  111. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000526 +0 -0
  112. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000527 +0 -0
  113. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000528 +0 -0
  114. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000529 +0 -0
  115. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000530 +0 -0
  116. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000531 +0 -0
  117. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000532 +0 -0
  118. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000533 +0 -0
  119. data/spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d +0 -0
  120. data/spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9 +0 -0
  121. data/spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2 +0 -0
  122. data/spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7 +0 -0
  123. data/spec/dummy/tmp/cache/stdout +898 -0
  124. data/spec/dummy/tmp/pids/redis-test.pid +1 -1
  125. data/spec/fixtures/library_groups.yml +3 -3
  126. data/spec/fixtures/manifestations.yml +5 -6
  127. data/spec/fixtures/roles.yml +4 -0
  128. data/spec/fixtures/users.yml +1 -1
  129. data/spec/views/page/about.html.erb_spec.rb +19 -0
  130. data/spec/views/page/advanced_search.html.erb_spec.rb +20 -0
  131. data/spec/views/page/configuration.html.erb_spec.rb +19 -0
  132. data/spec/views/page/export.html.erb_spec.rb +19 -0
  133. data/spec/views/page/import.html.erb_spec.rb +19 -0
  134. data/spec/views/page/index.html.erb_spec.rb +20 -0
  135. data/spec/views/page/opensearch.xml.builder_spec.rb +20 -0
  136. data/spec/views/page/statistics.html.erb_spec.rb +20 -0
  137. data/spec/views/profiles/edit.html.erb_spec.rb +1 -1
  138. data/spec/views/profiles/index.html.erb_spec.rb +2 -2
  139. data/spec/views/profiles/new.html.erb_spec.rb +1 -1
  140. data/spec/views/profiles/show.html.erb_spec.rb +1 -1
  141. metadata +185 -76
  142. data/app/assets/images/ie6/borderBottomCenter.png +0 -0
  143. data/app/assets/images/ie6/borderBottomLeft.png +0 -0
  144. data/app/assets/images/ie6/borderBottomRight.png +0 -0
  145. data/app/assets/images/ie6/borderMiddleLeft.png +0 -0
  146. data/app/assets/images/ie6/borderMiddleRight.png +0 -0
  147. data/app/assets/images/ie6/borderTopCenter.png +0 -0
  148. data/app/assets/images/ie6/borderTopLeft.png +0 -0
  149. data/app/assets/images/ie6/borderTopRight.png +0 -0
  150. data/spec/dummy/solr/default/data/index/_5b.fdt +0 -0
  151. data/spec/dummy/solr/default/data/index/segments_av +0 -0
  152. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000380 +0 -0
  153. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000381 +0 -0
  154. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000382 +0 -0
  155. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000383 +0 -0
  156. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000384 +0 -0
  157. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000385 +0 -0
  158. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000386 +0 -0
  159. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000387 +0 -0
  160. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000388 +0 -0
  161. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000389 +0 -0
  162. data/spec/fixtures/extents.yml +0 -29
data/lib/enju_leaf.rb CHANGED
@@ -39,13 +39,15 @@ module EnjuLeaf
39
39
  format.mobile {render template: 'page/403', status: 403}
40
40
  format.xml {render template: 'page/403', status: 403}
41
41
  format.json { render text: '{"error": "forbidden"}' }
42
+ format.rss {render template: 'page/403.xml', status: 403}
42
43
  end
43
44
  else
44
45
  respond_to do |format|
45
- format.html {redirect_to new_user_session_url}
46
- format.mobile {redirect_to new_user_session_url}
47
- format.xml {render template: 'page/403', status: 403}
46
+ format.html { redirect_to new_user_session_url }
47
+ format.mobile { redirect_to new_user_session_url }
48
+ format.xml { render template: 'page/403', status: 403 }
48
49
  format.json { render text: '{"error": "forbidden"}' }
50
+ format.rss { render template: 'page/403.xml', status: 403 }
49
51
  end
50
52
  end
51
53
  end
@@ -53,10 +55,11 @@ module EnjuLeaf
53
55
  def render_404
54
56
  return if performed?
55
57
  respond_to do |format|
56
- format.html {render template: 'page/404', status: 404}
57
- format.mobile {render template: 'page/404', status: 404}
58
- format.xml {render template: 'page/404', status: 404}
58
+ format.html { render template: 'page/404', status: 404 }
59
+ format.mobile { render template: 'page/404', status: 404 }
60
+ format.xml { render template: 'page/404', status: 404 }
59
61
  format.json { render text: '{"error": "not_found"}' }
62
+ format.xml { render template: 'page/404.xml', status: 404 }
60
63
  end
61
64
  end
62
65
 
@@ -74,6 +77,7 @@ module EnjuLeaf
74
77
  format.mobile {render file: "#{Rails.root.to_s}/public/500", layout: false, status: 500}
75
78
  format.xml {render template: 'page/500', status: 500}
76
79
  format.json { render text: '{"error": "server_error"}' }
80
+ format.xml {render template: 'page/500.xml', status: 500}
77
81
  end
78
82
  end
79
83
 
@@ -252,7 +256,7 @@ module EnjuLeaf
252
256
  @current_ability.merge(EnjuEvent::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuEvent)
253
257
  @current_ability.merge(EnjuNews::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuNews)
254
258
  @current_ability.merge(EnjuSearchLog::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuSearchLog)
255
- @current_ability.merge(EnjuExport::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuExport)
259
+ @current_ability.merge(EnjuIr::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuIr)
256
260
  @current_ability
257
261
  end
258
262
 
@@ -4,7 +4,7 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
4
4
  def quick_install
5
5
  environment = ENV['ENJU_ENV'] || 'development'
6
6
  if !ENV['SKIP_CONFIG']
7
- rake("db:migrate", :env => environment)
7
+ rake("db:migrate", env: environment)
8
8
  generate("enju_circulation:setup")
9
9
  generate("enju_subject:setup")
10
10
  gsub_file 'config/schedule.rb', /^set :environment, :development$/,
@@ -19,19 +19,19 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
19
19
  /# config.assets.precompile \+= %w\( search.js \)$/,
20
20
  "config.assets.precompile += %w( mobile.js mobile.css print.css )"
21
21
  end
22
- rake("db:migrate", :env => environment)
23
- rake("enju_leaf:setup", :env => environment)
24
- rake("enju_circulation:setup", :env => environment)
25
- rake("enju_subject:setup", :env => environment)
26
- rake("assets:precompile") if environment == 'production'
27
- rake("db:seed", :env => environment)
22
+ rake("db:migrate", env: environment)
23
+ rake("enju_leaf:setup", env: environment)
24
+ rake("enju_circulation:setup", env: environment)
25
+ rake("enju_subject:setup", env: environment)
26
+ rake("assets:precompile", env: environment) if environment == 'production'
27
+ rake("db:seed", env: environment)
28
28
  if ENV['OS'] == 'Windows_NT'
29
- rake("sunspot:solr:run", :env => environment)
29
+ rake("sunspot:solr:run", env: environment)
30
30
  else
31
- rake("sunspot:solr:start", :env => environment)
31
+ rake("sunspot:solr:start", env: environment)
32
32
  sleep 5
33
- rake("environment sunspot:reindex", :env => environment)
34
- rake("sunspot:solr:stop", :env => environment)
33
+ rake("environment sunspot:reindex", env: environment)
34
+ rake("sunspot:solr:stop", env: environment)
35
35
  end
36
36
  end
37
37
  end
@@ -8,7 +8,7 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
8
8
  copy_file("config/application.yml", "config/application.yml")
9
9
  copy_file("config/resque.yml", "config/resque.yml")
10
10
  copy_file("config/schedule.rb", "config/schedule.rb")
11
- inject_into_file 'config/application.rb', :after => /# config.i18n.default_locale = :de$\n/ do
11
+ inject_into_file 'config/application.rb', after: /# config.i18n.default_locale = :de$\n/ do
12
12
  <<"EOS"
13
13
  config.i18n.available_locales = [:en, :ja]
14
14
  config.i18n.enforce_available_locales = true
@@ -23,22 +23,29 @@ EOS
23
23
  append_to_file("Rakefile", "require 'resque/scheduler/tasks'")
24
24
  append_to_file("db/seeds.rb", File.open(File.expand_path('../templates', __FILE__) + '/db/seeds.rb').read)
25
25
  inject_into_file 'config/environments/development.rb',
26
- " config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
27
- :after => "::Application.configure do\n"
26
+ " config.action_mailer.default_url_options = {host: 'localhost:3000'}\n",
27
+ after: "::Application.configure do\n"
28
28
  inject_into_file 'config/environments/test.rb',
29
- " config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
30
- :after => "::Application.configure do\n"
29
+ " config.action_mailer.default_url_options = {host: 'localhost:3000'}\n",
30
+ after: "::Application.configure do\n"
31
31
  inject_into_file 'config/environments/production.rb',
32
- " config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
33
- :after => "::Application.configure do\n"
32
+ " config.action_mailer.default_url_options = {host: 'localhost:3000'}\n",
33
+ after: "::Application.configure do\n"
34
34
  generate("devise:install")
35
35
  generate("devise", "User")
36
+ if Rails::VERSION::MAJOR >= 4
37
+ generate("friendly_id")
38
+ gsub_file 'config/initializers/friendly_id.rb', /# config.use :finders$/, "config.use :finders"
39
+ gsub_file "app/assets/javascripts/application.js",
40
+ /\/\/= require turbolinks$/,
41
+ ""
42
+ end
36
43
  generate("enju_biblio:setup")
37
44
  generate("enju_library:setup")
38
45
  rake("enju_leaf_engine:install:migrations")
39
46
  rake("enju_biblio_engine:install:migrations")
40
47
  rake("enju_library_engine:install:migrations")
41
- gsub_file 'config/routes.rb', /devise_for :users$/, "devise_for :users, :path => 'accounts'"
48
+ gsub_file 'config/routes.rb', /devise_for :users$/, "devise_for :users, path: 'accounts'"
42
49
  gsub_file 'config/initializers/devise.rb', '# config.email_regexp = /\A[^@]+@[^@]+\z/', 'config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\Z/i'
43
50
  gsub_file 'config/initializers/devise.rb', '# config.authentication_keys = [ :email ]', 'config.authentication_keys = [ :username ]'
44
51
  gsub_file 'config/initializers/devise.rb', '# config.secret_key', 'config.secret_key'
@@ -47,7 +54,7 @@ EOS
47
54
  , :trackable, #:validatable,
48
55
  :lockable, :lock_strategy => :none, :unlock_strategy => :none
49
56
  enju_leaf_user_model
50
- attr_accessible :username, :user_group_id, :user_number, :note
57
+ attr_accessible :username
51
58
  EOS
52
59
  inject_into_class "app/controllers/application_controller.rb", ApplicationController do
53
60
  <<"EOS"
@@ -63,7 +70,7 @@ EOS
63
70
  EOS
64
71
  end
65
72
  #inject_into_class "app/models/user.rb", User, " enju_user_model\n"
66
- inject_into_file "app/helpers/application_helper.rb", :after => /module ApplicationHelper$\n/ do
73
+ inject_into_file "app/helpers/application_helper.rb", after: /module ApplicationHelper$\n/ do
67
74
  <<"EOS"
68
75
  include EnjuLeaf::EnjuLeafHelper
69
76
  include EnjuBiblio::BiblioHelper if defined?(EnjuBiblio)
@@ -73,16 +80,16 @@ EOS
73
80
  end
74
81
  EOS
75
82
  end
76
- inject_into_file "app/assets/javascripts/application.js", :after => /\/\/= require jquery_ujs$\n/ do
83
+ inject_into_file "app/assets/javascripts/application.js", after: /\/\/= require jquery_ujs$\n/ do
77
84
  "//= require enju_leaf\n"
78
85
  end
79
- inject_into_file "app/assets/stylesheets/application.css", :after => / *= require_self$\n/ do
86
+ inject_into_file "app/assets/stylesheets/application.css", after: / *= require_self$\n/ do
80
87
  " *= require enju_leaf\n"
81
88
  end
82
- inject_into_file "config.ru", :after => /require ::File.expand_path\(\'..\/config\/environment\', __FILE__\)$\n/ do
89
+ inject_into_file "config.ru", after: /require ::File.expand_path\(\'..\/config\/environment\', __FILE__\)$\n/ do
83
90
  <<"EOS"
84
91
  require 'rack/protection'
85
- use Rack::Protection, :except => [:escaped_params, :json_csrf, :http_origin, :session_hijacking, :remote_token]
92
+ use Rack::Protection, except: [:escaped_params, :json_csrf, :http_origin, :session_hijacking, :remote_token]
86
93
  EOS
87
94
  end
88
95
  generate("sunspot_rails:install")
@@ -1,4 +1,8 @@
1
- username = 'admin'
1
+ if Rails::VERSION::MAJOR >= 4
2
+ username = 'enjuadmin'
3
+ else
4
+ username = 'admin'
5
+ end
2
6
  email = 'admin@example.jp'
3
7
  password = 'adminpassword'
4
8
 
@@ -21,17 +21,13 @@ namespace :enju_leaf do
21
21
 
22
22
  desc "upgrade enju_leaf"
23
23
  task :upgrade => :environment do
24
- version = EnjuLeaf::VERSION.split('.')
25
- if version[0..2] == ["1", "1" ,"0"]
26
- if version[3] == 'rc14'
27
- Rake::Task['enju_biblio:upgrade'].invoke
28
- Rake::Task['enju_circulation:upgrade'].invoke
29
- Rake::Task['enju_message:upgrade'].invoke
30
- Rake::Task['enju_subject:upgrade'].invoke
31
- Profile.transaction do
32
- update_profile
33
- end
34
- end
24
+ Rake::Task['enju_biblio:upgrade'].invoke
25
+ Rake::Task['enju_circulation:upgrade'].invoke
26
+ Rake::Task['enju_library:upgrade'].invoke
27
+ Rake::Task['enju_message:upgrade'].invoke
28
+ Rake::Task['enju_subject:upgrade'].invoke
29
+ Profile.transaction do
30
+ update_profile
35
31
  end
36
32
  puts 'enju_leaf: The upgrade completed successfully.'
37
33
  end
@@ -7,7 +7,7 @@ describe MyAccountsController do
7
7
  describe "GET show" do
8
8
  describe "When logged in as Administrator" do
9
9
  before(:each) do
10
- sign_in User.find('admin')
10
+ sign_in User.find('enjuadmin')
11
11
  end
12
12
 
13
13
  it "assigns the requested user as @user" do
@@ -29,7 +29,7 @@ describe MyAccountsController do
29
29
  describe "When logged in as Administrator" do
30
30
  before(:each) do
31
31
  profile = FactoryGirl.create(:profile)
32
- @user = User.find('admin')
32
+ @user = User.find('enjuadmin')
33
33
  @user.profile = profile
34
34
  sign_in @user
35
35
  end
@@ -44,12 +44,12 @@ describe PageController do
44
44
  end
45
45
 
46
46
  it "should get opensearch" do
47
- get :opensearch
47
+ get :opensearch, format: :xml
48
48
  expect(response).to be_success
49
49
  end
50
50
 
51
51
  it "should get msie_acceralator" do
52
- get :msie_acceralator
52
+ get :msie_acceralator, format: :xml
53
53
  expect(response).to be_success
54
54
  end
55
55
 
@@ -47,7 +47,7 @@ module Dummy
47
47
  # This will create an empty whitelist of attributes available for mass-assignment for all models
48
48
  # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
49
49
  # parameters by using an attr_accessible or attr_protected declaration.
50
- config.active_record.whitelist_attributes = true
50
+ #config.active_record.whitelist_attributes = true
51
51
 
52
52
  # Enable the asset pipeline
53
53
  config.assets.enabled = true
@@ -1,5 +1,5 @@
1
1
  require 'rubygems'
2
- gemfile = File.expand_path('../../../../Gemfile', __FILE__)
2
+ gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
3
3
 
4
4
  if File.exist?(gemfile)
5
5
  ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +7,4 @@ if File.exist?(gemfile)
7
7
  Bundler.setup
8
8
  end
9
9
 
10
- $:.unshift File.expand_path('../../../../lib', __FILE__)
10
+ $:.unshift File.expand_path('../../../../lib', __FILE__)
@@ -0,0 +1,90 @@
1
+ # FriendlyId Global Configuration
2
+ #
3
+ # Use this to set up shared configuration options for your entire application.
4
+ # Any of the configuration options shown here can also be applied to single
5
+ # models by passing arguments to the `friendly_id` class method or defining
6
+ # methods in your model.
7
+ #
8
+ # To learn more, check out the guide:
9
+ #
10
+ # http://norman.github.io/friendly_id/file.Guide.html
11
+
12
+ if Rails::VERSION::MAJOR == 4
13
+ FriendlyId.defaults do |config|
14
+ # ## Reserved Words
15
+ #
16
+ # Some words could conflict with Rails's routes when used as slugs, or are
17
+ # undesirable to allow as slugs. Edit this list as needed for your app.
18
+ config.use :reserved
19
+
20
+ config.reserved_words = %w(new edit index session login logout users admin
21
+ stylesheets assets javascripts images)
22
+
23
+ # ## Friendly Finders
24
+ #
25
+ # Uncomment this to use friendly finders in all models. By default, if
26
+ # you wish to find a record by its friendly id, you must do:
27
+ #
28
+ # MyModel.friendly.find('foo')
29
+ #
30
+ # If you uncomment this, you can do:
31
+ #
32
+ # MyModel.find('foo')
33
+ #
34
+ # This is significantly more convenient but may not be appropriate for
35
+ # all applications, so you must explicity opt-in to this behavior. You can
36
+ # always also configure it on a per-model basis if you prefer.
37
+ #
38
+ # Something else to consider is that using the :finders addon boosts
39
+ # performance because it will avoid Rails-internal code that makes runtime
40
+ # calls to `Module.extend`.
41
+ #
42
+ config.use :finders
43
+ #
44
+ # ## Slugs
45
+ #
46
+ # Most applications will use the :slugged module everywhere. If you wish
47
+ # to do so, uncomment the following line.
48
+ #
49
+ # config.use :slugged
50
+ #
51
+ # By default, FriendlyId's :slugged addon expects the slug column to be named
52
+ # 'slug', but you can change it if you wish.
53
+ #
54
+ # config.slug_column = 'slug'
55
+ #
56
+ # When FriendlyId can not generate a unique ID from your base method, it appends
57
+ # a UUID, separated by a single dash. You can configure the character used as the
58
+ # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
59
+ # with two dashes.
60
+ #
61
+ # config.sequence_separator = '-'
62
+ #
63
+ # ## Tips and Tricks
64
+ #
65
+ # ### Controlling when slugs are generated
66
+ #
67
+ # As of FriendlyId 5.0, new slugs are generated only when the slug field is
68
+ # nil, but if you're using a column as your base method can change this
69
+ # behavior by overriding the `should_generate_new_friendly_id` method that
70
+ # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
71
+ # more like 4.0.
72
+ #
73
+ # config.use Module.new {
74
+ # def should_generate_new_friendly_id?
75
+ # slug.blank? || <your_column_name_here>_changed?
76
+ # end
77
+ # }
78
+ #
79
+ # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
80
+ # languages that don't use the Roman alphabet, that's not usually suffient. Here
81
+ # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
82
+ # you use this, don't forget to add "babosa" to your Gemfile.
83
+ #
84
+ # config.use Module.new {
85
+ # def normalize_friendly_id(text)
86
+ # text.to_slug.normalize! :transliterations => [:russian, :latin]
87
+ # end
88
+ # }
89
+ end
90
+ end
Binary file
@@ -0,0 +1,31 @@
1
+ class CreateSearchHistories < ActiveRecord::Migration
2
+ def self.up
3
+ create_table :search_histories do |t|
4
+ t.integer :user_id
5
+ t.string :operation, :default => 'searchRetrieve'
6
+ t.float :version, :default => 1.2
7
+ t.string :query
8
+ t.integer :start_record
9
+ t.integer :maximum_records
10
+ t.string :record_packing
11
+ t.string :record_schema
12
+ t.integer :result_set_ttl
13
+ t.string :stylesheet
14
+ t.string :extra_request_data
15
+ t.integer :number_of_records, :default => 0
16
+ t.string :result_set_id
17
+ t.integer :result_set_idle_time
18
+ t.text :records
19
+ t.integer :next_record_position
20
+ t.text :diagnostics
21
+ t.text :extra_response_data
22
+ t.text :echoed_search_retrieve_request
23
+ t.timestamps
24
+ end
25
+ add_index :search_histories, :user_id
26
+ end
27
+
28
+ def self.down
29
+ drop_table :search_histories
30
+ end
31
+ end
@@ -0,0 +1,9 @@
1
+ class RenameSearchHistoryVersionToSruVersion < ActiveRecord::Migration
2
+ def self.up
3
+ rename_column :search_histories, :version, :sru_version
4
+ end
5
+
6
+ def self.down
7
+ rename_column :search_histories, :sru_version, :version
8
+ end
9
+ end
@@ -7,6 +7,6 @@ class CreateSeriesStatementMerges < ActiveRecord::Migration
7
7
  t.timestamps
8
8
  end
9
9
  add_index :series_statement_merges, :series_statement_id
10
- add_index :series_statement_merges, :series_statement_merge_list_id
10
+ add_index :series_statement_merges, :series_statement_merge_list_id, name: "index_series_statement_merges_on_list_id"
11
11
  end
12
12
  end
@@ -0,0 +1,5 @@
1
+ class AddDimensionsToManifestation < ActiveRecord::Migration
2
+ def change
3
+ add_column :manifestations, :dimensions, :text
4
+ end
5
+ end
@@ -0,0 +1,9 @@
1
+ class RenameManifestationPeriodicalToSerial < ActiveRecord::Migration
2
+ def up
3
+ rename_column :manifestations, :periodical, :serial
4
+ end
5
+
6
+ def down
7
+ rename_column :manifestations, :serial, :periodical
8
+ end
9
+ end
@@ -11,7 +11,7 @@
11
11
  #
12
12
  # It's strongly recommended to check this file into your version control system.
13
13
 
14
- ActiveRecord::Schema.define(:version => 20140812093836) do
14
+ ActiveRecord::Schema.define(:version => 20140823095740) do
15
15
 
16
16
  create_table "accepts", :force => true do |t|
17
17
  t.integer "basket_id"
@@ -779,8 +779,9 @@ ActiveRecord::Schema.define(:version => 20140812093836) do
779
779
  t.integer "month_of_publication"
780
780
  t.boolean "fulltext_content"
781
781
  t.string "doi"
782
- t.boolean "periodical"
782
+ t.boolean "serial"
783
783
  t.text "statement_of_responsibility"
784
+ t.text "dimensions"
784
785
  end
785
786
 
786
787
  add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
@@ -1131,6 +1132,32 @@ ActiveRecord::Schema.define(:version => 20140812093836) do
1131
1132
  t.datetime "updated_at", :null => false
1132
1133
  end
1133
1134
 
1135
+ create_table "search_histories", :force => true do |t|
1136
+ t.integer "user_id"
1137
+ t.string "operation", :default => "searchRetrieve"
1138
+ t.float "sru_version", :default => 1.2
1139
+ t.string "query"
1140
+ t.integer "start_record"
1141
+ t.integer "maximum_records"
1142
+ t.string "record_packing"
1143
+ t.string "record_schema"
1144
+ t.integer "result_set_ttl"
1145
+ t.string "stylesheet"
1146
+ t.string "extra_request_data"
1147
+ t.integer "number_of_records", :default => 0
1148
+ t.string "result_set_id"
1149
+ t.integer "result_set_idle_time"
1150
+ t.text "records"
1151
+ t.integer "next_record_position"
1152
+ t.text "diagnostics"
1153
+ t.text "extra_response_data"
1154
+ t.text "echoed_search_retrieve_request"
1155
+ t.datetime "created_at", :null => false
1156
+ t.datetime "updated_at", :null => false
1157
+ end
1158
+
1159
+ add_index "search_histories", ["user_id"], :name => "index_search_histories_on_user_id"
1160
+
1134
1161
  create_table "series_has_manifestations", :force => true do |t|
1135
1162
  t.integer "series_statement_id"
1136
1163
  t.integer "manifestation_id"
Binary file
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ enjuadmin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ enjuadmin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ enjuadmin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false