--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java	Thu Aug 04 10:58:00 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java	Thu Aug 04 15:05:02 2011 +0000
@@ -72,6 +72,7 @@
         Map<String, Object> parameters
     ) {
         parameters.put("current-state-id", artifact.getCurrentStateId());
+        parameters.put("artifact-id",      artifact.identifier());
 
         for (StateData sd: artifact.getAllData()) {
             Object value = sd.getValue();
@@ -139,9 +140,6 @@
                     new ArrayList<Builder.NamedConnection>(2);
 
                 if (userId != null) { // system and user templates
-                    connections.add(new Builder.NamedConnection(
-                        Builder.CONNECTION_USER, systemConnection));
-
                     // get connection to datacage db
                     DataSource dataSource = DBConfig
                         .getInstance()
@@ -151,7 +149,10 @@
                     Connection userConnection = dataSource.getConnection();
                     try {
                         connections.add(new Builder.NamedConnection(
-                            Builder.CONNECTION_SYSTEM, userConnection, false));
+                            Builder.CONNECTION_USER, userConnection));
+
+                        connections.add(new Builder.NamedConnection(
+                            Builder.CONNECTION_SYSTEM, systemConnection, false));
 
                         userBuilder.build(connections, result, parameters);
                     }