diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-05-04 23:27:02 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-05-04 23:41:00 -0400 |
commit | 2d79257e0b2fe90e036fa6554cadb2d587128bc5 (patch) | |
tree | e92fc587731e72310dc1ed61c501ed944c2a02a5 /lib/sisu/v3/db_remove.rb | |
parent | v3: urls, sqlite, a fix (diff) |
v3: db, review, directory structure changed, database prefix renamed
* language_document_char field made larger [consider renaming]
* title, src_filename and language_document_char fields mandatory
(title, title_main, src_filename, language_document_char)
* review of unique key setting, now based on combination of filename
and language (filename no longer sufficient with intro of language
subdirectories)
* [retest sqlite3]
Diffstat (limited to 'lib/sisu/v3/db_remove.rb')
-rw-r--r-- | lib/sisu/v3/db_remove.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/sisu/v3/db_remove.rb b/lib/sisu/v3/db_remove.rb index 7644ad52..cfa19c9f 100644 --- a/lib/sisu/v3/db_remove.rb +++ b/lib/sisu/v3/db_remove.rb @@ -72,9 +72,19 @@ module SiSU_DB_remove : false end del_id=if driver_sqlite3 - @conn.get_first_value(%{ SELECT tid FROM metadata_and_text WHERE src_filename = '#{@opt.fns}' AND metadata_and_text.language_document_char = '#{@opt.lng}'; }).to_i + @conn.get_first_value(%{ + SELECT tid + FROM metadata_and_text + WHERE src_filename = '#{@opt.fns}' + AND metadata_and_text.language_document_char = '#{@opt.lng}' + ;}).to_i else - x=@conn.select_one(%{ SELECT metadata_and_text.tid FROM metadata_and_text WHERE metadata_and_text.src_filename = '#{@opt.fns}' AND metadata_and_text.language_document_char = '#{@opt.lng}'; }) + x=@conn.select_one(%{ + SELECT metadata_and_text.tid + FROM metadata_and_text + WHERE metadata_and_text.src_filename = '#{@opt.fns}' + AND metadata_and_text.language_document_char = '#{@opt.lng}' + ;}) x ? (x.join.to_i) : nil end if del_id |