asdf

diff --git a/bin/pbdc-bacula.php b/bin/pbdc-bacula.php
index 5a36526..c86a4bc 100644 (file)
--- a/bin/pbdc-bacula.php
+++ b/bin/pbdc-bacula.php
@@ -114,25 +114,17 @@ function loaded_tape()
        }
        
        $ret = false;
-       $i=1;
+       $i=-1;
+       
+       $sql = "select slot_no from slots where tape_name=='$rl'";
+       $res = $db->query($sql);
+       
        foreach($res as $row) {
-               //echo "Listing tapes for disk ".$row["disk_id"].", ".$row["disk_name"]."\n";
-               //echo "dir: $amloc/".$row["disk_name"]."/pbdc/".$argv[1]."/tapes/\n";
-               //exit(0);
-               $dh = opendir("$amloc/".$row["disk_name"]."/pbdc/".$argv[1]."/tapes/");
-               while(($file = readdir($dh)) !== false) {
-                       if(ereg("d[0-9]+_vol[0-9]+", $file)!=false) {
-                               if($rl == $file) {
-                                       echo "$i\n";
-                                       exit(0);
-                               }
-                               $i++;
-                       } else {
-                               //echo "didnt match: $file\n";
-                       }
-                       //exit(0);
-               }
-               closedir($dh);
+               $i = $row[0];
+       }
+       if($i != -1) {
+               echo "$i\n";
+               return;
        }
        
        echo "0\n";

diff --git a/lib/lib.php b/lib/lib.php
index de8e152..abbd70d 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -28,9 +28,6 @@ function db_createDB($dbobject)
                $dbobject->query('CREATE TABLE sqlite_sequence(name,seq)');
                $dbobject->query('CREATE TABLE "config" ("config_name" TEXT NOT NULL,"config_value" TEXT NOT NULL)');
                $dbobject->query('CREATE TABLE "slots" ("slots_id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"slot_no" INTEGER,"disk_id" INTEGER,"tape_name" TEXT)');
-
-               // TODO create action group here
-               
        }
 }