Skip to content
This repository has been archived by the owner on Jul 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'refs/heads/master' into formtastic
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Trautmann committed Dec 13, 2011
2 parents cdf1f50 + c6298e9 commit fde04e1
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 888 deletions.
2 changes: 1 addition & 1 deletion config/deploy
Submodule deploy updated from 7a0b69 to 1868bc
2 changes: 1 addition & 1 deletion config/environment.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
config.gem 'libxslt-ruby', :lib => 'libxslt', :version => '0.9.2'
config.gem 'rubyzip', :lib => 'zip/zip'
config.gem 'mime-types', :lib => 'mime/types'
config.gem 'uuidtools'
config.gem 'uuidtools', :version => '1.0.4'
config.gem 'mislav-will_paginate', :version => '~> 2.2.3', :lib => 'will_paginate', :source => 'http://gems.github.com'
config.gem 'whenever', :version => "0.4.1", :lib => false
config.gem 'rsolr', :version => '0.9.6' # NEWER VERSIONS ARE BUGGY!
Expand Down
102 changes: 51 additions & 51 deletions db/schema.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

create_table "annotations", :force => true do |t|
t.integer "instantiation_id"
t.text "annotation", :limit => 16777215
t.text "annotation"
t.text "annotation_type"
t.text "ref"
end
Expand Down Expand Up @@ -105,7 +105,7 @@

create_table "contributors", :force => true do |t|
t.integer "asset_id"
t.text "contributor", :limit => 16777215, :null => false
t.text "contributor", :null => false
t.integer "contributor_role_id"
t.datetime "created_at"
t.datetime "updated_at"
Expand All @@ -128,8 +128,8 @@

create_table "coverages", :force => true do |t|
t.integer "asset_id"
t.text "coverage", :limit => 16777215, :null => false
t.string "coverage_type", :null => false
t.text "coverage", :null => false
t.string "coverage_type", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "creator_id"
Expand All @@ -153,7 +153,7 @@

create_table "creators", :force => true do |t|
t.integer "asset_id"
t.text "creator", :limit => 16777215, :null => false
t.text "creator", :null => false
t.integer "creator_role_id"
t.datetime "created_at"
t.datetime "updated_at"
Expand All @@ -174,10 +174,10 @@
add_index "creators", ["asset_id"], :name => "index_creators_on_asset_id"

create_table "delayed_jobs", :force => true do |t|
t.integer "priority", :default => 0
t.integer "attempts", :default => 0
t.text "handler", :limit => 16777215
t.text "last_error", :limit => 16777215
t.integer "priority", :default => 0
t.integer "attempts", :default => 0
t.text "handler"
t.text "last_error"
t.datetime "run_at"
t.datetime "locked_at"
t.datetime "failed_at"
Expand All @@ -195,7 +195,7 @@

create_table "descriptions", :force => true do |t|
t.integer "asset_id"
t.text "description", :limit => 16777215, :null => false
t.text "description", :null => false
t.integer "description_type_id"
t.datetime "created_at"
t.datetime "updated_at"
Expand Down Expand Up @@ -228,19 +228,19 @@

create_table "essence_tracks", :force => true do |t|
t.integer "instantiation_id"
t.text "essence_track_identifier", :limit => 16777215
t.text "essence_track_standard", :limit => 16777215
t.text "essence_track_encoding", :limit => 16777215
t.text "essence_track_data_rate", :limit => 16777215
t.text "essence_track_time_start", :limit => 16777215
t.text "essence_track_duration", :limit => 16777215
t.text "essence_track_bit_depth", :limit => 16777215
t.text "essence_track_sampling_rate", :limit => 16777215
t.text "essence_track_frame_size", :limit => 16777215
t.text "essence_track_aspect_ratio", :limit => 16777215
t.text "essence_track_frame_rate", :limit => 16777215
t.text "essence_track_language", :limit => 16777215
t.text "essence_track_annotation", :limit => 16777215
t.text "essence_track_identifier"
t.text "essence_track_standard"
t.text "essence_track_encoding"
t.text "essence_track_data_rate"
t.text "essence_track_time_start"
t.text "essence_track_duration"
t.text "essence_track_bit_depth"
t.text "essence_track_sampling_rate"
t.text "essence_track_frame_size"
t.text "essence_track_aspect_ratio"
t.text "essence_track_frame_rate"
t.text "essence_track_language"
t.text "essence_track_annotation"
t.integer "essence_track_type_id"
t.integer "essence_track_identifier_source_id"
end
Expand All @@ -250,8 +250,8 @@
create_table "extension_names", :force => true do |t|
t.string "extension_key"
t.string "extension_authority"
t.text "description", :limit => 16777215
t.boolean "visible", :default => false, :null => false
t.text "description"
t.boolean "visible", :default => false, :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "creator_id"
Expand All @@ -262,8 +262,8 @@

create_table "extensions", :force => true do |t|
t.integer "asset_id"
t.text "extension", :limit => 16777215
t.text "extension_authority_used", :limit => 16777215
t.text "extension"
t.text "extension_authority_used"
end

