diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
| commit | a9642d67f69d83d3fdb56ab115ef3c10bcd1895c (patch) | |
| tree | 352c633d6b60a54a9ef74ff143162ac07c981b18 /lib/sisu/v3/db_remove.rb | |
| parent | debian/changelog (3.0.7-1) (diff) | |
| parent | v3: i18n, sysenv, class variable to prevent unnecessary re-construction of hash (diff) | |
Merge branch 'upstream' into debian/sid
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 025514b1..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}'; }).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}'; }) + 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 |