Merge lp:~zeutschel/goobi-production/bug-983789 into lp:goobi-production/1.7

[Matthias Ronge]

This bug fix only removes deleted users from the statistics count. You said:
----
Certainly, deleted users should not be taken into account.
----
Therefore, this fix should be merged.

[Ralf Claussnitzer (ralf-claussnitzer-deactivatedaccount)]

What's the specification for this fix?
See https://bugs.launchpad.net/goobi-production/+bug/983789/comments/1

review: Needs Information

[Ralf Claussnitzer (ralf-claussnitzer-deactivatedaccount)]

Sorry if I got you wrong on this:

>>>>
By now, inactive users are being counted. I don’t know the reasons why accounts are being set to inactive − or if that feature is used at all. I am in favour to keep this behaviour while nobody complains.
<<<

By "this behaviour" you mean the behaviour introduced by your bug fix?

[Matthias Ronge (matthias-ronge)]

Yes, without the fix, deleted users are counted, too.

[Ralf Claussnitzer (ralf-claussnitzer-deactivatedaccount)]

review: Approve

=== modified file 'src/de/sub/goobi/forms/StatistikForm.java'
--- src/de/sub/goobi/forms/StatistikForm.java	2012-02-22 07:43:02 +0000
+++ src/de/sub/goobi/forms/StatistikForm.java	2012-04-26 11:20:02 +0000
@@ -52,7 +52,7 @@
 	
 
 	/**
-	 * @return Anzahl aller Literatureintr�ge
+	 * @return Anzahl aller Literatureinträge
 	 * @throws DAOException
 	 */
 	public Integer getAnzahlLiteraturGesamt() {
@@ -62,12 +62,19 @@
 	
 
 	/**
-	 * @return Anzahl der Benutzer
+	 * The function getAnzahlBenutzer() counts the number of user accounts in
+	 * the goobi.production environment. Since user accounts are not hard
+	 * deleted from the database when the delete button is pressed a where
+	 * clause is used in the SQL statement to exclude the deleted accounts from
+	 * the sum.
+	 * 
+	 * @return the count of valid user accounts
 	 * @throws DAOException
-	 */
+	 *             if the current session can't be retrieved or an exception is
+	 *             thrown while performing the rollback.	 */
 	public Long getAnzahlBenutzer() {
 		try {
-			return new BenutzerDAO().count("from Benutzer");
+			return new BenutzerDAO().count("from Benutzer where isVisible is null");
 		} catch (DAOException e) {
 
 			Helper.setFehlerMeldung("fehlerBeimEinlesen", e.getMessage());