[Lsb-messages] /var/www/bzr/lsb/devel/dbadmin r265: Added Capeparedin support

[Denis Silakov]

------------------------------------------------------------
revno: 265
committer: Denis Silakov <denis.silakov at rosalab.ru>
branch nick: dbadmin
timestamp: Wed 2012-09-12 15:46:45 +0400
message:
  Added Capeparedin support
modified:
  presence.inc
  status.inc
  tmp_tables.inc
-------------- next part --------------
=== modified file 'presence.inc'
--- a/presence.inc	2012-09-10 17:07:47 +0000
+++ b/presence.inc	2012-09-12 11:46:45 +0000
@@ -432,10 +432,9 @@
         $createIncludedCmds = "CREATE TEMPORARY TABLE tmp_CmdsIncludedIn_".$ver_str."
                                 (KEY `Cname`(`Cname`))
                                 AS SELECT DISTINCT Cid, Cname FROM Command
-                                JOIN SModCmd ON SMCcid=Cid
                                 WHERE Cbuiltin != 'Yes'
-                                AND SMCappearedin > '' AND SMCappearedin <= '$ver'
-                                AND (SMCwithdrawnin IS NULL OR SMCwithdrawnin > '$ver')
+                                AND Cappearedin > '' AND Cappearedin <= '$ver'
+                                AND (Cwithdrawnin IS NULL OR Cwithdrawnin > '$ver')
                                 ";
         Query($createIncludedCmds);
 
@@ -780,10 +779,9 @@
     $createIncludedCmds = "CREATE TEMPORARY TABLE tmp_CmdsIncludedIn_".$ver_str."
                                 (KEY `Cname`(`Cname`))
                                 AS SELECT DISTINCT Cid, Cname FROM Command
-                                JOIN SModCmd ON SMCcid=Cid
                                 WHERE Cbuiltin != 'Yes'
-                                AND SMCappearedin > '' AND SMCappearedin <= '$ver'
-                                AND (SMCwithdrawnin IS NULL OR SMCwithdrawnin > '$ver')
+                                AND Cappearedin > '' AND Cappearedin <= '$ver'
+                                AND (Cwithdrawnin IS NULL OR Cwithdrawnin > '$ver')
                                 ";
     Query($createIncludedCmds);
 

=== modified file 'status.inc'
--- a/status.inc	2012-09-10 17:07:47 +0000
+++ b/status.inc	2012-09-12 11:46:45 +0000
@@ -376,25 +376,25 @@
 
         // Included Total
         print("<th class='left'>Included total</th>\n");
-        $select = "SELECT COUNT(DISTINCT SMCcid) FROM SModCmd
-                    WHERE SMCappearedin > '' AND SMCappearedin <= '$ver'
-                    AND (SMCwithdrawnin IS NULL OR SMCwithdrawnin >'$ver')";
+        $select = "SELECT COUNT(DISTINCT Cid) FROM Command
+                    WHERE Cappearedin > '' AND Cappearedin <= '$ver'
+                    AND (Cwithdrawnin IS NULL OR Cwithdrawnin >'$ver')";
         $cmd_cnt=Query_value($select);
         print_linked_td( $cmd_cnt, "status.php?cmd=included-cmds&amp;ver=$ver" );
         print("</tr><tr>\n");
 
         // Appeared in the given version
         print("<th class='left'>Added here</th>\n");
-        $select = "SELECT COUNT(DISTINCT SMCcid) FROM SModCmd
-                    WHERE SMCappearedin='$ver'";
+        $select = "SELECT COUNT(DISTINCT Cid) FROM Command
+                    WHERE Cappearedin='$ver'";
         $cmd_cnt=Query_value($select);
         print_linked_td( $cmd_cnt, "status.php?cmd=appeared-cmds&amp;ver=$ver");
         print("</tr><tr>\n");
 
         // Withdrawn in the given version
         print("<th class='left'>Withdrawn here</th>\n");
-        $select = "SELECT COUNT(DISTINCT SMCcid) FROM SModCmd
-                    WHERE SMCwithdrawnin='$ver'";
+        $select = "SELECT COUNT(DISTINCT Cid) FROM Command
+                    WHERE Cwithdrawnin='$ver'";
         $cmd_cnt=Query_value($select);
         print_linked_td( $cmd_cnt, "status.php?cmd=withdrawn-cmds&amp;ver=$ver" );
         print("</tr>\n");
@@ -1099,16 +1099,21 @@
         // Commands
         case "included-cmds" :
             $header = "Commands Included in the $standard  ".$ver;
-            list_commands(" WHERE SMCappearedin > '' AND SMCappearedin <= '$ver'
-                    AND (SMCwithdrawnin IS NULL OR SMCwithdrawnin > '$ver')", $header);
+            list_commands(" WHERE Cappearedin > '' AND Cappearedin <= '$ver'
+                    AND (Cwithdrawnin IS NULL OR Cwithdrawnin > '$ver')
+                    AND SMCappearedin > '' AND SMCappearedin <= '$ver'
+                    AND (SMCwithdrawnin IS NULL OR SMCwithdrawnin > '$ver')
+                    AND CSappearedin > '' AND CSappearedin <= '$ver'
+                    AND (CSwithdrawnin IS NULL OR CSwithdrawnin > '$ver')
+                    ", $header);
             break;
         case "withdrawn-cmds" :
             $header = "Commands Withdrawn in the $standard  ".$ver;
-            list_commands(" WHERE SMCwithdrawnin = '$ver'", $header);
+            list_commands(" WHERE Cwithdrawnin = '$ver'", $header);
             break;
         case "appeared-cmds" :
             $header = "Commands Appeared in the $standard  ".$ver;
-            list_commands(" WHERE SMCappearedin = '$ver' ",$header);
+            list_commands(" WHERE Cappearedin = '$ver' ",$header);
             break;
         case "builtin-cmds" :
             list_commands("WHERE Cbuiltin = 'Yes'","Builtin Commands");

=== modified file 'tmp_tables.inc'
--- a/tmp_tables.inc	2012-09-10 17:07:47 +0000
+++ b/tmp_tables.inc	2012-09-12 11:46:45 +0000
@@ -240,6 +240,7 @@
                         LEFT JOIN SModCmd ON SMCcid=Cid
                         LEFT JOIN CmdStd ON CScid=Cid ";
     add_lsbversion_filter($createCommand, "SMCappearedin", "SMCwithdrawnin");
+    add_lsbversion_filter($createCommand, "Cappearedin", "Cwithdrawnin");
     add_lsbversion_filter($createCommand, "CSappearedin", "CSwithdrawnin");
     Query($createCommand);
 }