← Back to team overview

slub.team team mailing list archive

[Merge] lp:~slub.team/goobi-production/bug-1065909 into lp:goobi-production

 

Ralf Claussnitzer has proposed merging lp:~slub.team/goobi-production/bug-1065909 into lp:goobi-production.

Requested reviews:
  Matthias Ronge (matthias-ronge)
  Henning Gerhardt (henning-gerhardt)
Related bugs:
  Bug #1065909 in Goobi.Production: "hibernate error in the "My Tasks" tab"
  https://bugs.launchpad.net/goobi-production/+bug/1065909

For more details, see:
https://code.launchpad.net/~slub.team/goobi-production/bug-1065909/+merge/130760
-- 
https://code.launchpad.net/~slub.team/goobi-production/bug-1065909/+merge/130760
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.
=== modified file 'src-dubious/dubious/sub/goobi/helper/Page.java'
--- src-dubious/dubious/sub/goobi/helper/Page.java	2012-09-07 08:38:28 +0000
+++ src-dubious/dubious/sub/goobi/helper/Page.java	2012-10-22 09:24:21 +0000
@@ -128,6 +128,7 @@
 			results = criteria.setFirstResult(page * pageSize).setMaxResults(pageSize + 1).list();
 			return hasNextPage() ? results.subList(0, pageSize) : results;
 		} catch (HibernateException e) {
+			logger.error(e);
 			return results;
 		}
 	}

=== modified file 'src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java'
--- src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java	2012-09-07 10:03:24 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java	2012-10-22 09:24:21 +0000
@@ -643,6 +643,8 @@
 		if (conjProcesses != null || flagSteps) {
 			if (flagProcesses) {
 				crit.add(conjProcesses);
+			} else {
+				crit.createCriteria("prozess", "proc");
 			}
 		}