diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-06-06 21:33:36 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-06-06 21:33:36 -0400 |
| commit | 3c2a5c974750898a46faf844dc7c6dc2ad4173fd (patch) | |
| tree | 2feaeadeefd6935e7b4d9a6b954b3276d4478dbe /lib/sisu/v4/db_remove.rb | |
| parent | debian/changelog (4.1.3-1) (diff) | |
| parent | v4 v5: cgi helper script, sample search form generator, file name matching (diff) | |
Merge tag 'sisu_4.1.4' into debian/sid
SiSU 4.1.4
Diffstat (limited to 'lib/sisu/v4/db_remove.rb')
| -rw-r--r-- | lib/sisu/v4/db_remove.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sisu/v4/db_remove.rb b/lib/sisu/v4/db_remove.rb index 740977d0..c402f959 100644 --- a/lib/sisu/v4/db_remove.rb +++ b/lib/sisu/v4/db_remove.rb @@ -78,17 +78,17 @@ module SiSU_DbRemove remove_selected=%{ SELECT tid FROM metadata_and_text - WHERE src_filename = '#{@opt.fns}' + WHERE src_filename = '#{@md.fns}' AND metadata_and_text.language_document_char = '#{@opt.lng}' - ;} + ;} # note, for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns @conn.get_first_value(remove_selected).to_i else remove_selected=%{ SELECT metadata_and_text.tid FROM metadata_and_text - WHERE metadata_and_text.src_filename = '#{@opt.fns}' + WHERE metadata_and_text.src_filename = '#{@md.fns}' AND metadata_and_text.language_document_char = '#{@opt.lng}' - ;} + ;} # note, for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns x=@conn.select_one(remove_selected) x ? (x.join.to_i) : nil end |