X-Git-Url: http://git.pjr.cc/?p=php-bacula-disk-changer.git;a=blobdiff_plain;f=lib%2Flib.php;fp=lib%2Flib.php;h=26ca7ed273d17e233d203478c18e9f3c81c9d174;hp=42d30a5d4a4b82511255d6b288c900ffae0d9624;hb=10b3158464d931ccfa758eb648ca2e9b72aa0a86;hpb=45477c40560ea3bda92e4c03c7ed564228a92bd8

diff --git a/lib/lib.php b/lib/lib.php
index 42d30a5..26ca7ed 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -5,7 +5,7 @@ function db_getDB($changer_name)
 	global $BASE_DATA, $BASE_LIB, $BACULA_USER;
 	
 	try {
-		$dbobject = new PDO("sqlite:$BASE_DATA/$changer_name"."db");
+		$dbobject = new PDO("sqlite:$BASE_DATA/$changer_name".".db");
 	} catch(PDOException $exep) {
 		echo "<font color='red'>Cannot open sqlitedb, ".$exep->getMessage()."</font><br>";
 		return;
@@ -33,12 +33,12 @@ function db_createDB($dbobject)
 	}
 }
 
-function conf_getVal($name)
+function conf_getVal($changer, $name)
 {
-	$db = db_getDB();
+	$db = db_getDB($changer);
 	
-	$sql = "select conf_val from conf where conf_name=='$name'";
-	error_log("from getval: ".$sql);
+	$sql = "select config_value from config where config_name=='$name'";
+	//error_log("from getval: ".$sql);
 	
 	$res = $db->query($sql);
 	
@@ -47,22 +47,46 @@ function conf_getVal($name)
 	$val = false;
 	
 	foreach($res as $row) {
-		$val = $row["conf_val"];
+		$val = $row["config_value"];
 	}
 	
 	return $val;
 }
 
-function conf_setVal($name, $value)
+function conf_setVal($changer, $name, $value)
 {
-	$db = db_getDB();
+	$db = db_getDB($changer);
 	
-	$sql = "delete from conf where conf_name=='$name'";
+	$sql = "delete from config where config_name=='$name'";
 	$db->query($sql);
 	
-	$sql = "insert into conf values ('$name', '$value')";
+	$sql = "insert into config values ('$name', '$value')";
 	$db->query($sql);
 	
-	error_log("from setval: ".$sql);
+	//error_log("from setval: ".$sql);
+}
+
+function add_diskToDB($changer, $diskid)
+{
+	$db = db_getDB($changer);
+	
+	$sql = "select * from disk_list where disk_name=='$diskid'";
+	$res = $db->query($sql);
+	if(!$res) return false;
+	
+	$val = false;
+	foreach($res as $row) {
+		$val = $row["disk_id"];
+	}
+	
+	if(!$val) {
+		$sql = "insert into disk_list values(NULL, '$diskid')";
+		$db->query($sql);
+		return $db->lastInsertId();
+	} else {
+		echo "Disk already existed in db, will create more tapes?\n";
+	}
+	
+	return $val;
 }
 ?>
\ No newline at end of file