--- DatabaseLayer.h	2006/08/30 21:57:57	9
+++ DatabaseLayer.h	2006/08/31 16:32:37	17
@@ -9,8 +9,6 @@
 {
 private:
 	CDatabase db;
-	vector<Person> persons;
-	vector<Equipment> equipments;
 
 public:
 	DatabaseLayer(void);
@@ -22,11 +20,14 @@
 	bool AddPerson(Person NewPerson);
 	bool UpdatePerson(Person ChangePerson);
 	bool DeletePerson(Person RemovePerson);
-
-	bool UpdateEquipment(Equipment ChangeEquipment);
-	Equipment GetEquipment(CString barcode);
-
-
-	bool AddEquipment(Equipment e);
-	vector<Equipment> GetEquipmentAll();
+	bool ReturnEquipment(CString barcode);
+	bool CheckoutEquipment(Person CheckPersID, Equipment CheckEquip, int Numdays);
+	bool EquipmentReservation(Person CheckPersID, Equipment CheckEquip, int Numdays);
+	bool UpdateEquipment(Equipment CheckEquip);
+	bool AddEquipment(Equipment AddEquip);
+	vector<Equipment> GetEquipmentAll(void);
+	Equipment GetEquipment(CString wantBarcode);
+	bool DeleteEquipment(Equipment DelEquip);
+	vector<Equipment> Search(CString barcode, CString name, CString inits, bool available, bool reserved, bool deposited);
+	void FillEquipmentVector(vector<Equipment> &buffer, CRecordset &rs);
 };