bin/pastebin.userv, lib/Odin.pm: Centralize language-tag checking.

Move the actual checking logic into the main library.  Do the checking
in both `new' and `update' operations.

diff --git a/bin/pastebin.userv b/bin/pastebin.userv
index fe9e55d52e05cec4372ac38fdc83f918798de1ad..42dc66d7dc9be1e9cd11ffa29324d94cbaeb4dac 100755 (executable)
--- a/bin/pastebin.userv
+++ b/bin/pastebin.userv
@@ -60,9 +60,6 @@ EOF
   $op->bad if @ARGV;
   $op->ok or Odin::fail "usage: new [-l LANG] [-t TITLE]";
   $p{content} = read_content;
   $op->bad if @ARGV;
   $op->ok or Odin::fail "usage: new [-l LANG] [-t TITLE]";
   $p{content} = read_content;

-  @{$db->selectall_arrayref
-    ("SELECT lang FROM odin_pastebin_lang WHERE lang = ?", undef, $p{lang})}
-    or Odin::fail "unknown language `$p{lang}'";

   my ($tag, $edit) = Odin::new_pastebin %p;
   print "$Odin::PASTEBIN/$tag $edit\n";
 } elsif ($op eq "get") {
   my ($tag, $edit) = Odin::new_pastebin %p;
   print "$Odin::PASTEBIN/$tag $edit\n";
 } elsif ($op eq "get") {

diff --git a/lib/Odin.pm b/lib/Odin.pm
index 154fae0b1c9511cde89593cb42cf4cb0bf34fdb7..bc5947e5a21c7b36a7189f460945caed94697784 100644 (file)
--- a/lib/Odin.pm
+++ b/lib/Odin.pm
@@ -376,6 +376,16 @@ our @PASTEBIN_PROPS = keys %PASTEBIN_DEFAULTS;
 our $PASTEBIN_PROPCOLS = join ", ", @PASTEBIN_PROPS;
 our $PASTEBIN_PROPPLACES = join ", ", map "?", @PASTEBIN_PROPS;
 
 our $PASTEBIN_PROPCOLS = join ", ", @PASTEBIN_PROPS;
 our $PASTEBIN_PROPPLACES = join ", ", map "?", @PASTEBIN_PROPS;
 

+sub check_lang ($) {
+  my ($lang) = @_;
+
+  return unless defined $lang;
+  my $db = open_db;
+  @{$db->selectall_arrayref
+    ("SELECT lang FROM odin_pastebin_lang WHERE lang = ?", undef, $lang)}
+    or fail "unknown language `$lang'";
+}
+

 sub new_pastebin (\%) {
   my ($new) = @_;
 
 sub new_pastebin (\%) {
   my ($new) = @_;
 


@@ -384,6 +394,7 @@ sub new_pastebin (\%) {
   my $tag;
 
   merge_hash %$new, %PASTEBIN_DEFAULTS;
   my $tag;
 
   merge_hash %$new, %PASTEBIN_DEFAULTS;

+  check_lang $new->{lang};

   xact {
     $tag = encode_tag next_seq $db, "odin_pastebin_seq";
     insert_record $db, "odin_pastebin",
   xact {
     $tag = encode_tag next_seq $db, "odin_pastebin_seq";
     insert_record $db, "odin_pastebin",


@@ -455,6 +466,7 @@ sub update_pastebin ($$\%) {
 
   my $db = open_db;
   my $editp = 0;
 
   my $db = open_db;
   my $editp = 0;

+  check_lang $new->{lang};

   xact {
     get_pastebin_check_editkey_or_owner $db, $tag, $editkey, my %old;
     for my $p (@PASTEBIN_PROPS) {
   xact {
     get_pastebin_check_editkey_or_owner $db, $tag, $editkey, my %old;
     for my $p (@PASTEBIN_PROPS) {