add_index "extensions", ["asset_id"], :name => "index_extensions_on_asset_id"
Expand All @@ -284,8 +284,8 @@
t.integer "updater_id"
end

add_index "format_ids", ["instantiation_id"], :name => "index_format_ids_on_instantiation_id"
add_index "format_ids", ["format_identifier_source_id", "format_identifier"], :name => "by_source_and_identifier"
add_index "format_ids", ["instantiation_id"], :name => "index_format_ids_on_instantiation_id"

create_table "formats", :force => true do |t|
t.string "type", :null => false
Expand All @@ -296,9 +296,9 @@
add_index "formats", ["type", "name"], :name => "index_formats_on_type_and_name"

create_table "genres", :force => true do |t|
t.text "name", :limit => 16777215, :null => false
t.text "genre_authority_used", :limit => 16777215
t.boolean "visible", :default => false, :null => false
t.text "name", :null => false
t.text "genre_authority_used"
t.boolean "visible", :default => false, :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "creator_id"
Expand All @@ -307,13 +307,13 @@
end

create_table "identifier_sources", :force => true do |t|
t.text "name", :limit => 16777215, :null => false
t.text "name", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "visible", :default => false, :null => false
t.boolean "show_in_index", :default => true, :null => false
t.boolean "visible", :default => false, :null => false
t.boolean "show_in_index", :default => true, :null => false
t.string "regex"
t.boolean "auto_merge", :default => false, :null => false
t.boolean "auto_merge", :default => false, :null => false
t.integer "creator_id"
t.integer "updater_id"
t.integer "sequence"
Expand Down Expand Up @@ -380,21 +380,21 @@
create_table "instantiations", :force => true do |t|
t.integer "asset_id"
t.integer "format_id"
t.text "format_location", :limit => 16777215, :null => false
t.text "format_location", :null => false
t.integer "instantiation_media_type_id"
t.integer "instantiation_generation_id"
t.string "format_file_size"
t.string "format_time_start"
t.string "format_duration"
t.string "format_data_rate"
t.integer "instantiation_color_id"
t.text "format_tracks", :limit => 16777215
t.text "format_channel_configuration", :limit => 16777215
t.text "format_tracks"
t.text "format_channel_configuration"
t.string "language"
t.text "alternative_modes", :limit => 16777215
t.text "alternative_modes"
t.datetime "created_at"
t.datetime "updated_at"
t.string "uuid", :limit => 36, :null => false
t.string "uuid", :limit => 36, :null => false
t.string "template_name"
t.integer "creator_id"
t.integer "updater_id"
Expand All @@ -403,13 +403,13 @@
t.text "time_annotation"
end

add_index "instantiations", ["uuid"], :name => "index_instantiations_on_uuid", :unique => true
add_index "instantiations", ["asset_id"], :name => "index_instantiations_on_asset_id"
add_index "instantiations", ["template_name"], :name => "index_instantiations_on_template_name"
add_index "instantiations", ["uuid"], :name => "index_instantiations_on_uuid", :unique => true

create_table "ip_blocks", :force => true do |t|
t.string "name", :null => false
t.text "ranges", :limit => 16777215
t.string "name", :null => false
t.text "ranges"
end

add_index "ip_blocks", ["name"], :name => "index_ip_blocks_on_name", :unique => true
Expand All @@ -423,7 +423,7 @@

create_table "publishers", :force => true do |t|
t.integer "asset_id"
t.text "publisher", :limit => 16777215, :null => false
t.text "publisher", :null => false
t.integer "publisher_role_id"
t.datetime "created_at"
t.datetime "updated_at"
Expand All @@ -444,8 +444,8 @@
add_index "publishers", ["asset_id"], :name => "index_publishers_on_asset_id"

create_table "relation_types", :force => true do |t|
t.text "name", :limit => 16777215, :null => false
t.boolean "visible", :default => false, :null => false
t.text "name", :null => false
t.boolean "visible", :default => false, :null => false
end

create_table "relations", :force => true do |t|
Expand All @@ -466,7 +466,7 @@

create_table "rights_summaries", :force => true do |t|
t.integer "asset_id"
t.text "rights_summary", :limit => 16777215, :null => false
t.text "rights_summary", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "creator_id"
Expand All @@ -476,9 +476,9 @@
add_index "rights_summaries", ["asset_id"], :name => "index_rights_summaries_on_asset_id"

create_table "subjects", :force => true do |t|
t.text "subject", :limit => 16777215, :null => false
t.text "subject_authority", :limit => 16777215
t.boolean "visible", :default => false, :null => false
t.text "subject", :null => false
t.text "subject_authority"
t.boolean "visible", :default => false, :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "creator_id"
Expand All @@ -500,7 +500,7 @@

create_table "titles", :force => true do |t|
t.integer "asset_id"
t.text "title", :limit => 16777215, :null => false
t.text "title", :null => false
t.integer "title_type_id"
t.datetime "created_at"
t.datetime "updated_at"
Expand Down
Loading

0 comments on commit fde04e1

Please sign in to comment.