[Lsb-messages] /var/www/bzr/lsb/devel/libtodb2 r32: Take into account Tlibrary if available

[Denis Silakov]

------------------------------------------------------------
revno: 32
committer: Denis Silakov <denis.silakov at rosalab.ru>
branch nick: libtodb2
timestamp: Wed 2012-08-22 23:32:08 +0400
message:
  Take into account Tlibrary if available
modified:
  headertodb2/prepare_sql.pl
-------------- next part --------------
=== modified file 'headertodb2/prepare_sql.pl'
--- a/headertodb2/prepare_sql.pl	2012-05-01 13:08:38 +0000
+++ b/headertodb2/prepare_sql.pl	2012-08-22 19:32:08 +0000
@@ -470,7 +470,9 @@
 #        print "SET \@Tid=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype' AND Theadgroup > 0);\n";
     }
     else {
-        print "SET \@Tid=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype');\n";
+        print "SET \@Tid1=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype' AND Tlibrary='$library');\n";
+        print "SET \@Tid2=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype');\n";
+        print "SET \@Tid=(SELECT IFNULL(@Tid1, at Tid2));\n";
     }
 
     $xh = $dbh->prepare("SELECT DISTINCT Iname FROM Interface WHERE Ilibrary='$library' AND Iunmangled LIKE '%::$Iname(%'");
@@ -537,7 +539,9 @@
 #       }
     }
     else {
-        print "SET \@Tid=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype');\n";
+        print "SET \@Tid1=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype' AND Tlibrary='$library');\n";
+        print "SET \@Tid2=(SELECT Tid FROM Type WHERE Tname='$Tname' AND Ttype='$Ttype' LIMIT 1);\n";
+        print "SET \@Tid=(SELECT IFNULL(@Tid1, at Tid2));\n";
     }
     print "SET \@Iid=(SELECT Iid FROM Interface WHERE Iname='$Iname' AND Ilibrary='$library');\n";
     print "INSERT INTO Parameter (Pint,Ppos,Ptype) VALUES (\@Iid,$Ppos,\@Tid);\n";