addition to 9207b8e

Herder-IT-Solutions · Mar 8, 2017 · 24d7817 · 24d7817
1 parent 381164f
commit 24d7817
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/lazarus/DBConnection.pas b/lazarus/DBConnection.pas
@@ -685,8 +685,11 @@ procedure TDBConnection.setBookFields(var resultVar: ArrayOfBooks; returnOne: bo
         resultVar[length(resultVar) - 1] := TBook.Create; //create new book object
         resultVar[length(resultVar) - 1].setId(FieldByName('id').AsLargeInt);
         resultVar[length(resultVar) - 1].setIsbn(FieldByName('isbn').AsString);
-        resultVar[length(resultVar) - 1].setCondition(
-          FieldByName('condition').AsInteger);
+
+        if not (FieldByName('condition').IsNull) then
+          resultVar[length(resultVar) - 1].setCondition(
+            FieldByName('condition').AsInteger);
+
         if returnOne then
           exit;
         Next;
@@ -840,7 +843,10 @@ procedure TDBConnection.setBooktypeFields(var resultVar: ArrayOfBookTypes;
         resultVar[length(resultVar) - 1].setIsbn(FieldByName('isbn').AsString);
         resultVar[length(resultVar) - 1].setTitle(FieldByName('title').AsString);
         resultVar[length(resultVar) - 1].setSubject(FieldByName('subject').AsString);
-        resultVar[length(resultVar) - 1].setStorage(FieldByName('storage').AsInteger);
+
+        if not (FieldByName('storage').IsNull) then
+          resultVar[length(resultVar) - 1].setStorage(FieldByName('storage').AsInteger);
+
         if returnOne then
           exit;
         Next;

diff --git a/lazarus/book.pas b/lazarus/book.pas
@@ -5,7 +5,7 @@
 interface
 
 uses
-  Classes, SysUtils;
+  Classes, SysUtils, DBConstants;
 
 type
   TBook = class
@@ -38,7 +38,7 @@   TBook = class
 
     // Sets a new book condition
     // parameter: newCondition
-    // result: TRUE on success, so if newIsbn has 1 character, is <=5 and not NULL
+    // result: TRUE on success, so if newIsbn has 1 character, is <=5 or is =SQLNull
     function setCondition(newCondition: cardinal): boolean;
 
     constructor Create;
@@ -97,7 +97,7 @@ function TBook.getCondition(): cardinal;
 function TBook.setCondition(newCondition: cardinal): boolean;
 begin
   Result := False;
-  if (newCondition <= 6) then
+  if (newCondition = SQLNull ) or (newCondition <= 6) then
   begin
     self.condition := newCondition;
     Result := True;
@@ -106,9 +106,9 @@ function TBook.setCondition(newCondition: cardinal): boolean;
 
 constructor TBook.Create;
 begin
-  self.id := -1;
+  self.id := SQLNull;
   self.isbn := '';
-  self.condition := 0;
+  self.condition := SQLNull;
 end;
 
 end.
diff --git a/lazarus/booktype.pas b/lazarus/booktype.pas
@@ -5,7 +5,7 @@
 interface
 
 uses
-  Classes, SysUtils;
+  Classes, SysUtils, DBConstants;
 
 type
   TBooktype = class
@@ -48,7 +48,7 @@   TBooktype = class
 
     // Sets a new book storage
     // parameter: newStorage
-    // result: TRUE on success, so if newStorage <= (2^63)-1)
+    // result: TRUE on success, so if newStorage <= (2^63)-1) or =SQLNull
     function setStorage(newStorage: integer): boolean;
 
     constructor Create;
@@ -119,7 +119,7 @@ function TBooktype.getStorage(): integer;
 function TBooktype.setStorage(newStorage: integer): boolean;
 begin
   Result := False;
-  if (newStorage <> NULL) then
+  if (newStorage = SQLNull) or (newStorage <> NULL) then
   begin
     self.storage := newStorage;
     Result := True;
@@ -131,7 +131,7 @@ constructor TBooktype.Create;
   self.isbn := '';
   self.title := '';
   self.subject := '';
-  self.storage := 0;
+  self.storage := SQLNull;
 end;
 
 end.
diff --git a/lazarus/rental.pas b/lazarus/rental.pas
@@ -49,7 +49,7 @@   TRental = class
 
     // Sets a new book return datetime in seconds
     // parameter: newReturnDate
-    // result: TRUE on success, so if newReturnDate >= 0 and not NULL
+    // result: TRUE on success, so if newReturnDate >= 0 or =SQLNull
     function setReturnDate(newReturnDate: TDate): boolean;
 
     // Returns the book rental datetime in seconds
@@ -119,7 +119,7 @@ function TRental.getReturnDate(): TDate;
 function TRental.setReturnDate(newReturnDate: TDate): boolean;
 begin
   Result := False;
-  if (newReturnDate <> NuLL) and (newReturnDate >= 0) then
+  if (newReturnDate = SQLNull) or (newReturnDate <> NuLL) and (newReturnDate >= 0) then
   begin
     self.return_date := newReturnDate;
     Result := True;
@@ -143,9 +143,9 @@ function TRental.setRentalDate(newRentalDate: TDate): boolean;
 
 constructor TRental.Create;
 begin
-  self.id := -1;
-  self.book_id := -1;
-  self.student_id := -1;
+  self.id := SQLNull;
+  self.book_id := SQLNull;
+  self.student_id := SQLNull;
   self.return_date := SQLNull;
   self.rental_date := SQLNull;
 end;

diff --git a/lazarus/student.pas b/lazarus/student.pas
@@ -168,7 +168,7 @@ function TStudent.setLDAPUser(newLDAPUser: string): boolean;
 
 constructor TStudent.Create;
 begin
-  self.id := -1;
+  self.id := SQLNull;
   self.last_name := '';
   self.first_name := '';
   self.class_name := '';