From: zapata <zapata>
Date: Tue, 17 Dec 2002 19:20:31 +0000 (+0000)
Subject: login languages made configurable
X-Git-Tag: BEFORE_MERGE_1_1~396
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=a43304491d4492208e37c53449497a8a05731899;p=mir.git

login languages made configurable
---

diff --git a/source/Mir.java b/source/Mir.java
index afb33512..595696f7 100755
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -1,410 +1,447 @@
-/*
- * Copyright (C) 2001, 2002 The Mir-coders group
- *
- * This file is part of Mir.
- *
- * Mir is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Mir is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mir; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
- */
-
-import freemarker.template.SimpleList;
-import freemarker.template.SimpleHash;
-import freemarker.template.SimpleScalar;
-import mir.misc.HTMLParseException;
-import mir.misc.HTMLTemplateProcessor;
-import mir.misc.MirConfig;
-import mir.misc.StringUtil;
-import mir.servlet.*;
-import mir.producer.*;
-
-import mircoders.global.*;
-import mircoders.localizer.*;
-import mircoders.entity.EntityUsers;
-import mircoders.module.ModuleMessage;
-import mircoders.module.ModuleUsers;
-import mircoders.storage.DatabaseArticleType;
-import mircoders.storage.DatabaseMessages;
-import mircoders.storage.DatabaseUsers;
-
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.Method;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.*;
-
-import mir.log.Log;
-
-/**
- * Mir.java - main servlet, that dispatches to servletmodules
- *
- * @author $Author: mh $
- * @version $Id: Mir.java,v 1.23 2002/12/06 08:12:42 mh Exp $
- *
- */
-
-
-public class Mir extends AbstractServlet {
-
-    private static ModuleUsers usersModule = null;
-    private static ModuleMessage messageModule = null;
-    private final static HashMap servletModuleInstanceHash = new HashMap();
-
-    public HttpSession session;
-
-    public void doGet(HttpServletRequest req, HttpServletResponse res)
-            throws ServletException, IOException {
-        doPost(req, res);
-    }
-
-    public void doPost(HttpServletRequest req, HttpServletResponse res)
-            throws ServletException, IOException, UnavailableException {
-
-
-
-        long startTime = System.currentTimeMillis();
-        long sessionConnectTime = 0;
-        EntityUsers userEntity;
-        String http = "";
-
-        if (getServletContext().getAttribute("mir.confed") == null) {
-            getConfig(req);
-        }
-
-        MirConfig.setServletName(getServletName());
-
-        //*** test
-       // Log.info(this, "blalalala");
-
-        session = req.getSession(true);
-        userEntity = (EntityUsers) session.getAttribute("login.uid");
-
-        if (req.getServerPort() == 443) http = "https"; else http = "http";
-
-        //nothing in Mir can or should be cached as it's all dynamic...
-        //
-        //this needs to be done here and not per page (via meta tags) as some
-        //browsers have problems w/ it per-page -mh
-        res.setHeader("Pragma", "no-cache");
-        res.setDateHeader("Expires", 0);
-        res.setHeader("Cache-Control", "no-cache");
-        res.setContentType("text/html; charset="
-                            +MirConfig.getProp("Mir.DefaultEncoding"));
-        String moduleName = req.getParameter("module");
-
-        checkLanguage(session, req);
-
-        /** @todo for cleanup and readability this should be moved to
-         *  method loginIfNecessary() */
-
-        if (moduleName!=null && moduleName.equals("direct")) {
-          //...
-        }
-
-        // Authentifizierung
-        if ((moduleName != null && moduleName.equals("login")) || (userEntity==null)) {
-            String user = req.getParameter("login");
-            String passwd = req.getParameter("password");
-            theLog.printDebugInfo("--login: evaluating for user: " + user);
-            userEntity = allowedUser(user, passwd);
-            if (userEntity == null) {
-                // login failed: redirecting to login
-                theLog.printWarning("--login: failed!");
-                _sendLoginPage(res, req, res.getWriter());
-                return;
-            }
-            else if (moduleName!=null && moduleName.equals("login")) {
-                // login successful
-
-                theLog.printInfo("--login: successful! setting uid: " + userEntity.getId());
-                session.setAttribute("login.uid", userEntity);
-                theLog.printDebugInfo("--login: trying to retrieve login.target");
-                String target = (String) session.getAttribute("login.target");
-
-                if (target != null) {
-                    theLog.printDebugInfo("Redirect: " + target);
-                    int serverPort = req.getServerPort();
-                    String redirect = "";
-                    String redirectString = "";
-
-
-                    if (serverPort == 80) {
-                        redirect = res.encodeURL(http + "://" + req.getServerName() + target);
-                        redirectString = "<html><head><meta http-equiv=refresh content=\"1;URL="
-                                + redirect
-                                + "\"></head><body>going <a href=\"" + redirect + "\">Mir</a></body></html>";
-                    }
-                    else {
-                        redirect = res.encodeURL(http + "://" + req.getServerName() + ":" + req.getServerPort() + target);
-                        redirectString = "<html><head><meta http-equiv=refresh content=\"1;URL="
-                                + redirect
-                                + "\"></head><body>going <a href=\"" + redirect + "\">Mir</a></body></html>";
-                    }
-                    res.getWriter().println(redirectString);
-
-
-                    //res.sendRedirect(redirect);
-
-                }
-                else {
-                    // redirecting to default target
-                    theLog.printDebugInfo("--login: no target - redirecting to default");
-                    _sendStartPage(res, req, res.getWriter(), userEntity);
-                }
-                return;
-            } // if login succesful
-        } // if login
-
-        if (moduleName != null && moduleName.equals("logout")) {
-            theLog.printDebugInfo("--logout");
-            session.invalidate();
-
-            //session = req.getSession(true);
-            //checkLanguage(session, req);
-            _sendLoginPage(res, req, res.getWriter());
-            return;
-        }
-
-        // Check if authed!
-        if (userEntity == null) {
-            // redirect to loginpage
-            String redirectString = req.getRequestURI();
-            String queryString = req.getQueryString();
-            if (queryString != null && !queryString.equals("")) {
-                redirectString += "?" + req.getQueryString();
-                theLog.printDebugInfo("STORING: " + redirectString);
-                session.setAttribute("login.target", redirectString);
-            }
-            _sendLoginPage(res, req, res.getWriter());
-            return;
-        }
-
-        // If no module is specified goto standard startpage
-        if (moduleName == null || moduleName.equals("")) {
-            theLog.printDebugInfo("no module: redirect to standardpage");
-            _sendStartPage(res, req, res.getWriter(), userEntity);
-            return;
-        }
-        // end of auth
-
-        // From now on regular dispatching...
-        try {
-            // get servletmodule by parameter and continue with dispacher
-            ServletModule smod = getServletModuleForName(moduleName);
-            ServletModuleDispatch.dispatch(smod, req, res);
-        }
-        catch (ServletModuleException e) {
-            handleError(req, res, res.getWriter(),
-                        "ServletException in Module " + moduleName + " -- " + e.getMessage());
-        }
-        catch (ServletModuleUserException e) {
-            handleUserError(req, res, res.getWriter(), e.getMessage());
-        }
-
-        // timing...
-        sessionConnectTime = System.currentTimeMillis() - startTime;
-        theLog.printInfo("EXECTIME (" + moduleName + "): " + sessionConnectTime + " ms");
-    }
-
-
-    /**
-     *  Private method getServletModuleForName returns ServletModule
-     *  from Cache
-     *
-     * @return ServletModule
-     *
-     */
-    private static ServletModule getServletModuleForName(String moduleName)
-            throws ServletModuleException {
-
-        // Instance in Map ?
-        if (!servletModuleInstanceHash.containsKey(moduleName)) {
-            // was not found in hash...
-            try {
-                Class theServletModuleClass = null;
-                try {
-                    // first we try to get ServletModule from stern.che3.servlet
-                    theServletModuleClass = Class.forName("mircoders.servlet.ServletModule" + moduleName);
-                }
-                catch (ClassNotFoundException e) {
-                    // on failure, we try to get it from lib-layer
-                    theServletModuleClass = Class.forName("mir.servlet.ServletModule" + moduleName);
-                }
-                Method m = theServletModuleClass.getMethod("getInstance", null);
-                ServletModule smod = (ServletModule) m.invoke(null, null);
-                // we put it into map for further reference
-                servletModuleInstanceHash.put(moduleName, smod);
-                return smod;
-            }
-            catch (Exception e) {
-                throw new ServletModuleException("*** error resolving classname for " +
-                                                 moduleName + " -- " + e.getMessage());
-            }
-        }
-        else
-            return (ServletModule) servletModuleInstanceHash.get(moduleName);
-    }
-
-
-    private void handleError(HttpServletRequest req, HttpServletResponse res,
-                             PrintWriter out, String errorString) {
-
-        try {
-            theLog.printError(errorString);
-            SimpleHash modelRoot = new SimpleHash();
-            modelRoot.put("errorstring", new SimpleScalar(errorString));
-            modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
-            HTMLTemplateProcessor.process(res, MirConfig.getProp("Mir.ErrorTemplate"), modelRoot, out, getLocale(req));
-            out.close();
-        }
-        catch (Exception e) {
-          e.printStackTrace(System.out);
-          System.err.println("Error in ErrorTemplate: " + e.getMessage());
-        }
-    }
-
-    private void handleUserError(HttpServletRequest req, HttpServletResponse res,
-                                 PrintWriter out, String errorString) {
-        try {
-            theLog.printError(errorString);
-            SimpleHash modelRoot = new SimpleHash();
-            modelRoot.put("errorstring", new SimpleScalar(errorString));
-            modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
-            HTMLTemplateProcessor.process(res, MirConfig.getProp("Mir.UserErrorTemplate"),
-                                          modelRoot, out, getLocale(req));
-            out.close();
-        }
-        catch (Exception e) {
-            System.err.println("Error in UserErrorTemplate");
-        }
-
-    }
-
-    /**
-     *  evaluate login for user / password
-     */
-    protected EntityUsers allowedUser(String user, String password) {
-        try {
-            if (usersModule == null) usersModule = new ModuleUsers(DatabaseUsers.getInstance());
-            return usersModule.getUserForLogin(user, password);
-        }
-        catch (Exception e) {
-            theLog.printDebugInfo(e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    // Redirect-methods
-    private void _sendLoginPage(HttpServletResponse res, HttpServletRequest req, PrintWriter out) {
-        String loginTemplate = MirConfig.getProp("Mir.LoginTemplate");//"login.template";
-        //  theLog.printDebugInfo("login template: "+loginTemplate);
-        String sessionUrl = res.encodeURL("");
-        //session = req.getSession(true);
-        try {
-            //theLog.printDebugInfo("login: "+lang);
-            //if(lang==null){
-            //  lang=getAcceptLanguage(req);
-            //}
-            SimpleHash mergeData = new SimpleHash();
-            mergeData.put("session", sessionUrl);
-            HTMLTemplateProcessor.process(res, loginTemplate, mergeData, out, getLocale(req));
-        }
-        catch (HTMLParseException e) {
-            handleError(req, res, out, "Error in logintemplate.");
-        }
-    }
-
-    private void _sendStartPage(HttpServletResponse res, HttpServletRequest req, PrintWriter out, EntityUsers userEntity) {
-        String startTemplate = "templates/admin/start_admin.template";
-        String sessionUrl = res.encodeURL("");
-        try {
-            // merge with logged in user and messages
-            SimpleHash mergeData = new SimpleHash();
-            mergeData.put("session", sessionUrl);
-            mergeData.put("login_user", userEntity);
-            if (messageModule == null) messageModule = new ModuleMessage(DatabaseMessages.getInstance());
-            mergeData.put("messages", messageModule.getByWhereClause(null, "webdb_create desc", 0, 10));
-
-            mergeData.put("articletypes", DatabaseArticleType.getInstance().selectByWhereClause("", "id", 0, 20));
-
-/*
-            SimpleList producersData = new SimpleList();
-            Iterator i = MirGlobal.localizer().producers().factories().entrySet().iterator();
-            while (i.hasNext()) {
-              Map.Entry entry = (Map.Entry) i.next();
-
-              SimpleList producerVerbs = new SimpleList();
-              Iterator j = ((ProducerFactory) entry.getValue()).verbs();
-              while (j.hasNext()) {
-                producerVerbs.add((String) j.next());
-              }
-
-              SimpleHash producerData = new SimpleHash();
-              producerData.put("key", (String) entry.getKey());
-              producerData.put("verbs", producerVerbs);
-
-              producersData.add(producerData);
-            }
-            mergeData.put("producers", producersData);
- */
-
-
-            HTMLTemplateProcessor.process(res, startTemplate, mergeData, out, getLocale(req));
-        }
-        catch (Exception e) {
-            e.printStackTrace(System.out);
-            handleError(req, res, out, "error while trying to send startpage. " + e.getMessage());
-        }
-    }
-
-    public String getServletInfo() {
-        return "Mir "+MirConfig.getProp("Mir.Version");
-    }
-
-    private void checkLanguage(HttpSession session, HttpServletRequest req) {
-
-        // a lang parameter always sets the language
-        String lang = req.getParameter("lang");
-        if (lang != null) {
-            theLog.printInfo("selected language "+lang+" overrides accept-language");
-            setLanguage(session, lang);
-            setLocale(session, new Locale(lang, ""));
-        }
-        // otherwise store language from accept header in session
-        else if (session.getAttribute("Language") == null) {
-            theLog.printInfo("accept-language is "+req.getLocale().getLanguage());
-            setLanguage(session, req.getLocale().getLanguage());
-            setLocale(session, req.getLocale());
-        }
-    }
-}
-
+/*
+ * Copyright (C) 2001, 2002 The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.Method;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.*;
+
+import javax.servlet.ServletException;
+import javax.servlet.UnavailableException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import freemarker.template.*;
+
+import org.apache.struts.util.MessageResources;
+
+import mir.misc.*;
+import mir.servlet.*;
+import mir.util.*;
+import mir.generator.*;
+//import mir.log.Log;
+
+import mircoders.global.*;
+import mircoders.localizer.*;
+import mircoders.entity.EntityUsers;
+import mircoders.module.ModuleMessage;
+import mircoders.module.ModuleUsers;
+import mircoders.storage.DatabaseArticleType;
+import mircoders.storage.DatabaseMessages;
+import mircoders.storage.DatabaseUsers;
+
+/**
+ * Mir.java - main servlet, that dispatches to servletmodules
+ *
+ * @author $Author: zapata $
+ * @version $Id: Mir.java,v 1.24 2002/12/17 19:20:31 zapata Exp $
+ *
+ */
+
+public class Mir extends AbstractServlet {
+
+  private static ModuleUsers usersModule = null;
+  private static ModuleMessage messageModule = null;
+  private final static HashMap servletModuleInstanceHash = new HashMap();
+
+  private static List loginLanguages = null;
+
+  public HttpSession session;
+
+  public void doGet(HttpServletRequest req, HttpServletResponse res) throws
+      ServletException, IOException {
+    doPost(req, res);
+  }
+
+  protected TemplateModel getLoginLanguages() throws ServletException {
+    synchronized (Mir.class) {
+      try {
+
+        if (loginLanguages == null) {
+          MessageResources messageResources2 = MessageResources.
+              getMessageResources("bundles.admin");
+          MessageResources messageResources = MessageResources.
+              getMessageResources("bundles.adminlocal");
+          List languages = StringRoutines.splitString(MirGlobal.
+              getConfigPropertyWithDefault("Mir.Login.Languages", "en"), ";");
+
+          loginLanguages = new Vector();
+          Iterator i = languages.iterator();
+
+          while (i.hasNext()) {
+            String code = (String) i.next();
+            Locale locale = new Locale(code, "");
+            String name = messageResources.getMessage(locale, "languagename");
+            if (name == null)
+              name = messageResources2.getMessage(locale, "languagename");
+            if (name == null)
+              name = code;
+
+            Map record = new HashMap();
+            record.put("name", name);
+            record.put("code", code);
+            loginLanguages.add(record);
+          }
+        }
+
+        return FreemarkerGenerator.makeAdapter(loginLanguages);
+      }
+      catch (Throwable t) {
+        throw new ServletException(t.getMessage());
+      }
+    }
+  }
+
+  public void doPost(HttpServletRequest req, HttpServletResponse res) throws
+      ServletException, IOException, UnavailableException {
+
+    long startTime = System.currentTimeMillis();
+    long sessionConnectTime = 0;
+    EntityUsers userEntity;
+    String http = "";
+
+    if (getServletContext().getAttribute("mir.confed") == null) {
+      getConfig(req);
+    }
+
+    MirConfig.setServletName(getServletName());
+
+    //*** test
+     // Log.info(this, "blalalala");
+
+    session = req.getSession(true);
+    userEntity = (EntityUsers) session.getAttribute("login.uid");
+
+    if (req.getServerPort() == 443)
+      http = "https";
+    else
+      http = "http";
+
+    //nothing in Mir can or should be cached as it's all dynamic...
+    //
+    //this needs to be done here and not per page (via meta tags) as some
+    //browsers have problems w/ it per-page -mh
+    res.setHeader("Pragma", "no-cache");
+    res.setDateHeader("Expires", 0);
+    res.setHeader("Cache-Control", "no-cache");
+    res.setContentType("text/html; charset=" + MirConfig.getProp("Mir.DefaultEncoding"));
+
+    String moduleName = req.getParameter("module");
+    checkLanguage(session, req);
+
+    /** @todo for cleanup and readability this should be moved to
+     *  method loginIfNecessary() */
+
+    if (moduleName != null && moduleName.equals("direct")) {
+      //...
+    }
+
+    // Authentication
+    if ( (moduleName != null && moduleName.equals("login")) || (userEntity == null)) {
+      String user = req.getParameter("login");
+      String passwd = req.getParameter("password");
+      theLog.printDebugInfo("--login: evaluating for user: " + user);
+      userEntity = allowedUser(user, passwd);
+      if (userEntity == null) {
+        // login failed: redirecting to login
+        theLog.printWarning("--login: failed!");
+        _sendLoginPage(res, req, res.getWriter());
+        return;
+      }
+      else if (moduleName != null && moduleName.equals("login")) {
+        // login successful
+
+        theLog.printInfo("--login: successful! setting uid: " +
+                         userEntity.getId());
+        session.setAttribute("login.uid", userEntity);
+        theLog.printDebugInfo("--login: trying to retrieve login.target");
+        String target = (String) session.getAttribute("login.target");
+
+        if (target != null) {
+          theLog.printDebugInfo("Redirect: " + target);
+          int serverPort = req.getServerPort();
+          String redirect = "";
+          String redirectString = "";
+
+          if (serverPort == 80) {
+            redirect = res.encodeURL(http + "://" + req.getServerName() +
+                                     target);
+            redirectString =
+                "<html><head><meta http-equiv=refresh content=\"1;URL="
+                + redirect
+                + "\"></head><body>going <a href=\"" + redirect +
+                "\">Mir</a></body></html>";
+          }
+          else {
+            redirect = res.encodeURL(http + "://" + req.getServerName() + ":" +
+                                     req.getServerPort() + target);
+            redirectString =
+                "<html><head><meta http-equiv=refresh content=\"1;URL="
+                + redirect
+                + "\"></head><body>going <a href=\"" + redirect +
+                "\">Mir</a></body></html>";
+          }
+          res.getWriter().println(redirectString);
+
+          //res.sendRedirect(redirect);
+
+        }
+        else {
+          // redirecting to default target
+          theLog.printDebugInfo("--login: no target - redirecting to default");
+          _sendStartPage(res, req, res.getWriter(), userEntity);
+        }
+        return;
+      } // if login succesful
+    } // if login
+
+    if (moduleName != null && moduleName.equals("logout")) {
+      theLog.printDebugInfo("--logout");
+      session.invalidate();
+
+      //session = req.getSession(true);
+      //checkLanguage(session, req);
+      _sendLoginPage(res, req, res.getWriter());
+      return;
+    }
+
+    // Check if authed!
+    if (userEntity == null) {
+      // redirect to loginpage
+      String redirectString = req.getRequestURI();
+      String queryString = req.getQueryString();
+      if (queryString != null && !queryString.equals("")) {
+        redirectString += "?" + req.getQueryString();
+        theLog.printDebugInfo("STORING: " + redirectString);
+        session.setAttribute("login.target", redirectString);
+      }
+      _sendLoginPage(res, req, res.getWriter());
+      return;
+    }
+
+    // If no module is specified goto standard startpage
+    if (moduleName == null || moduleName.equals("")) {
+      theLog.printDebugInfo("no module: redirect to standardpage");
+      _sendStartPage(res, req, res.getWriter(), userEntity);
+      return;
+    }
+    // end of auth
+
+    // From now on regular dispatching...
+    try {
+      // get servletmodule by parameter and continue with dispacher
+      ServletModule smod = getServletModuleForName(moduleName);
+      ServletModuleDispatch.dispatch(smod, req, res);
+    }
+    catch (ServletModuleException e) {
+      handleError(req, res, res.getWriter(),
+                  "ServletException in Module " + moduleName + " -- " +
+                  e.getMessage());
+    }
+    catch (ServletModuleUserException e) {
+      handleUserError(req, res, res.getWriter(), e.getMessage());
+    }
+
+    // timing...
+    sessionConnectTime = System.currentTimeMillis() - startTime;
+    theLog.printInfo("EXECTIME (" + moduleName + "): " + sessionConnectTime +
+                     " ms");
+  }
+
+  /**
+   *  Private method getServletModuleForName returns ServletModule
+   *  from Cache
+   *
+   * @param moduleName
+   * @return ServletModule
+   *
+   */
+  private static ServletModule getServletModuleForName(String moduleName) throws
+      ServletModuleException {
+
+    // Instance in Map ?
+    if (!servletModuleInstanceHash.containsKey(moduleName)) {
+      // was not found in hash...
+      try {
+        Class theServletModuleClass = null;
+        try {
+          // first we try to get ServletModule from stern.che3.servlet
+          theServletModuleClass = Class.forName(
+              "mircoders.servlet.ServletModule" + moduleName);
+        }
+        catch (ClassNotFoundException e) {
+          // on failure, we try to get it from lib-layer
+          theServletModuleClass = Class.forName("mir.servlet.ServletModule" +
+                                                moduleName);
+        }
+        Method m = theServletModuleClass.getMethod("getInstance", null);
+        ServletModule smod = (ServletModule) m.invoke(null, null);
+        // we put it into map for further reference
+        servletModuleInstanceHash.put(moduleName, smod);
+        return smod;
+      }
+      catch (Exception e) {
+        throw new ServletModuleException("*** error resolving classname for " +
+                                         moduleName + " -- " + e.getMessage());
+      }
+    }
+    else
+      return (ServletModule) servletModuleInstanceHash.get(moduleName);
+  }
+
+  private void handleError(HttpServletRequest req, HttpServletResponse res,
+                           PrintWriter out, String errorString) {
+
+    try {
+      theLog.printError(errorString);
+      SimpleHash modelRoot = new SimpleHash();
+      modelRoot.put("errorstring", new SimpleScalar(errorString));
+      modelRoot.put("date",
+                    new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
+      HTMLTemplateProcessor.process(res, MirConfig.getProp("Mir.ErrorTemplate"),
+                                    modelRoot, out, getLocale(req));
+      out.close();
+    }
+    catch (Exception e) {
+      e.printStackTrace(System.out);
+      System.err.println("Error in ErrorTemplate: " + e.getMessage());
+    }
+  }
+
+  private void handleUserError(HttpServletRequest req, HttpServletResponse res,
+                               PrintWriter out, String errorString) {
+    try {
+      theLog.printError(errorString);
+      SimpleHash modelRoot = new SimpleHash();
+      modelRoot.put("errorstring", new SimpleScalar(errorString));
+      modelRoot.put("date",
+                    new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
+      HTMLTemplateProcessor.process(res,
+                                    MirConfig.getProp("Mir.UserErrorTemplate"),
+                                    modelRoot, out, getLocale(req));
+      out.close();
+    }
+    catch (Exception e) {
+      System.err.println("Error in UserErrorTemplate");
+    }
+
+  }
+
+  /**
+   *  evaluate login for user / password
+   */
+  protected EntityUsers allowedUser(String user, String password) {
+    try {
+      if (usersModule == null)
+        usersModule = new ModuleUsers(DatabaseUsers.getInstance());
+      return usersModule.getUserForLogin(user, password);
+    }
+    catch (Exception e) {
+      theLog.printDebugInfo(e.getMessage());
+      e.printStackTrace();
+      return null;
+    }
+  }
+
+  // Redirect-methods
+  private void _sendLoginPage(HttpServletResponse res, HttpServletRequest req,
+                              PrintWriter out) {
+    String loginTemplate = MirConfig.getProp("Mir.LoginTemplate");
+    String sessionUrl = res.encodeURL("");
+
+    try {
+      SimpleHash mergeData = new SimpleHash();
+      SimpleList languages = new SimpleList();
+
+      mergeData.put("session", sessionUrl);
+
+      mergeData.put("defaultlanguage", MirGlobal.getConfigPropertyWithDefault("Mir.Login.DefaultLanguage", "en"));
+      mergeData.put("languages", getLoginLanguages());
+
+      HTMLTemplateProcessor.process(res, loginTemplate, mergeData, out, getLocale(req));
+    }
+    catch (Throwable e) {
+      handleError(req, res, out, "Error sending login page: " + e.getMessage());
+    }
+  }
+
+  private void _sendStartPage(HttpServletResponse res, HttpServletRequest req,
+                              PrintWriter out, EntityUsers userEntity) {
+    String startTemplate = "templates/admin/start_admin.template";
+    String sessionUrl = res.encodeURL("");
+
+    try {
+      // merge with logged in user and messages
+      SimpleHash mergeData = new SimpleHash();
+      mergeData.put("session", sessionUrl);
+      mergeData.put("login_user", userEntity);
+      if (messageModule == null)
+        messageModule = new ModuleMessage(DatabaseMessages.getInstance());
+      mergeData.put("messages",
+                    messageModule.getByWhereClause(null, "webdb_create desc", 0,
+          10));
+
+      mergeData.put("articletypes",
+                    DatabaseArticleType.getInstance().
+                    selectByWhereClause("", "id", 0, 20));
+
+      HTMLTemplateProcessor.process(res, startTemplate, mergeData, out, getLocale(req));
+    }
+    catch (Exception e) {
+      e.printStackTrace(System.out);
+      handleError(req, res, out, "error while trying to send startpage. " + e.getMessage());
+    }
+  }
+
+  public String getServletInfo() {
+    return "Mir " + MirConfig.getProp("Mir.Version");
+  }
+
+  private void checkLanguage(HttpSession session, HttpServletRequest req) {
+    // a lang parameter always sets the language
+    String lang = req.getParameter("language");
+    if (lang != null) {
+      theLog.printInfo("selected language " + lang + " overrides accept-language");
+      setLanguage(session, lang);
+      setLocale(session, new Locale(lang, ""));
+    }
+    // otherwise store language from accept header in session
+    else if (session.getAttribute("Language") == null) {
+      theLog.printInfo("accept-language is " + req.getLocale().getLanguage());
+      setLanguage(session, req.getLocale().getLanguage());
+      setLocale(session, req.getLocale());
+    }
+  }
+}
diff --git a/source/mir/entity/Entity.java b/source/mir/entity/Entity.java
index c633b67c..b615f4f8 100755
--- a/source/mir/entity/Entity.java
+++ b/source/mir/entity/Entity.java
@@ -50,7 +50,7 @@ import mir.misc.*;
  * Base Class of Entities
  * Interfacing TemplateHashModel and TemplateModelRoot to be freemarker compliant
  *
- * @version $Id: Entity.java,v 1.11 2002/12/02 12:33:22 zapata Exp $
+ * @version $Id: Entity.java,v 1.12 2002/12/17 19:20:31 zapata Exp $
  * @author rk
  *
  */
@@ -284,6 +284,7 @@ public class Entity implements TemplateHashModel, TemplateModelRoot
 
   protected void throwStorageObjectException (Exception e, String wo) throws StorageObjectException {
     theLog.printError( e.toString() + " Funktion: "+ wo);
+    e.printStackTrace(System.out);
     throw  new StorageObjectException("Storage Object Exception in entity" +e.toString());
   }
 
diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java
index fb3b612a..779a2474 100755
--- a/source/mir/misc/HTMLTemplateProcessor.java
+++ b/source/mir/misc/HTMLTemplateProcessor.java
@@ -131,6 +131,7 @@ public final class HTMLTemplateProcessor {
    * @param out
    * @exception HTMLParseException
    */
+
   public static void process(HttpServletResponse res, String templateFilename,
                              EntityList entList, String additionalModelName,
                              TemplateModelRoot additionalModel, PrintWriter out,
@@ -157,6 +158,7 @@ public final class HTMLTemplateProcessor {
     }
   }
 
+
   /**
    * Gibt Template <code>templateFilename</code> an den PrintWriter
    * <code>out</code>
diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index a40af7b9..828357cf 100755
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -1,1294 +1,1311 @@
-/*
- * Copyright (C) 2001, 2002  The Mir-coders group
- *
- * This file is part of Mir.
- *
- * Mir is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Mir is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mir; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
- */
-
-package mir.storage;
-
-import  java.sql.*;
-import  java.lang.*;
-import  java.io.*;
-import  java.util.*;
-import  java.text.SimpleDateFormat;
-import  java.text.ParseException;
-import  freemarker.template.*;
-import  com.codestudio.sql.*;
-import  com.codestudio.util.*;
-
-import  mir.storage.StorageObject;
-import  mir.storage.store.*;
-import  mir.entity.*;
-import  mir.misc.*;
-import  mir.util.*;
-
-
-/**
- * Diese Klasse implementiert die Zugriffsschicht auf die Datenbank.
- * Alle Projektspezifischen Datenbankklassen erben von dieser Klasse.
- * In den Unterklassen wird im Minimalfall nur die Tabelle angegeben.
- * Im Konfigurationsfile findet sich eine Verweis auf den verwendeten
- * Treiber, Host, User und Passwort, ueber den der Zugriff auf die
- * Datenbank erfolgt.
- *
- * @version $Id: Database.java,v 1.27 2002/12/14 01:37:43 zapata Exp $
- * @author rk
- *
- */
-public class Database implements StorageObject {
-
-  protected String                    theTable;
-  protected String                    theCoreTable=null;
-  protected String                    thePKeyName="id";
-  protected int                       thePKeyType, thePKeyIndex;
-  protected boolean                   evaluatedMetaData=false;
-  protected ArrayList                 metadataFields,metadataLabels,
-  metadataNotNullFields;
-  protected int[]                     metadataTypes;
-  protected Class                     theEntityClass;
-  protected StorageObject             myselfDatabase;
-  protected SimpleList                popupCache=null;
-  protected boolean                   hasPopupCache = false;
-  protected SimpleHash                hashCache=null;
-  protected boolean                   hasTimestamp=true;
-  private String                      database_driver, database_url;
-  private int                         defaultLimit;
-  protected DatabaseAdaptor           theAdaptor;
-  protected Logfile                   theLog;
-  private static Class                GENERIC_ENTITY_CLASS=null,
-  STORABLE_OBJECT_ENTITY_CLASS=null;
-  private static SimpleHash           POPUP_EMTYLINE=new SimpleHash();
-  protected static final ObjectStore  o_store=ObjectStore.getInstance();
-  private SimpleDateFormat _dateFormatterOut =
-      new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-  private SimpleDateFormat _dateFormatterIn =
-      new SimpleDateFormat("yyyy-MM-dd HH:mm");
-  private Calendar _cal = new GregorianCalendar();
-
-  private static final int _millisPerHour = 60 * 60 * 1000;
-  private static final int _millisPerMinute = 60 * 1000;
-
-  static {
-    // always same object saves a little space
-    POPUP_EMTYLINE.put("key", ""); POPUP_EMTYLINE.put("value", "--");
-    try {
-      GENERIC_ENTITY_CLASS = Class.forName("mir.entity.StorableObjectEntity");
-      STORABLE_OBJECT_ENTITY_CLASS = Class.forName("mir.entity.StorableObjectEntity");
-    }
-    catch (Exception e) {
-      System.err.println("FATAL: Database.java could not initialize" + e.getMessage());
-    }
-  }
-
-
-  /**
-   * Kontruktor bekommt den Filenamen des Konfigurationsfiles übergeben.
-   * Aus diesem file werden <code>Database.Logfile</code>,
-   * <code>Database.Username</code>,<code>Database.Password</code>,
-   * <code>Database.Host</code> und <code>Database.Adaptor</code>
-   * ausgelesen und ein Broker für die Verbindugen zur Datenbank
-   * erzeugt.
-   *
-   * @param   String confFilename Dateiname der Konfigurationsdatei
-   */
-  public Database() throws StorageObjectException {
-    theLog = Logfile.getInstance(MirConfig.getProp("Home")+
-                                 MirConfig.getProp("Database.Logfile"));
-    String theAdaptorName=MirConfig.getProp("Database.Adaptor");
-    defaultLimit = Integer.parseInt(MirConfig.getProp("Database.Limit"));
-    try {
-      theEntityClass = GENERIC_ENTITY_CLASS;
-      theAdaptor = (DatabaseAdaptor)Class.forName(theAdaptorName).newInstance();
-    } catch (Exception e){
-      theLog.printError("Error in Database() constructor with "+
-                        theAdaptorName + " -- " +e.getMessage());
-      throw new StorageObjectException("Error in Database() constructor with "
-                                       +e.getMessage());
-    }
-              /*String database_username=MirConfig.getProp("Database.Username");
-              String database_password=MirConfig.getProp("Database.Password");
-              String database_host=MirConfig.getProp("Database.Host");
-              try {
-                      database_driver=theAdaptor.getDriver();
-                      database_url=theAdaptor.getURL(database_username,database_password,
-                                                                                                                                              database_host);
-                      theLog.printDebugInfo("adding Broker with: " +database_driver+":"+
-                                                                                                              database_url  );
-                      MirConfig.addBroker(database_driver,database_url);
-    //myBroker=MirConfig.getBroker();
-              }*/
-  }
-
-  /**
-   * Liefert die Entity-Klasse zurück, in der eine Datenbankzeile gewrappt
-   * wird. Wird die Entity-Klasse durch die erbende Klasse nicht überschrieben,
-   * wird eine mir.entity.GenericEntity erzeugt.
-   *
-   * @return Class-Objekt der Entity
-   */
-  public java.lang.Class getEntityClass () {
-    return  theEntityClass;
-  }
-
-  /**
-   * Liefert die Standardbeschränkung von select-Statements zurück, also
-   * wieviel Datensätze per Default selektiert werden.
-   *
-   * @return Standard-Anzahl der Datensätze
-   */
-  public int getLimit () {
-    return  defaultLimit;
-  }
-
-  /**
-   * Liefert den Namen des Primary-Keys zurück. Wird die Variable nicht von
-   * der erbenden Klasse überschrieben, so ist der Wert <code>PKEY</code>
-   * @return Name des Primary-Keys
-   */
-  public String getIdName () {
-    return  thePKeyName;
-  }
-
-  /**
-   * Liefert den Namen der Tabelle, auf das sich das Datenbankobjekt bezieht.
-   *
-   * @return Name der Tabelle
-   */
-  public String getTableName () {
-    return  theTable;
-  }
-
-      /*
-  *   Dient dazu vererbte Tabellen bei objectrelationalen DBMS
-  *   zu speichern, wenn die id einer Tabelle in der parenttabelle verwaltet
-  *   wird.
-  *   @return liefert theCoreTabel als String zurueck, wenn gesetzt, sonst
-  *    the Table
-       */
-
-  public String getCoreTable(){
-    if (theCoreTable!=null) return theCoreTable;
-    else return theTable;
-  }
-
-  /**
-   * Liefert Feldtypen der Felder der Tabelle zurueck (s.a. java.sql.Types)
-   * @return int-Array mit den Typen der Felder
-   * @exception StorageObjectException
-   */
-  public int[] getTypes () throws StorageObjectException {
-    if (metadataTypes == null)
-      get_meta_data();
-    return  metadataTypes;
-  }
-
-  /**
-   * Liefert eine Liste der Labels der Tabellenfelder
-   * @return ArrayListe mit Labeln
-   * @exception StorageObjectException
-   */
-  public ArrayList getLabels () throws StorageObjectException {
-    if (metadataLabels == null)
-      get_meta_data();
-    return  metadataLabels;
-  }
-
-  /**
-   * Liefert eine Liste der Felder der Tabelle
-   * @return ArrayList mit Feldern
-   * @exception StorageObjectException
-   */
-  public ArrayList getFields () throws StorageObjectException {
-    if (metadataFields == null)
-      get_meta_data();
-    return  metadataFields;
-  }
-
-
-      /*
-  *   Gets value out of ResultSet according to type and converts to String
-  *   @param inValue  Wert aus ResultSet.
-  *   @param aType  Datenbanktyp.
-  *   @return liefert den Wert als String zurueck. Wenn keine Umwandlung moeglich
-  *           dann /unsupported value/
-       */
-  private String getValueAsString (ResultSet rs, int valueIndex, int aType) throws StorageObjectException {
-    String outValue = null;
-    if (rs != null) {
-      try {
-        switch (aType) {
-          case java.sql.Types.BIT:
-            outValue = (rs.getBoolean(valueIndex) == true) ? "1" : "0";
-            break;
-          case java.sql.Types.INTEGER:case java.sql.Types.SMALLINT:case java.sql.Types.TINYINT:case java.sql.Types.BIGINT:
-            int out = rs.getInt(valueIndex);
-            if (!rs.wasNull())
-              outValue = new Integer(out).toString();
-            break;
-          case java.sql.Types.NUMERIC:
-            /** @todo Numeric can be float or double depending upon
-             *  metadata.getScale() / especially with oracle */
-            long outl = rs.getLong(valueIndex);
-            if (!rs.wasNull())
-              outValue = new Long(outl).toString();
-            break;
-          case java.sql.Types.REAL:
-            float tempf = rs.getFloat(valueIndex);
-            if (!rs.wasNull()) {
-              tempf *= 10;
-              tempf += 0.5;
-              int tempf_int = (int)tempf;
-              tempf = (float)tempf_int;
-              tempf /= 10;
-              outValue = "" + tempf;
-              outValue = outValue.replace('.', ',');
-            }
-            break;
-          case java.sql.Types.DOUBLE:
-            double tempd = rs.getDouble(valueIndex);
-            if (!rs.wasNull()) {
-              tempd *= 10;
-              tempd += 0.5;
-              int tempd_int = (int)tempd;
-              tempd = (double)tempd_int;
-              tempd /= 10;
-              outValue = "" + tempd;
-              outValue = outValue.replace('.', ',');
-            }
-            break;
-          case java.sql.Types.CHAR:case java.sql.Types.VARCHAR:case java.sql.Types.LONGVARCHAR:
-            outValue = rs.getString(valueIndex);
-            //if (outValue != null)
-            //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
-            break;
-          case java.sql.Types.LONGVARBINARY:
-            outValue = rs.getString(valueIndex);
-            //if (outValue != null)
-            //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
-            break;
-          case java.sql.Types.TIMESTAMP:
-            // it's important to use Timestamp here as getting it
-            // as a string is undefined and is only there for debugging
-            // according to the API. we can make it a string through formatting.
-            // -mh
-            Timestamp timestamp = (rs.getTimestamp(valueIndex));
-            if(!rs.wasNull()) {
-              java.util.Date date = new java.util.Date(timestamp.getTime());
-              outValue = _dateFormatterOut.format(date);
-              _cal.setTime(date);
-              int offset = _cal.get(Calendar.ZONE_OFFSET)+
-                           _cal.get(Calendar.DST_OFFSET);
-              String tzOffset = StringUtil.zeroPaddingNumber(
-                  offset/_millisPerHour,2,2);
-              outValue = outValue+"+"+tzOffset;
-            }
-            break;
-          default:
-            outValue = "<unsupported value>";
-          theLog.printWarning("Unsupported Datatype: at " + valueIndex +
-                              " (" + aType + ")");
-        }
-      } catch (SQLException e) {
-        throw  new StorageObjectException("Could not get Value out of Resultset -- "
-            + e.getMessage());
-      }
-    }
-    return  outValue;
-  }
-
-      /*
-  *   select-Operator um einen Datensatz zu bekommen.
-  *   @param id Primaerschluessel des Datensatzes.
-  *   @return liefert EntityObject des gefundenen Datensatzes oder null.
-       */
-  public Entity selectById(String id)	throws StorageObjectException
-  {
-    if (id==null||id.equals(""))
-      throw new StorageObjectException("id war null");
-
-    // ask object store for object
-    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
-      String uniqueId = id;
-      if ( theEntityClass.equals(StorableObjectEntity.class) )
-        uniqueId+="@"+theTable;
-      StoreIdentifier search_sid = new StoreIdentifier(theEntityClass, uniqueId);
-      theLog.printDebugInfo("CACHE: (dbg) looking for sid " + search_sid.toString());
-      Entity hit = (Entity)o_store.use(search_sid);
-      if ( hit!=null ) return hit;
-    }
-
-    Statement stmt=null;Connection con=getPooledCon();
-    Entity returnEntity=null;
-    try {
-      ResultSet rs;
-      /** @todo better prepared statement */
-      String selectSql = "select * from " + theTable + " where " + thePKeyName + "=" + id;
-      stmt = con.createStatement();
-      rs = executeSql(stmt, selectSql);
-      if (rs != null) {
-        if (evaluatedMetaData==false) evalMetaData(rs.getMetaData());
-        if (rs.next())
-          returnEntity = makeEntityFromResultSet(rs);
-        else theLog.printDebugInfo("Keine daten fuer id: " + id + "in Tabelle" + theTable);
-        rs.close();
-      }
-      else {
-        theLog.printDebugInfo("No Data for Id " + id + " in Table " + theTable);
-      }
-    }
-    catch (SQLException sqe){
-      throwSQLException(sqe,"selectById"); return null;
-    }
-    catch (NumberFormatException e) {
-      theLog.printError("ID ist keine Zahl: " + id);
-    }
-    finally { freeConnection(con,stmt); }
-
-    /** @todo OS: Entity should be saved in ostore */
-    return returnEntity;
-  }
-
-
-  /**
-   *   select-Operator um Datensaetze zu bekommen, die key = value erfuellen.
-   *   @param key  Datenbankfeld der Bedingung.
-   *   @param value  Wert die der key anehmen muss.
-   *   @return EntityList mit den gematchten Entities
-   */
-  public EntityList selectByFieldValue(String aField, String aValue)
-      throws StorageObjectException
-  {
-    return selectByFieldValue(aField, aValue, 0);
-  }
-
-  /**
-   *   select-Operator um Datensaetze zu bekommen, die key = value erfuellen.
-   *   @param key  Datenbankfeld der Bedingung.
-   *   @param value  Wert die der key anehmen muss.
-   *   @param offset  Gibt an ab welchem Datensatz angezeigt werden soll.
-   *   @return EntityList mit den gematchten Entities
-   */
-  public EntityList selectByFieldValue(String aField, String aValue, int offset)
-      throws StorageObjectException
-  {
-    return selectByWhereClause(aField + "=" + aValue, offset);
-  }
-
-
-  /**
-   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
-   * Also offset wird der erste Datensatz genommen.
-   *
-   * @param wc where-Clause
-   * @return EntityList mit den gematchten Entities
-   * @exception StorageObjectException
-   */
-  public EntityList selectByWhereClause(String where)
-      throws StorageObjectException
-  {
-    return selectByWhereClause(where, 0);
-  }
-
-
-  /**
-   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
-   * Als maximale Anzahl wird das Limit auf der Konfiguration genommen.
-   *
-   * @param wc where-Clause
-   * @param offset ab welchem Datensatz.
-   * @return EntityList mit den gematchten Entities
-   * @exception StorageObjectException
-   */
-  public EntityList selectByWhereClause(String whereClause, int offset)
-      throws StorageObjectException
-  {
-    return selectByWhereClause(whereClause, null, offset);
-  }
-
-
-  /**
-   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
-   * Also offset wird der erste Datensatz genommen.
-   * Als maximale Anzahl wird das Limit auf der Konfiguration genommen.
-   *
-   * @param wc where-Clause
-   * @param ob orderBy-Clause
-   * @return EntityList mit den gematchten Entities
-   * @exception StorageObjectException
-   */
-
-  public EntityList selectByWhereClause(String where, String order)
-      throws StorageObjectException {
-    return selectByWhereClause(where, order, 0);
-  }
-
-
-  /**
-   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
-   * Als maximale Anzahl wird das Limit auf der Konfiguration genommen.
-   *
-   * @param wc where-Clause
-   * @param ob orderBy-Clause
-   * @param offset ab welchem Datensatz
-   * @return EntityList mit den gematchten Entities
-   * @exception StorageObjectException
-   */
-
-  public EntityList selectByWhereClause(String whereClause, String orderBy, int offset)
-      throws StorageObjectException {
-    return selectByWhereClause(whereClause, orderBy, offset, defaultLimit);
-  }
-
-
-  /**
-   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
-   * @param wc where-Clause
-   * @param ob orderBy-Clause
-   * @param offset ab welchem Datensatz
-   * @param limit wieviele Datensätze
-   * @return EntityList mit den gematchten Entities
-   * @exception StorageObjectException
-   */
-
-  public EntityList selectByWhereClause(String wc, String ob, int offset, int limit)
-      throws StorageObjectException
-  {
-
-    // check o_store for entitylist
-    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
-      StoreIdentifier search_sid =
-          new StoreIdentifier( theEntityClass,
-          StoreContainerType.STOC_TYPE_ENTITYLIST,
-          StoreUtil.getEntityListUniqueIdentifierFor(theTable,wc,ob,offset,limit) );
-      EntityList hit = (EntityList)o_store.use(search_sid);
-      if ( hit!=null ) {
-        theLog.printDebugInfo("CACHE (hit): " + search_sid.toString());
-        return hit;
-      }
-    }
-
-    // local
-    EntityList    theReturnList=null;
-    Connection    con=null;	Statement stmt=null;
-    ResultSet     rs;
-    int           offsetCount = 0, count=0;
-
-    // build sql-statement
-
-    /** @todo count sql string should only be assembled if we really count
-     *  see below at the end of method //rk */
-
-    if (wc != null && wc.length() == 0) {
-      wc = null;
-    }
-    StringBuffer countSql = new StringBuffer("select count(*) from ").append(theTable);
-    StringBuffer selectSql = new StringBuffer("select * from ").append(theTable);
-    if (wc != null) {
-      selectSql.append(" where ").append(wc);
-      countSql.append(" where ").append(wc);
-    }
-    if (ob != null && !(ob.length() == 0)) {
-      selectSql.append(" order by ").append(ob);
-    }
-    if (theAdaptor.hasLimit()) {
-      if (limit > -1 && offset > -1) {
-        selectSql.append(" limit ");
-        if (theAdaptor.reverseLimit()) {
-          selectSql.append(limit).append(",").append(offset);
-        }
-        else {
-          selectSql.append(offset).append(",").append(limit);
-        }
-      }
-    }
-
-    // execute sql
-    try {
-      con = getPooledCon();
-      stmt = con.createStatement();
-
-      // selecting...
-      rs = executeSql(stmt, selectSql.toString());
-      if (rs != null) {
-        if (!evaluatedMetaData) evalMetaData(rs.getMetaData());
-
-        theReturnList = new EntityList();
-        Entity theResultEntity;
-        while (rs.next()) {
-          theResultEntity = makeEntityFromResultSet(rs);
-          theReturnList.add(theResultEntity);
-          offsetCount++;
-        }
-        rs.close();
-      }
-
-      // making entitylist infos
-      if (!(theAdaptor.hasLimit())) count = offsetCount;
-
-      if (theReturnList != null) {
-        // now we decide if we have to know an overall count...
-        count=offsetCount;
-        if (limit > -1 && offset > -1) {
-          if (offsetCount==limit) {
-            /** @todo counting should be deffered to entitylist
-             *  getSize() should be used */
-            rs = executeSql(stmt, countSql.toString());
-            if (rs != null) {
-              if ( rs.next() ) count = rs.getInt(1);
-              rs.close();
-            }
-            else theLog.printError("Could not count: " + countSql);
-          }
-        }
-        theReturnList.setCount(count);
-        theReturnList.setOffset(offset);
-        theReturnList.setWhere(wc);
-        theReturnList.setOrder(ob);
-        theReturnList.setStorage(this);
-        theReturnList.setLimit(limit);
-        if ( offset >= limit )
-          theReturnList.setPrevBatch(offset - limit);
-        if ( offset+offsetCount < count )
-          theReturnList.setNextBatch(offset + limit);
-        if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
-          StoreIdentifier sid=theReturnList.getStoreIdentifier();
-          theLog.printDebugInfo("CACHE (add): " + sid.toString());
-          o_store.add(sid);
-        }
-      }
-    }
-    catch (SQLException sqe) { throwSQLException(sqe, "selectByWhereClause"); }
-    finally { freeConnection(con, stmt); }
-
-    return  theReturnList;
-  }
-
-
-  /**
-   *  Bastelt aus einer Zeile der Datenbank ein EntityObjekt.
-   *
-   *  @param rs Das ResultSetObjekt.
-   *  @return Entity Die Entity.
-   */
-  private Entity makeEntityFromResultSet (ResultSet rs)
-      throws StorageObjectException
-  {
-    /** @todo OS: get Pkey from ResultSet and consult ObjectStore */
-    HashMap theResultHash = new HashMap();
-    String theResult = null;
-    int theType;
-    Entity returnEntity = null;
-    try {
-      int size = metadataFields.size();
-      for (int i = 0; i < size; i++) {
-        // alle durchlaufen bis nix mehr da
-
-        theType = metadataTypes[i];
-        if (theType == java.sql.Types.LONGVARBINARY) {
-          InputStreamReader is = (InputStreamReader)rs.getCharacterStream(i + 1);
-          if (is != null) {
-            char[] data = new char[32768];
-            StringBuffer theResultString = new StringBuffer();
-            int len;
-            while ((len = is.read(data)) > 0) {
-              theResultString.append(data, 0, len);
-            }
-            is.close();
-            theResult = theResultString.toString();
-          }
-          else {
-            theResult = null;
-          }
-        }
-        else {
-          theResult = getValueAsString(rs, (i + 1), theType);
-        }
-        if (theResult != null) {
-          theResultHash.put(metadataFields.get(i), theResult);
-        }
-      }
-      if (theEntityClass != null) {
-        returnEntity = (Entity)theEntityClass.newInstance();
-        returnEntity.setValues(theResultHash);
-        returnEntity.setStorage(myselfDatabase);
-        if ( returnEntity instanceof StorableObject ) {
-          theLog.printDebugInfo("CACHE: ( in) " + returnEntity.getId() + " :"+theTable);
-          o_store.add(((StorableObject)returnEntity).getStoreIdentifier());
-        }
-      } else {
-        throwStorageObjectException("Internal Error: theEntityClass not set!");
-      }
-    }
-    catch (IllegalAccessException e) {
-      throwStorageObjectException("No access! -- " + e.getMessage());
-    }
-    catch (IOException e) {
-      throwStorageObjectException("IOException! -- " + e.getMessage());
-    }
-    catch (InstantiationException e) {
-      throwStorageObjectException("No Instatiation! -- " + e.getMessage());
-    }
-    catch (SQLException sqe) {
-      throwSQLException(sqe, "makeEntityFromResultSet");
-      return  null;
-    }
-    return  returnEntity;
-  }
-
-  /**
-   * insert-Operator: fügt eine Entity in die Tabelle ein. Eine Spalte WEBDB_CREATE
-   * wird automatisch mit dem aktuellen Datum gefuellt.
-   *
-   * @param theEntity
-   * @return der Wert des Primary-keys der eingefügten Entity
-   */
-  public String insert (Entity theEntity) throws StorageObjectException {
-    //cache
-    invalidatePopupCache();
-
-    // invalidating all EntityLists corresponding with theEntityClass
-    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
-      StoreContainerType stoc_type =
-          StoreContainerType.valueOf( theEntityClass,
-          StoreContainerType.STOC_TYPE_ENTITYLIST);
-      o_store.invalidate(stoc_type);
-    }
-
-    String returnId = null;
-    Connection con = null; PreparedStatement pstmt = null;
-
-    try {
-      ArrayList streamedInput = theEntity.streamedInput();
-      StringBuffer f = new StringBuffer();
-      StringBuffer v = new StringBuffer();
-      String aField, aValue;
-      boolean firstField = true;
-      // make sql-string
-      for (int i = 0; i < getFields().size(); i++) {
-        aField = (String)getFields().get(i);
-        if (!aField.equals(thePKeyName)) {
-          aValue = null;
-          // sonderfaelle
-          if (aField.equals("webdb_create") ||
-              aField.equals("webdb_lastchange")) {
-            aValue = "NOW()";
-          }
-          else {
-            if (streamedInput != null && streamedInput.contains(aField)) {
-              aValue = "?";
-            }
-            else {
-              if (theEntity.hasValueForField(aField)) {
-                aValue = "'" + JDBCStringRoutines.escapeStringLiteral((String)theEntity.getValue(aField)) + "'";
-              }
-            }
-          }
-          // wenn Wert gegeben, dann einbauen
-          if (aValue != null) {
-            if (firstField == false) {
-              f.append(",");
-              v.append(",");
-            }
-            else {
-              firstField = false;
-            }
-            f.append(aField);
-            v.append(aValue);
-          }
-        }
-      }         // end for
-      // insert into db
-      StringBuffer sqlBuf = new StringBuffer("insert into ").append(theTable).append("(").append(f).append(") values (").append(v).append(")");
-      String sql = sqlBuf.toString();
-      theLog.printInfo("INSERT: " + sql);
-      con = getPooledCon();
-      con.setAutoCommit(false);
-      pstmt = con.prepareStatement(sql);
-      if (streamedInput != null) {
-        for (int i = 0; i < streamedInput.size(); i++) {
-          String inputString = (String)theEntity.getValue((String)streamedInput.get(i));
-          pstmt.setBytes(i + 1, inputString.getBytes());
-        }
-      }
-      int ret = pstmt.executeUpdate();
-      if(ret == 0){
-        //insert failed
-        return null;
-      }
-      pstmt = con.prepareStatement(theAdaptor.getLastInsertSQL((Database)myselfDatabase));
-      ResultSet rs = pstmt.executeQuery();
-      rs.next();
-      returnId = rs.getString(1);
-      theEntity.setId(returnId);
-    } catch (SQLException sqe) {
-      throwSQLException(sqe, "insert");
-    } finally {
-      try {
-        con.setAutoCommit(true);
-      } catch (Exception e) {
-        ;
-      }
-      freeConnection(con, pstmt);
-    }
-    /** @todo store entity in o_store */
-    return  returnId;
-  }
-
-  /**
-   * update-Operator: aktualisiert eine Entity. Eine Spalte WEBDB_LASTCHANGE
-   * wird automatisch mit dem aktuellen Datum gefuellt.
-   *
-   * @param theEntity
-   */
-  public void update (Entity theEntity) throws StorageObjectException
-  {
-    Connection con = null; PreparedStatement pstmt = null;
-    /** @todo this is stupid: why do we prepare statement, when we
-     *  throw it away afterwards. should be regular statement
-     *  update/insert could better be one routine called save()
-     *  that chooses to either insert or update depending if we
-     *  have a primary key in the entity. i don't know if we
-     *  still need the streamed input fields. // rk  */
-
-    /** @todo extension: check if Entity did change, otherwise we don't need
-     *  the roundtrip to the database */
-
-    /** invalidating corresponding entitylists in o_store*/
-    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
-      StoreContainerType stoc_type =
-          StoreContainerType.valueOf( theEntityClass,
-          StoreContainerType.STOC_TYPE_ENTITYLIST);
-      o_store.invalidate(stoc_type);
-    }
-
-    ArrayList streamedInput = theEntity.streamedInput();
-    String id = theEntity.getId();
-    String aField;
-    StringBuffer fv = new StringBuffer();
-    boolean firstField = true;
-    //cache
-    invalidatePopupCache();
-    // build sql statement
-    for (int i = 0; i < getFields().size(); i++) {
-      aField = (String)metadataFields.get(i);
-      // only normal cases
-      if (!(aField.equals(thePKeyName) || aField.equals("webdb_create") ||
-            aField.equals("webdb_lastchange") || (streamedInput != null && streamedInput.contains(aField)))) {
-        if (theEntity.hasValueForField(aField)) {
-          if (firstField == false) {
-            fv.append(", ");
-          }
-          else {
-            firstField = false;
-          }
-          fv.append(aField).append("='").append(JDBCStringRoutines.escapeStringLiteral((String) theEntity.getValue(aField))).append("'");
-
-//              fv.append(aField).append("='").append(StringUtil.quote((String)theEntity.getValue(aField))).append("'");
-        }
-      }
-    }
-    StringBuffer sql = new StringBuffer("update ").append(theTable).append(" set ").append(fv);
-    // exceptions
-    if (metadataFields.contains("webdb_lastchange")) {
-      sql.append(",webdb_lastchange=NOW()");
-    }
-    // special case: the webdb_create requires the field in yyyy-mm-dd HH:mm
-    // format so anything extra will be ignored. -mh
-    if (metadataFields.contains("webdb_create") &&
-        theEntity.hasValueForField("webdb_create")) {
-      // minimum of 10 (yyyy-mm-dd)...
-      if (theEntity.getValue("webdb_create").length() >= 10) {
-        String dateString = theEntity.getValue("webdb_create");
-        // if only 10, then add 00:00 so it doesn't throw a ParseException
-        if (dateString.length() == 10)
-          dateString=dateString+" 00:00";
-
-        // TimeStamp stuff
-        try {
-          java.util.Date d = _dateFormatterIn.parse(dateString);
-          Timestamp tStamp = new Timestamp(d.getTime());
-          sql.append(",webdb_create='"+tStamp.toString()+"'");
-        } catch (ParseException e) {
-          throw new StorageObjectException(e.getMessage());
-        }
-      }
-    }
-    if (streamedInput != null) {
-      for (int i = 0; i < streamedInput.size(); i++) {
-        sql.append(",").append(streamedInput.get(i)).append("=?");
-      }
-    }
-    sql.append(" where id=").append(id);
-    theLog.printInfo("UPDATE: " + sql);
-    // execute sql
-    try {
-      con = getPooledCon();
-      con.setAutoCommit(false);
-      pstmt = con.prepareStatement(sql.toString());
-      if (streamedInput != null) {
-        for (int i = 0; i < streamedInput.size(); i++) {
-          String inputString = theEntity.getValue((String)streamedInput.get(i));
-          pstmt.setBytes(i + 1, inputString.getBytes());
-        }
-      }
-      pstmt.executeUpdate();
-    }
-    catch (SQLException sqe) {
-      throwSQLException(sqe, "update");
-    }
-    finally {
-      try {
-        con.setAutoCommit(true);
-      } catch (Exception e) {
-        ;
-      }
-      freeConnection(con, pstmt);
-    }
-  }
-
-      /*
-  *   delete-Operator
-  *   @param id des zu loeschenden Datensatzes
-  *   @return boolean liefert true zurueck, wenn loeschen erfolgreich war.
-       */
-  public boolean delete (String id) throws StorageObjectException {
-
-    invalidatePopupCache();
-    // ostore send notification
-    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
-      String uniqueId = id;
-      if ( theEntityClass.equals(StorableObjectEntity.class) )
-        uniqueId+="@"+theTable;
-      theLog.printInfo("CACHE: (del) " + id);
-      StoreIdentifier search_sid =
-          new StoreIdentifier(theEntityClass, StoreContainerType.STOC_TYPE_ENTITY, uniqueId);
-      o_store.invalidate(search_sid);
-    }
-
-    /** @todo could be prepared Statement */
-    Statement stmt = null; Connection con = null;
-    int res = 0;
-    String sql="delete from "+theTable+" where "+thePKeyName+"='"+id+"'";
-    theLog.printInfo("DELETE " + sql);
-    try {
-      con = getPooledCon(); stmt = con.createStatement();
-      res = stmt.executeUpdate(sql);
-    }
-    catch (SQLException sqe) { throwSQLException(sqe, "delete"); }
-    finally { freeConnection(con, stmt); }
-
-    return  (res > 0) ? true : false;
-  }
-
-      /* noch nicht implementiert.
-  * @return immer false
-       */
-  public boolean delete (EntityList theEntityList) {
-    invalidatePopupCache();
-    return  false;
-  }
-
-  /**
-   * Diese Methode sollte ueberschrieben werden, wenn fuer die abgeleitete Database-Klasse
-   * eine SimpleList mit Standard-Popupdaten erzeugt werden koennen soll.
-   * @return null
-   */
-  public SimpleList getPopupData () throws StorageObjectException {
-    return  null;
-  }
-
-  /**
-   *  Holt Daten fuer Popups.
-   *  @param name  Name des Feldes.
-   *  @param hasNullValue  Wenn true wird eine leerer  Eintrag fuer die Popups erzeugt.
-   *  @return SimpleList Gibt freemarker.template.SimpleList zurueck.
-   */
-  public SimpleList getPopupData (String name, boolean hasNullValue)
-      throws StorageObjectException {
-    return  getPopupData(name, hasNullValue, null);
-  }
-
-  /**
-   *  Holt Daten fuer Popups.
-   *  @param name  Name des Feldes.
-   *  @param hasNullValue  Wenn true wird eine leerer  Eintrag fuer die Popups erzeugt.
-   *  @param where  Schraenkt die Selektion der Datensaetze ein.
-   *  @return SimpleList Gibt freemarker.template.SimpleList zurueck.
-   */
-  public SimpleList getPopupData (String name, boolean hasNullValue, String where) throws StorageObjectException {
-    return  getPopupData(name, hasNullValue, where, null);
-  }
-
-  /**
-   *  Holt Daten fuer Popups.
-   *  @param name  Name des Feldes.
-   *  @param hasNullValue  Wenn true wird eine leerer  Eintrag fuer die Popups erzeugt.
-   *  @param where  Schraenkt die Selektion der Datensaetze ein.
-   *  @param order  Gibt ein Feld als Sortierkriterium an.
-   *  @return SimpleList Gibt freemarker.template.SimpleList zurueck.
-   */
-  public SimpleList getPopupData (String name, boolean hasNullValue, String where, String order) throws StorageObjectException {
-    // caching
-    if (hasPopupCache && popupCache != null)
-      return  popupCache;
-    SimpleList simpleList = null;
-    Connection con = null;
-    Statement stmt = null;
-    // build sql
-    StringBuffer sql = new StringBuffer("select ").append(thePKeyName)
-                     .append(",").append(name).append(" from ")
-                     .append(theTable);
-    if (where != null && !(where.length() == 0))
-      sql.append(" where ").append(where);
-    sql.append(" order by ");
-    if (order != null && !(order.length() == 0))
-      sql.append(order);
-    else
-      sql.append(name);
-    // execute sql
-    try {
-      con = getPooledCon();
-    }
-    catch (Exception e) {
-      throw new StorageObjectException(e.getMessage());
-    }
-    try {
-      stmt = con.createStatement();
-      ResultSet rs = executeSql(stmt, sql.toString());
-
-      if (rs != null) {
-        if (!evaluatedMetaData) get_meta_data();
-        simpleList = new SimpleList();
-        // if popup has null-selector
-        if (hasNullValue) simpleList.add(POPUP_EMTYLINE);
-
-        SimpleHash popupDict;
-        while (rs.next()) {
-          popupDict = new SimpleHash();
-          popupDict.put("key", getValueAsString(rs, 1, thePKeyType));
-          popupDict.put("value", rs.getString(2));
-          simpleList.add(popupDict);
-        }
-        rs.close();
-      }
-    }
-    catch (Exception e) {
-      theLog.printError("getPopupData: "+e.getMessage());
-      throw new StorageObjectException(e.toString());
-    }
-    finally {
-      freeConnection(con, stmt);
-    }
-
-    if (hasPopupCache) popupCache = simpleList;
-    return  simpleList;
-  }
-
-  /**
-   * Liefert alle Daten der Tabelle als SimpleHash zurueck. Dies wird verwandt,
-   * wenn in den Templates ein Lookup-Table benoetigt wird. Sollte nur bei kleinen
-   * Tabellen Verwendung finden.
-   * @return SimpleHash mit den Tabellezeilen.
-   */
-  public SimpleHash getHashData () {
-    /** @todo dangerous! this should have a flag to be enabled, otherwise
-     *  very big Hashes could be returned */
-    if (hashCache == null) {
-      try {
-        hashCache = HTMLTemplateProcessor.makeSimpleHash(selectByWhereClause("",
-            -1));
-      }
-      catch (StorageObjectException e) {
-        theLog.printDebugInfo(e.getMessage());
-      }
-    }
-    return  hashCache;
-  }
-
-      /* invalidates the popupCache
-       */
-  protected void invalidatePopupCache () {
-    /** @todo  invalidates toooo much */
-    popupCache = null;
-    hashCache = null;
-  }
-
-  /**
-   * Diese Methode fuehrt den Sqlstring <i>sql</i> aus und timed im Logfile.
-   * @param stmt Statemnt
-   * @param sql Sql-String
-   * @return ResultSet
-   * @exception StorageObjectException
-   */
-  public ResultSet executeSql (Statement stmt, String sql)
-      throws StorageObjectException, SQLException
-  {
-    long startTime = System.currentTimeMillis();
-    ResultSet rs;
-    try {
-      rs = stmt.executeQuery(sql);
-      theLog.printInfo((System.currentTimeMillis() - startTime) + "ms. for: "
-                       + sql);
-    }
-    catch (SQLException e)
-    {
-      theLog.printDebugInfo("Failed: " + (System.currentTimeMillis()
-          - startTime) + "ms. for: "+ sql);
-      throw e;
-    }
-
-    return  rs;
-  }
-
-  /**
-   * Fuehrt Statement stmt aus und liefert Resultset zurueck. Das SQL-Statment wird
-   * getimed und geloggt.
-   * @param stmt PreparedStatement mit der SQL-Anweisung
-   * @return Liefert ResultSet des Statements zurueck.
-   * @exception StorageObjectException, SQLException
-   */
-  public ResultSet executeSql (PreparedStatement stmt)
-      throws StorageObjectException, SQLException {
-
-    long startTime = (new java.util.Date()).getTime();
-    ResultSet rs = stmt.executeQuery();
-    theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms.");
-    return  rs;
-  }
-
-  /**
-   * returns the number of rows in the table
-   */
-  public int getSize(String where)
-      throws SQLException,StorageObjectException
-  {
-    long  startTime = System.currentTimeMillis();
-    String sql = "SELECT Count(*) FROM "+ theTable;
-    if (where != null && !(where.length() == 0))
-      sql = sql + " where " + where;
-    Connection con = null;
-    Statement stmt = null;
-    int result = 0;
-
-    try {
-      con = getPooledCon();
-      stmt = con.createStatement();
-      ResultSet rs = executeSql(stmt,sql);
-      while(rs.next()){
-        result = rs.getInt(1);
-      }
-    }
-    catch (SQLException e) {
-      theLog.printError(e.getMessage());
-    }
-    finally {
-      freeConnection(con,stmt);
-    }
-    //theLog.printInfo(theTable + " has "+ result +" rows where " + where);
-    theLog.printInfo((System.currentTimeMillis() - startTime) + "ms. for: "
-                     + sql);
-    return result;
-  }
-
-  public int executeUpdate(Statement stmt, String sql)
-      throws StorageObjectException, SQLException
-  {
-    int rs;
-    long  startTime = (new java.util.Date()).getTime();
-    try
-    {
-      rs = stmt.executeUpdate(sql);
-      theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms. for: "
-                       + sql);
-    }
-    catch (SQLException e)
-    {
-      theLog.printDebugInfo("Failed: " + (new java.util.Date().getTime()
-          - startTime) + "ms. for: "+ sql);
-      throw e;
-    }
-    return rs;
-  }
-
-  public int executeUpdate(String sql) throws StorageObjectException, SQLException
-  {
-    int result=-1;
-    long  startTime = (new java.util.Date()).getTime();
-    Connection con=null;
-    PreparedStatement pstmt=null;
-    try {
-      con=getPooledCon();
-      pstmt = con.prepareStatement(sql);
-      result = pstmt.executeUpdate();
-    }
-    catch (Exception e) {
-      theLog.printDebugInfo("settimage :: setImage failed: "+e.getMessage());
-      throw new StorageObjectException("executeUpdate failed: "+e.getMessage());
-    }
-    finally {
-      freeConnection(con,pstmt);
-    }
-    theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms. for: " + sql);
-    return result;
-  }
-
-  /**
-   * Wertet ResultSetMetaData aus und setzt interne Daten entsprechend
-   * @param md ResultSetMetaData
-   * @exception StorageObjectException
-   */
-  private void evalMetaData (ResultSetMetaData md)
-      throws StorageObjectException {
-
-    this.evaluatedMetaData = true;
-    this.metadataFields = new ArrayList();
-    this.metadataLabels = new ArrayList();
-    this.metadataNotNullFields = new ArrayList();
-    try {
-      int numFields = md.getColumnCount();
-      this.metadataTypes = new int[numFields];
-      String aField;
-      int aType;
-      for (int i = 1; i <= numFields; i++) {
-        aField = md.getColumnName(i);
-        metadataFields.add(aField);
-        metadataLabels.add(md.getColumnLabel(i));
-        aType = md.getColumnType(i);
-        metadataTypes[i - 1] = aType;
-        if (aField.equals(thePKeyName)) {
-          thePKeyType = aType; thePKeyIndex = i;
-        }
-        if (md.isNullable(i) == md.columnNullable) {
-          metadataNotNullFields.add(aField);
-        }
-      }
-    } catch (SQLException e) {
-      throwSQLException(e, "evalMetaData");
-    }
-  }
-
-  /**
-   *  Wertet die Metadaten eines Resultsets fuer eine Tabelle aus,
-   *  um die alle Columns und Typen einer Tabelle zu ermitteln.
-   */
-  private void get_meta_data () throws StorageObjectException {
-    Connection con = null;
-    PreparedStatement pstmt = null;
-    String sql = "select * from " + theTable + " where 0=1";
-    try {
-      con = getPooledCon();
-      pstmt = con.prepareStatement(sql);
-      theLog.printInfo("METADATA: " + sql);
-      ResultSet rs = pstmt.executeQuery();
-      evalMetaData(rs.getMetaData());
-      rs.close();
-    } catch (SQLException e) {
-      throwSQLException(e, "get_meta_data");
-    } finally {
-      freeConnection(con, pstmt);
-    }
-  }
-
-
-  public Connection getPooledCon() throws StorageObjectException {
-              /* @todo , doublecheck but I'm pretty sure that this is unnecessary. -mh
-                      try{
-                      Class.forName("com.codestudio.sql.PoolMan").newInstance();
-              } catch (Exception e){
-                      throw new StorageObjectException("Could not find the PoolMan Driver"
-                          +e.toString());
-              }*/
-    Connection con = null;
-
-    try{
-      con = SQLManager.getInstance().requestConnection();
-    }
-    catch(SQLException e){
-      theLog.printError("could not connect to the database "+e.getMessage());
-      System.err.println("could not connect to the database "+e.getMessage());
-      throw new StorageObjectException("Could not connect to the database"+ e.getMessage());
-    }
-
-    return con;
-  }
-
-  public void freeConnection (Connection con, Statement stmt) throws StorageObjectException {
-    SQLManager.getInstance().closeStatement(stmt);
-    SQLManager.getInstance().returnConnection(con);
-  }
-
-  /**
-   * Wertet SQLException aus und wirft dannach eine StorageObjectException
-   * @param sqe SQLException
-   * @param wo Funktonsname, in der die SQLException geworfen wurde
-   * @exception StorageObjectException
-   */
-  protected void throwSQLException (SQLException sqe, String wo) throws StorageObjectException {
-    String state = "";
-    String message = "";
-    int vendor = 0;
-    if (sqe != null) {
-      state = sqe.getSQLState();
-      message = sqe.getMessage();
-      vendor = sqe.getErrorCode();
-    }
-    theLog.printError(state + ": " + vendor + " : " + message + " Funktion: "
-                      + wo);
-    throw new StorageObjectException((sqe == null) ? "undefined sql exception" :
-                                      sqe.getMessage());
-  }
-
-  protected void _throwStorageObjectException (Exception e, String wo)
-      throws StorageObjectException {
-
-    if (e != null) {
-      theLog.printError(e.getMessage()+ wo);
-      throw  new StorageObjectException(wo + e.getMessage());
-    }
-    else {
-      theLog.printError(wo);
-      throw  new StorageObjectException(wo);
-    }
-
-  }
-
-  /**
-   * Loggt Fehlermeldung mit dem Parameter Message und wirft dannach
-   * eine StorageObjectException
-   * @param message Nachricht mit dem Fehler
-   * @exception StorageObjectException
-   */
-  void throwStorageObjectException (String message)
-      throws StorageObjectException {
-    _throwStorageObjectException(null, message);
-  }
-
-}
-
-
-
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
+package mir.storage;
+
+import  java.sql.*;
+import  java.lang.*;
+import  java.io.*;
+import  java.util.*;
+import  java.text.SimpleDateFormat;
+import  java.text.ParseException;
+import  freemarker.template.*;
+import  com.codestudio.sql.*;
+import  com.codestudio.util.*;
+
+import  mir.storage.StorageObject;
+import  mir.storage.store.*;
+import  mir.entity.*;
+import  mir.misc.*;
+import  mir.util.*;
+
+
+/**
+ * Diese Klasse implementiert die Zugriffsschicht auf die Datenbank.
+ * Alle Projektspezifischen Datenbankklassen erben von dieser Klasse.
+ * In den Unterklassen wird im Minimalfall nur die Tabelle angegeben.
+ * Im Konfigurationsfile findet sich eine Verweis auf den verwendeten
+ * Treiber, Host, User und Passwort, ueber den der Zugriff auf die
+ * Datenbank erfolgt.
+ *
+ * @version $Id: Database.java,v 1.28 2002/12/17 19:20:31 zapata Exp $
+ * @author rk
+ *
+ */
+public class Database implements StorageObject {
+
+  protected String                    theTable;
+  protected String                    theCoreTable=null;
+  protected String                    thePKeyName="id";
+  protected int                       thePKeyType, thePKeyIndex;
+  protected boolean                   evaluatedMetaData=false;
+  protected ArrayList                 metadataFields,metadataLabels,
+  metadataNotNullFields;
+  protected int[]                     metadataTypes;
+  protected Class                     theEntityClass;
+  protected StorageObject             myselfDatabase;
+  protected SimpleList                popupCache=null;
+  protected boolean                   hasPopupCache = false;
+  protected SimpleHash                hashCache=null;
+  protected boolean                   hasTimestamp=true;
+  private String                      database_driver, database_url;
+  private int                         defaultLimit;
+  protected DatabaseAdaptor           theAdaptor;
+  protected Logfile                   theLog;
+  private static Class                GENERIC_ENTITY_CLASS=null,
+  STORABLE_OBJECT_ENTITY_CLASS=null;
+  private static SimpleHash           POPUP_EMTYLINE=new SimpleHash();
+  protected static final ObjectStore  o_store=ObjectStore.getInstance();
+  private SimpleDateFormat _dateFormatterOut =
+      new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+  private SimpleDateFormat _dateFormatterIn =
+      new SimpleDateFormat("yyyy-MM-dd HH:mm");
+  private Calendar _cal = new GregorianCalendar();
+
+  private static final int _millisPerHour = 60 * 60 * 1000;
+  private static final int _millisPerMinute = 60 * 1000;
+
+  static {
+    // always same object saves a little space
+    POPUP_EMTYLINE.put("key", ""); POPUP_EMTYLINE.put("value", "--");
+    try {
+      GENERIC_ENTITY_CLASS = Class.forName("mir.entity.StorableObjectEntity");
+      STORABLE_OBJECT_ENTITY_CLASS = Class.forName("mir.entity.StorableObjectEntity");
+    }
+    catch (Exception e) {
+      System.err.println("FATAL: Database.java could not initialize" + e.getMessage());
+    }
+  }
+
+
+  /**
+   * Kontruktor bekommt den Filenamen des Konfigurationsfiles übergeben.
+   * Aus diesem file werden <code>Database.Logfile</code>,
+   * <code>Database.Username</code>,<code>Database.Password</code>,
+   * <code>Database.Host</code> und <code>Database.Adaptor</code>
+   * ausgelesen und ein Broker für die Verbindugen zur Datenbank
+   * erzeugt.
+   *
+   * @param   String confFilename Dateiname der Konfigurationsdatei
+   */
+  public Database() throws StorageObjectException {
+    theLog = Logfile.getInstance(MirConfig.getProp("Home")+
+                                 MirConfig.getProp("Database.Logfile"));
+    String theAdaptorName=MirConfig.getProp("Database.Adaptor");
+    defaultLimit = Integer.parseInt(MirConfig.getProp("Database.Limit"));
+    try {
+      theEntityClass = GENERIC_ENTITY_CLASS;
+      theAdaptor = (DatabaseAdaptor)Class.forName(theAdaptorName).newInstance();
+    } catch (Exception e){
+      theLog.printError("Error in Database() constructor with "+
+                        theAdaptorName + " -- " +e.getMessage());
+      throw new StorageObjectException("Error in Database() constructor with "
+                                       +e.getMessage());
+    }
+              /*String database_username=MirConfig.getProp("Database.Username");
+              String database_password=MirConfig.getProp("Database.Password");
+              String database_host=MirConfig.getProp("Database.Host");
+              try {
+                      database_driver=theAdaptor.getDriver();
+                      database_url=theAdaptor.getURL(database_username,database_password,
+                                                                                                                                              database_host);
+                      theLog.printDebugInfo("adding Broker with: " +database_driver+":"+
+                                                                                                              database_url  );
+                      MirConfig.addBroker(database_driver,database_url);
+    //myBroker=MirConfig.getBroker();
+              }*/
+  }
+
+  /**
+   * Liefert die Entity-Klasse zurück, in der eine Datenbankzeile gewrappt
+   * wird. Wird die Entity-Klasse durch die erbende Klasse nicht überschrieben,
+   * wird eine mir.entity.GenericEntity erzeugt.
+   *
+   * @return Class-Objekt der Entity
+   */
+  public java.lang.Class getEntityClass () {
+    return  theEntityClass;
+  }
+
+  /**
+   * Liefert die Standardbeschränkung von select-Statements zurück, also
+   * wieviel Datensätze per Default selektiert werden.
+   *
+   * @return Standard-Anzahl der Datensätze
+   */
+  public int getLimit () {
+    return  defaultLimit;
+  }
+
+  /**
+   * Liefert den Namen des Primary-Keys zurück. Wird die Variable nicht von
+   * der erbenden Klasse überschrieben, so ist der Wert <code>PKEY</code>
+   * @return Name des Primary-Keys
+   */
+  public String getIdName () {
+    return  thePKeyName;
+  }
+
+  /**
+   * Liefert den Namen der Tabelle, auf das sich das Datenbankobjekt bezieht.
+   *
+   * @return Name der Tabelle
+   */
+  public String getTableName () {
+    return  theTable;
+  }
+
+      /*
+  *   Dient dazu vererbte Tabellen bei objectrelationalen DBMS
+  *   zu speichern, wenn die id einer Tabelle in der parenttabelle verwaltet
+  *   wird.
+  *   @return liefert theCoreTabel als String zurueck, wenn gesetzt, sonst
+  *    the Table
+       */
+
+  public String getCoreTable(){
+    if (theCoreTable!=null) return theCoreTable;
+    else return theTable;
+  }
+
+  /**
+   * Liefert Feldtypen der Felder der Tabelle zurueck (s.a. java.sql.Types)
+   * @return int-Array mit den Typen der Felder
+   * @exception StorageObjectException
+   */
+  public int[] getTypes () throws StorageObjectException {
+    if (metadataTypes == null)
+      get_meta_data();
+    return  metadataTypes;
+  }
+
+  /**
+   * Liefert eine Liste der Labels der Tabellenfelder
+   * @return ArrayListe mit Labeln
+   * @exception StorageObjectException
+   */
+  public ArrayList getLabels () throws StorageObjectException {
+    if (metadataLabels == null)
+      get_meta_data();
+    return  metadataLabels;
+  }
+
+  /**
+   * Liefert eine Liste der Felder der Tabelle
+   * @return ArrayList mit Feldern
+   * @exception StorageObjectException
+   */
+  public ArrayList getFields () throws StorageObjectException {
+    if (metadataFields == null)
+      get_meta_data();
+    return  metadataFields;
+  }
+
+
+      /*
+  *   Gets value out of ResultSet according to type and converts to String
+  *   @param inValue  Wert aus ResultSet.
+  *   @param aType  Datenbanktyp.
+  *   @return liefert den Wert als String zurueck. Wenn keine Umwandlung moeglich
+  *           dann /unsupported value/
+       */
+  private String getValueAsString (ResultSet rs, int valueIndex, int aType) throws StorageObjectException {
+    String outValue = null;
+    if (rs != null) {
+      try {
+        switch (aType) {
+          case java.sql.Types.BIT:
+            outValue = (rs.getBoolean(valueIndex) == true) ? "1" : "0";
+            break;
+          case java.sql.Types.INTEGER:case java.sql.Types.SMALLINT:case java.sql.Types.TINYINT:case java.sql.Types.BIGINT:
+            int out = rs.getInt(valueIndex);
+            if (!rs.wasNull())
+              outValue = new Integer(out).toString();
+            break;
+          case java.sql.Types.NUMERIC:
+            /** @todo Numeric can be float or double depending upon
+             *  metadata.getScale() / especially with oracle */
+            long outl = rs.getLong(valueIndex);
+            if (!rs.wasNull())
+              outValue = new Long(outl).toString();
+            break;
+          case java.sql.Types.REAL:
+            float tempf = rs.getFloat(valueIndex);
+            if (!rs.wasNull()) {
+              tempf *= 10;
+              tempf += 0.5;
+              int tempf_int = (int)tempf;
+              tempf = (float)tempf_int;
+              tempf /= 10;
+              outValue = "" + tempf;
+              outValue = outValue.replace('.', ',');
+            }
+            break;
+          case java.sql.Types.DOUBLE:
+            double tempd = rs.getDouble(valueIndex);
+            if (!rs.wasNull()) {
+              tempd *= 10;
+              tempd += 0.5;
+              int tempd_int = (int)tempd;
+              tempd = (double)tempd_int;
+              tempd /= 10;
+              outValue = "" + tempd;
+              outValue = outValue.replace('.', ',');
+            }
+            break;
+          case java.sql.Types.CHAR:case java.sql.Types.VARCHAR:case java.sql.Types.LONGVARCHAR:
+            outValue = rs.getString(valueIndex);
+            //if (outValue != null)
+            //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
+            break;
+          case java.sql.Types.LONGVARBINARY:
+            outValue = rs.getString(valueIndex);
+            //if (outValue != null)
+            //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
+            break;
+          case java.sql.Types.TIMESTAMP:
+            // it's important to use Timestamp here as getting it
+            // as a string is undefined and is only there for debugging
+            // according to the API. we can make it a string through formatting.
+            // -mh
+            Timestamp timestamp = (rs.getTimestamp(valueIndex));
+            if(!rs.wasNull()) {
+              java.util.Date date = new java.util.Date(timestamp.getTime());
+              outValue = _dateFormatterOut.format(date);
+              _cal.setTime(date);
+              int offset = _cal.get(Calendar.ZONE_OFFSET)+
+                           _cal.get(Calendar.DST_OFFSET);
+              String tzOffset = StringUtil.zeroPaddingNumber(
+                  offset/_millisPerHour,2,2);
+              outValue = outValue+"+"+tzOffset;
+            }
+            break;
+          default:
+            outValue = "<unsupported value>";
+          theLog.printWarning("Unsupported Datatype: at " + valueIndex +
+                              " (" + aType + ")");
+        }
+      } catch (SQLException e) {
+        throw  new StorageObjectException("Could not get Value out of Resultset -- "
+            + e.getMessage());
+      }
+    }
+    return  outValue;
+  }
+
+      /*
+  *   select-Operator um einen Datensatz zu bekommen.
+  *   @param id Primaerschluessel des Datensatzes.
+  *   @return liefert EntityObject des gefundenen Datensatzes oder null.
+       */
+  public Entity selectById(String id)	throws StorageObjectException
+  {
+    if (id==null||id.equals(""))
+      throw new StorageObjectException("id war null");
+
+    // ask object store for object
+    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
+      String uniqueId = id;
+      if ( theEntityClass.equals(StorableObjectEntity.class) )
+        uniqueId+="@"+theTable;
+      StoreIdentifier search_sid = new StoreIdentifier(theEntityClass, uniqueId);
+      theLog.printDebugInfo("CACHE: (dbg) looking for sid " + search_sid.toString());
+      Entity hit = (Entity)o_store.use(search_sid);
+      if ( hit!=null ) return hit;
+    }
+
+    Statement stmt=null;Connection con=getPooledCon();
+    Entity returnEntity=null;
+    try {
+      ResultSet rs;
+      /** @todo better prepared statement */
+      String selectSql = "select * from " + theTable + " where " + thePKeyName + "=" + id;
+      stmt = con.createStatement();
+      rs = executeSql(stmt, selectSql);
+      if (rs != null) {
+        if (evaluatedMetaData==false) evalMetaData(rs.getMetaData());
+        if (rs.next())
+          returnEntity = makeEntityFromResultSet(rs);
+        else theLog.printDebugInfo("Keine daten fuer id: " + id + "in Tabelle" + theTable);
+        rs.close();
+      }
+      else {
+        theLog.printDebugInfo("No Data for Id " + id + " in Table " + theTable);
+      }
+    }
+    catch (SQLException sqe){
+      throwSQLException(sqe,"selectById"); return null;
+    }
+    catch (NumberFormatException e) {
+      theLog.printError("ID ist keine Zahl: " + id);
+    }
+    finally { freeConnection(con,stmt); }
+
+    /** @todo OS: Entity should be saved in ostore */
+    return returnEntity;
+  }
+
+
+  /**
+   *   select-Operator um Datensaetze zu bekommen, die key = value erfuellen.
+   *   @param key  Datenbankfeld der Bedingung.
+   *   @param value  Wert die der key anehmen muss.
+   *   @return EntityList mit den gematchten Entities
+   */
+  public EntityList selectByFieldValue(String aField, String aValue)
+      throws StorageObjectException
+  {
+    return selectByFieldValue(aField, aValue, 0);
+  }
+
+  /**
+   *   select-Operator um Datensaetze zu bekommen, die key = value erfuellen.
+   *   @param key  Datenbankfeld der Bedingung.
+   *   @param value  Wert die der key anehmen muss.
+   *   @param offset  Gibt an ab welchem Datensatz angezeigt werden soll.
+   *   @return EntityList mit den gematchten Entities
+   */
+  public EntityList selectByFieldValue(String aField, String aValue, int offset)
+      throws StorageObjectException
+  {
+    return selectByWhereClause(aField + "=" + aValue, offset);
+  }
+
+
+  /**
+   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
+   * Also offset wird der erste Datensatz genommen.
+   *
+   * @param wc where-Clause
+   * @return EntityList mit den gematchten Entities
+   * @exception StorageObjectException
+   */
+  public EntityList selectByWhereClause(String where)
+      throws StorageObjectException
+  {
+    return selectByWhereClause(where, 0);
+  }
+
+
+  /**
+   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
+   * Als maximale Anzahl wird das Limit auf der Konfiguration genommen.
+   *
+   * @param wc where-Clause
+   * @param offset ab welchem Datensatz.
+   * @return EntityList mit den gematchten Entities
+   * @exception StorageObjectException
+   */
+  public EntityList selectByWhereClause(String whereClause, int offset)
+      throws StorageObjectException
+  {
+    return selectByWhereClause(whereClause, null, offset);
+  }
+
+
+  /**
+   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
+   * Also offset wird der erste Datensatz genommen.
+   * Als maximale Anzahl wird das Limit auf der Konfiguration genommen.
+   *
+   * @param wc where-Clause
+   * @param ob orderBy-Clause
+   * @return EntityList mit den gematchten Entities
+   * @exception StorageObjectException
+   */
+
+  public EntityList selectByWhereClause(String where, String order)
+      throws StorageObjectException {
+    return selectByWhereClause(where, order, 0);
+  }
+
+
+  /**
+   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
+   * Als maximale Anzahl wird das Limit auf der Konfiguration genommen.
+   *
+   * @param wc where-Clause
+   * @param ob orderBy-Clause
+   * @param offset ab welchem Datensatz
+   * @return EntityList mit den gematchten Entities
+   * @exception StorageObjectException
+   */
+
+  public EntityList selectByWhereClause(String whereClause, String orderBy, int offset)
+      throws StorageObjectException {
+    return selectByWhereClause(whereClause, orderBy, offset, defaultLimit);
+  }
+
+
+  /**
+   * select-Operator liefert eine EntityListe mit den gematchten Datensätzen zurück.
+   * @param wc where-Clause
+   * @param ob orderBy-Clause
+   * @param offset ab welchem Datensatz
+   * @param limit wieviele Datensätze
+   * @return EntityList mit den gematchten Entities
+   * @exception StorageObjectException
+   */
+
+  public EntityList selectByWhereClause(String wc, String ob, int offset,
+                                        int limit) throws
+      StorageObjectException {
+
+    // check o_store for entitylist
+    if (StoreUtil.implementsStorableObject(theEntityClass)) {
+      StoreIdentifier search_sid =
+          new StoreIdentifier(theEntityClass,
+                              StoreContainerType.STOC_TYPE_ENTITYLIST,
+                              StoreUtil.getEntityListUniqueIdentifierFor(
+          theTable, wc, ob, offset, limit));
+      EntityList hit = (EntityList) o_store.use(search_sid);
+      if (hit != null) {
+        theLog.printDebugInfo("CACHE (hit): " + search_sid.toString());
+        return hit;
+      }
+    }
+
+    // local
+    EntityList theReturnList = null;
+    Connection con = null;
+    Statement stmt = null;
+    ResultSet rs;
+    int offsetCount = 0, count = 0;
+
+    // build sql-statement
+
+    /** @todo count sql string should only be assembled if we really count
+     *  see below at the end of method //rk */
+
+    if (wc != null && wc.length() == 0) {
+      wc = null;
+    }
+    StringBuffer countSql = new StringBuffer("select count(*) from ").append(
+        theTable);
+    StringBuffer selectSql = new StringBuffer("select * from ").append(theTable);
+    if (wc != null) {
+      selectSql.append(" where ").append(wc);
+      countSql.append(" where ").append(wc);
+    }
+    if (ob != null && ! (ob.length() == 0)) {
+      selectSql.append(" order by ").append(ob);
+    }
+    if (theAdaptor.hasLimit()) {
+      if (limit > -1 && offset > -1) {
+        selectSql.append(" limit ");
+        if (theAdaptor.reverseLimit()) {
+          selectSql.append(limit).append(",").append(offset);
+        }
+        else {
+          selectSql.append(offset).append(",").append(limit);
+        }
+      }
+    }
+
+    // execute sql
+    try {
+      con = getPooledCon();
+      stmt = con.createStatement();
+
+      // selecting...
+      rs = executeSql(stmt, selectSql.toString());
+      if (rs != null) {
+        if (!evaluatedMetaData)
+          evalMetaData(rs.getMetaData());
+
+        theReturnList = new EntityList();
+        Entity theResultEntity;
+        while (rs.next()) {
+          theResultEntity = makeEntityFromResultSet(rs);
+          theReturnList.add(theResultEntity);
+          offsetCount++;
+        }
+        rs.close();
+      }
+
+      // making entitylist infos
+      if (! (theAdaptor.hasLimit()))
+        count = offsetCount;
+
+      if (theReturnList != null) {
+        // now we decide if we have to know an overall count...
+        count = offsetCount;
+        if (limit > -1 && offset > -1) {
+          if (offsetCount == limit) {
+            /** @todo counting should be deffered to entitylist
+             *  getSize() should be used */
+            rs = executeSql(stmt, countSql.toString());
+            if (rs != null) {
+              if (rs.next())
+                count = rs.getInt(1);
+              rs.close();
+            }
+            else
+              theLog.printError("Could not count: " + countSql);
+          }
+        }
+        theReturnList.setCount(count);
+        theReturnList.setOffset(offset);
+        theReturnList.setWhere(wc);
+        theReturnList.setOrder(ob);
+        theReturnList.setStorage(this);
+        theReturnList.setLimit(limit);
+        if (offset >= limit)
+          theReturnList.setPrevBatch(offset - limit);
+        if (offset + offsetCount < count)
+          theReturnList.setNextBatch(offset + limit);
+        if (StoreUtil.implementsStorableObject(theEntityClass)) {
+          StoreIdentifier sid = theReturnList.getStoreIdentifier();
+          theLog.printDebugInfo("CACHE (add): " + sid.toString());
+          o_store.add(sid);
+        }
+      }
+    }
+    catch (SQLException sqe) {
+      throwSQLException(sqe, "selectByWhereClause");
+    }
+    finally {
+      try {
+        if (con != null)
+          freeConnection(con, stmt);
+      }
+      catch (Throwable t) {
+      }
+
+    }
+
+    return theReturnList;
+  }
+
+
+  /**
+   *  Bastelt aus einer Zeile der Datenbank ein EntityObjekt.
+   *
+   *  @param rs Das ResultSetObjekt.
+   *  @return Entity Die Entity.
+   */
+  private Entity makeEntityFromResultSet (ResultSet rs)
+      throws StorageObjectException
+  {
+    /** @todo OS: get Pkey from ResultSet and consult ObjectStore */
+    HashMap theResultHash = new HashMap();
+    String theResult = null;
+    int theType;
+    Entity returnEntity = null;
+    try {
+      int size = metadataFields.size();
+      for (int i = 0; i < size; i++) {
+        // alle durchlaufen bis nix mehr da
+
+        theType = metadataTypes[i];
+        if (theType == java.sql.Types.LONGVARBINARY) {
+          InputStreamReader is = (InputStreamReader)rs.getCharacterStream(i + 1);
+          if (is != null) {
+            char[] data = new char[32768];
+            StringBuffer theResultString = new StringBuffer();
+            int len;
+            while ((len = is.read(data)) > 0) {
+              theResultString.append(data, 0, len);
+            }
+            is.close();
+            theResult = theResultString.toString();
+          }
+          else {
+            theResult = null;
+          }
+        }
+        else {
+          theResult = getValueAsString(rs, (i + 1), theType);
+        }
+        if (theResult != null) {
+          theResultHash.put(metadataFields.get(i), theResult);
+        }
+      }
+      if (theEntityClass != null) {
+        returnEntity = (Entity)theEntityClass.newInstance();
+        returnEntity.setValues(theResultHash);
+        returnEntity.setStorage(myselfDatabase);
+        if ( returnEntity instanceof StorableObject ) {
+          theLog.printDebugInfo("CACHE: ( in) " + returnEntity.getId() + " :"+theTable);
+          o_store.add(((StorableObject)returnEntity).getStoreIdentifier());
+        }
+      } else {
+        throwStorageObjectException("Internal Error: theEntityClass not set!");
+      }
+    }
+    catch (IllegalAccessException e) {
+      throwStorageObjectException("No access! -- " + e.getMessage());
+    }
+    catch (IOException e) {
+      throwStorageObjectException("IOException! -- " + e.getMessage());
+    }
+    catch (InstantiationException e) {
+      throwStorageObjectException("No Instatiation! -- " + e.getMessage());
+    }
+    catch (SQLException sqe) {
+      throwSQLException(sqe, "makeEntityFromResultSet");
+      return  null;
+    }
+    return  returnEntity;
+  }
+
+  /**
+   * insert-Operator: fügt eine Entity in die Tabelle ein. Eine Spalte WEBDB_CREATE
+   * wird automatisch mit dem aktuellen Datum gefuellt.
+   *
+   * @param theEntity
+   * @return der Wert des Primary-keys der eingefügten Entity
+   */
+  public String insert (Entity theEntity) throws StorageObjectException {
+    //cache
+    invalidatePopupCache();
+
+    // invalidating all EntityLists corresponding with theEntityClass
+    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
+      StoreContainerType stoc_type =
+          StoreContainerType.valueOf( theEntityClass,
+          StoreContainerType.STOC_TYPE_ENTITYLIST);
+      o_store.invalidate(stoc_type);
+    }
+
+    String returnId = null;
+    Connection con = null; PreparedStatement pstmt = null;
+
+    try {
+      ArrayList streamedInput = theEntity.streamedInput();
+      StringBuffer f = new StringBuffer();
+      StringBuffer v = new StringBuffer();
+      String aField, aValue;
+      boolean firstField = true;
+      // make sql-string
+      for (int i = 0; i < getFields().size(); i++) {
+        aField = (String)getFields().get(i);
+        if (!aField.equals(thePKeyName)) {
+          aValue = null;
+          // sonderfaelle
+          if (aField.equals("webdb_create") ||
+              aField.equals("webdb_lastchange")) {
+            aValue = "NOW()";
+          }
+          else {
+            if (streamedInput != null && streamedInput.contains(aField)) {
+              aValue = "?";
+            }
+            else {
+              if (theEntity.hasValueForField(aField)) {
+                aValue = "'" + JDBCStringRoutines.escapeStringLiteral((String)theEntity.getValue(aField)) + "'";
+              }
+            }
+          }
+          // wenn Wert gegeben, dann einbauen
+          if (aValue != null) {
+            if (firstField == false) {
+              f.append(",");
+              v.append(",");
+            }
+            else {
+              firstField = false;
+            }
+            f.append(aField);
+            v.append(aValue);
+          }
+        }
+      }         // end for
+      // insert into db
+      StringBuffer sqlBuf = new StringBuffer("insert into ").append(theTable).append("(").append(f).append(") values (").append(v).append(")");
+      String sql = sqlBuf.toString();
+      theLog.printInfo("INSERT: " + sql);
+      con = getPooledCon();
+      con.setAutoCommit(false);
+      pstmt = con.prepareStatement(sql);
+      if (streamedInput != null) {
+        for (int i = 0; i < streamedInput.size(); i++) {
+          String inputString = (String)theEntity.getValue((String)streamedInput.get(i));
+          pstmt.setBytes(i + 1, inputString.getBytes());
+        }
+      }
+      int ret = pstmt.executeUpdate();
+      if(ret == 0){
+        //insert failed
+        return null;
+      }
+      pstmt = con.prepareStatement(theAdaptor.getLastInsertSQL((Database)myselfDatabase));
+      ResultSet rs = pstmt.executeQuery();
+      rs.next();
+      returnId = rs.getString(1);
+      theEntity.setId(returnId);
+    } catch (SQLException sqe) {
+      throwSQLException(sqe, "insert");
+    } finally {
+      try {
+        con.setAutoCommit(true);
+      } catch (Exception e) {
+        ;
+      }
+      freeConnection(con, pstmt);
+    }
+    /** @todo store entity in o_store */
+    return  returnId;
+  }
+
+  /**
+   * update-Operator: aktualisiert eine Entity. Eine Spalte WEBDB_LASTCHANGE
+   * wird automatisch mit dem aktuellen Datum gefuellt.
+   *
+   * @param theEntity
+   */
+  public void update (Entity theEntity) throws StorageObjectException
+  {
+    Connection con = null; PreparedStatement pstmt = null;
+    /** @todo this is stupid: why do we prepare statement, when we
+     *  throw it away afterwards. should be regular statement
+     *  update/insert could better be one routine called save()
+     *  that chooses to either insert or update depending if we
+     *  have a primary key in the entity. i don't know if we
+     *  still need the streamed input fields. // rk  */
+
+    /** @todo extension: check if Entity did change, otherwise we don't need
+     *  the roundtrip to the database */
+
+    /** invalidating corresponding entitylists in o_store*/
+    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
+      StoreContainerType stoc_type =
+          StoreContainerType.valueOf( theEntityClass,
+          StoreContainerType.STOC_TYPE_ENTITYLIST);
+      o_store.invalidate(stoc_type);
+    }
+
+    ArrayList streamedInput = theEntity.streamedInput();
+    String id = theEntity.getId();
+    String aField;
+    StringBuffer fv = new StringBuffer();
+    boolean firstField = true;
+    //cache
+    invalidatePopupCache();
+    // build sql statement
+    for (int i = 0; i < getFields().size(); i++) {
+      aField = (String)metadataFields.get(i);
+      // only normal cases
+      if (!(aField.equals(thePKeyName) || aField.equals("webdb_create") ||
+            aField.equals("webdb_lastchange") || (streamedInput != null && streamedInput.contains(aField)))) {
+        if (theEntity.hasValueForField(aField)) {
+          if (firstField == false) {
+            fv.append(", ");
+          }
+          else {
+            firstField = false;
+          }
+          fv.append(aField).append("='").append(JDBCStringRoutines.escapeStringLiteral((String) theEntity.getValue(aField))).append("'");
+
+//              fv.append(aField).append("='").append(StringUtil.quote((String)theEntity.getValue(aField))).append("'");
+        }
+      }
+    }
+    StringBuffer sql = new StringBuffer("update ").append(theTable).append(" set ").append(fv);
+    // exceptions
+    if (metadataFields.contains("webdb_lastchange")) {
+      sql.append(",webdb_lastchange=NOW()");
+    }
+    // special case: the webdb_create requires the field in yyyy-mm-dd HH:mm
+    // format so anything extra will be ignored. -mh
+    if (metadataFields.contains("webdb_create") &&
+        theEntity.hasValueForField("webdb_create")) {
+      // minimum of 10 (yyyy-mm-dd)...
+      if (theEntity.getValue("webdb_create").length() >= 10) {
+        String dateString = theEntity.getValue("webdb_create");
+        // if only 10, then add 00:00 so it doesn't throw a ParseException
+        if (dateString.length() == 10)
+          dateString=dateString+" 00:00";
+
+        // TimeStamp stuff
+        try {
+          java.util.Date d = _dateFormatterIn.parse(dateString);
+          Timestamp tStamp = new Timestamp(d.getTime());
+          sql.append(",webdb_create='"+tStamp.toString()+"'");
+        } catch (ParseException e) {
+          throw new StorageObjectException(e.getMessage());
+        }
+      }
+    }
+    if (streamedInput != null) {
+      for (int i = 0; i < streamedInput.size(); i++) {
+        sql.append(",").append(streamedInput.get(i)).append("=?");
+      }
+    }
+    sql.append(" where id=").append(id);
+    theLog.printInfo("UPDATE: " + sql);
+    // execute sql
+    try {
+      con = getPooledCon();
+      con.setAutoCommit(false);
+      pstmt = con.prepareStatement(sql.toString());
+      if (streamedInput != null) {
+        for (int i = 0; i < streamedInput.size(); i++) {
+          String inputString = theEntity.getValue((String)streamedInput.get(i));
+          pstmt.setBytes(i + 1, inputString.getBytes());
+        }
+      }
+      pstmt.executeUpdate();
+    }
+    catch (SQLException sqe) {
+      throwSQLException(sqe, "update");
+    }
+    finally {
+      try {
+        con.setAutoCommit(true);
+      } catch (Exception e) {
+        ;
+      }
+      freeConnection(con, pstmt);
+    }
+  }
+
+      /*
+  *   delete-Operator
+  *   @param id des zu loeschenden Datensatzes
+  *   @return boolean liefert true zurueck, wenn loeschen erfolgreich war.
+       */
+  public boolean delete (String id) throws StorageObjectException {
+
+    invalidatePopupCache();
+    // ostore send notification
+    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
+      String uniqueId = id;
+      if ( theEntityClass.equals(StorableObjectEntity.class) )
+        uniqueId+="@"+theTable;
+      theLog.printInfo("CACHE: (del) " + id);
+      StoreIdentifier search_sid =
+          new StoreIdentifier(theEntityClass, StoreContainerType.STOC_TYPE_ENTITY, uniqueId);
+      o_store.invalidate(search_sid);
+    }
+
+    /** @todo could be prepared Statement */
+    Statement stmt = null; Connection con = null;
+    int res = 0;
+    String sql="delete from "+theTable+" where "+thePKeyName+"='"+id+"'";
+    theLog.printInfo("DELETE " + sql);
+    try {
+      con = getPooledCon(); stmt = con.createStatement();
+      res = stmt.executeUpdate(sql);
+    }
+    catch (SQLException sqe) { throwSQLException(sqe, "delete"); }
+    finally { freeConnection(con, stmt); }
+
+    return  (res > 0) ? true : false;
+  }
+
+      /* noch nicht implementiert.
+  * @return immer false
+       */
+  public boolean delete (EntityList theEntityList) {
+    invalidatePopupCache();
+    return  false;
+  }
+
+  /**
+   * Diese Methode sollte ueberschrieben werden, wenn fuer die abgeleitete Database-Klasse
+   * eine SimpleList mit Standard-Popupdaten erzeugt werden koennen soll.
+   * @return null
+   */
+  public SimpleList getPopupData () throws StorageObjectException {
+    return  null;
+  }
+
+  /**
+   *  Holt Daten fuer Popups.
+   *  @param name  Name des Feldes.
+   *  @param hasNullValue  Wenn true wird eine leerer  Eintrag fuer die Popups erzeugt.
+   *  @return SimpleList Gibt freemarker.template.SimpleList zurueck.
+   */
+  public SimpleList getPopupData (String name, boolean hasNullValue)
+      throws StorageObjectException {
+    return  getPopupData(name, hasNullValue, null);
+  }
+
+  /**
+   *  Holt Daten fuer Popups.
+   *  @param name  Name des Feldes.
+   *  @param hasNullValue  Wenn true wird eine leerer  Eintrag fuer die Popups erzeugt.
+   *  @param where  Schraenkt die Selektion der Datensaetze ein.
+   *  @return SimpleList Gibt freemarker.template.SimpleList zurueck.
+   */
+  public SimpleList getPopupData (String name, boolean hasNullValue, String where) throws StorageObjectException {
+    return  getPopupData(name, hasNullValue, where, null);
+  }
+
+  /**
+   *  Holt Daten fuer Popups.
+   *  @param name  Name des Feldes.
+   *  @param hasNullValue  Wenn true wird eine leerer  Eintrag fuer die Popups erzeugt.
+   *  @param where  Schraenkt die Selektion der Datensaetze ein.
+   *  @param order  Gibt ein Feld als Sortierkriterium an.
+   *  @return SimpleList Gibt freemarker.template.SimpleList zurueck.
+   */
+  public SimpleList getPopupData (String name, boolean hasNullValue, String where, String order) throws StorageObjectException {
+    // caching
+    if (hasPopupCache && popupCache != null)
+      return  popupCache;
+    SimpleList simpleList = null;
+    Connection con = null;
+    Statement stmt = null;
+    // build sql
+    StringBuffer sql = new StringBuffer("select ").append(thePKeyName)
+                     .append(",").append(name).append(" from ")
+                     .append(theTable);
+    if (where != null && !(where.length() == 0))
+      sql.append(" where ").append(where);
+    sql.append(" order by ");
+    if (order != null && !(order.length() == 0))
+      sql.append(order);
+    else
+      sql.append(name);
+    // execute sql
+    try {
+      con = getPooledCon();
+    }
+    catch (Exception e) {
+      throw new StorageObjectException(e.getMessage());
+    }
+    try {
+      stmt = con.createStatement();
+      ResultSet rs = executeSql(stmt, sql.toString());
+
+      if (rs != null) {
+        if (!evaluatedMetaData) get_meta_data();
+        simpleList = new SimpleList();
+        // if popup has null-selector
+        if (hasNullValue) simpleList.add(POPUP_EMTYLINE);
+
+        SimpleHash popupDict;
+        while (rs.next()) {
+          popupDict = new SimpleHash();
+          popupDict.put("key", getValueAsString(rs, 1, thePKeyType));
+          popupDict.put("value", rs.getString(2));
+          simpleList.add(popupDict);
+        }
+        rs.close();
+      }
+    }
+    catch (Exception e) {
+      theLog.printError("getPopupData: "+e.getMessage());
+      throw new StorageObjectException(e.toString());
+    }
+    finally {
+      freeConnection(con, stmt);
+    }
+
+    if (hasPopupCache) popupCache = simpleList;
+    return  simpleList;
+  }
+
+  /**
+   * Liefert alle Daten der Tabelle als SimpleHash zurueck. Dies wird verwandt,
+   * wenn in den Templates ein Lookup-Table benoetigt wird. Sollte nur bei kleinen
+   * Tabellen Verwendung finden.
+   * @return SimpleHash mit den Tabellezeilen.
+   */
+  public SimpleHash getHashData () {
+    /** @todo dangerous! this should have a flag to be enabled, otherwise
+     *  very big Hashes could be returned */
+    if (hashCache == null) {
+      try {
+        hashCache = HTMLTemplateProcessor.makeSimpleHash(selectByWhereClause("",
+            -1));
+      }
+      catch (StorageObjectException e) {
+        theLog.printDebugInfo(e.getMessage());
+      }
+    }
+    return  hashCache;
+  }
+
+      /* invalidates the popupCache
+       */
+  protected void invalidatePopupCache () {
+    /** @todo  invalidates toooo much */
+    popupCache = null;
+    hashCache = null;
+  }
+
+  /**
+   * Diese Methode fuehrt den Sqlstring <i>sql</i> aus und timed im Logfile.
+   * @param stmt Statemnt
+   * @param sql Sql-String
+   * @return ResultSet
+   * @exception StorageObjectException
+   */
+  public ResultSet executeSql (Statement stmt, String sql)
+      throws StorageObjectException, SQLException
+  {
+    long startTime = System.currentTimeMillis();
+    ResultSet rs;
+    try {
+      rs = stmt.executeQuery(sql);
+      theLog.printInfo((System.currentTimeMillis() - startTime) + "ms. for: "
+                       + sql);
+    }
+    catch (SQLException e)
+    {
+      theLog.printDebugInfo("Failed: " + (System.currentTimeMillis()
+          - startTime) + "ms. for: "+ sql);
+      throw e;
+    }
+
+    return  rs;
+  }
+
+  /**
+   * Fuehrt Statement stmt aus und liefert Resultset zurueck. Das SQL-Statment wird
+   * getimed und geloggt.
+   * @param stmt PreparedStatement mit der SQL-Anweisung
+   * @return Liefert ResultSet des Statements zurueck.
+   * @exception StorageObjectException, SQLException
+   */
+  public ResultSet executeSql (PreparedStatement stmt)
+      throws StorageObjectException, SQLException {
+
+    long startTime = (new java.util.Date()).getTime();
+    ResultSet rs = stmt.executeQuery();
+    theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms.");
+    return  rs;
+  }
+
+  /**
+   * returns the number of rows in the table
+   */
+  public int getSize(String where)
+      throws SQLException,StorageObjectException
+  {
+    long  startTime = System.currentTimeMillis();
+    String sql = "SELECT Count(*) FROM "+ theTable;
+    if (where != null && !(where.length() == 0))
+      sql = sql + " where " + where;
+    Connection con = null;
+    Statement stmt = null;
+    int result = 0;
+
+    try {
+      con = getPooledCon();
+      stmt = con.createStatement();
+      ResultSet rs = executeSql(stmt,sql);
+      while(rs.next()){
+        result = rs.getInt(1);
+      }
+    }
+    catch (SQLException e) {
+      theLog.printError(e.getMessage());
+    }
+    finally {
+      freeConnection(con,stmt);
+    }
+    //theLog.printInfo(theTable + " has "+ result +" rows where " + where);
+    theLog.printInfo((System.currentTimeMillis() - startTime) + "ms. for: "
+                     + sql);
+    return result;
+  }
+
+  public int executeUpdate(Statement stmt, String sql)
+      throws StorageObjectException, SQLException
+  {
+    int rs;
+    long  startTime = (new java.util.Date()).getTime();
+    try
+    {
+      rs = stmt.executeUpdate(sql);
+      theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms. for: "
+                       + sql);
+    }
+    catch (SQLException e)
+    {
+      theLog.printDebugInfo("Failed: " + (new java.util.Date().getTime()
+          - startTime) + "ms. for: "+ sql);
+      throw e;
+    }
+    return rs;
+  }
+
+  public int executeUpdate(String sql) throws StorageObjectException, SQLException
+  {
+    int result=-1;
+    long  startTime = (new java.util.Date()).getTime();
+    Connection con=null;
+    PreparedStatement pstmt=null;
+    try {
+      con=getPooledCon();
+      pstmt = con.prepareStatement(sql);
+      result = pstmt.executeUpdate();
+    }
+    catch (Exception e) {
+      theLog.printDebugInfo("settimage :: setImage failed: "+e.getMessage());
+      throw new StorageObjectException("executeUpdate failed: "+e.getMessage());
+    }
+    finally {
+      freeConnection(con,pstmt);
+    }
+    theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms. for: " + sql);
+    return result;
+  }
+
+  /**
+   * Wertet ResultSetMetaData aus und setzt interne Daten entsprechend
+   * @param md ResultSetMetaData
+   * @exception StorageObjectException
+   */
+  private void evalMetaData (ResultSetMetaData md)
+      throws StorageObjectException {
+
+    this.evaluatedMetaData = true;
+    this.metadataFields = new ArrayList();
+    this.metadataLabels = new ArrayList();
+    this.metadataNotNullFields = new ArrayList();
+    try {
+      int numFields = md.getColumnCount();
+      this.metadataTypes = new int[numFields];
+      String aField;
+      int aType;
+      for (int i = 1; i <= numFields; i++) {
+        aField = md.getColumnName(i);
+        metadataFields.add(aField);
+        metadataLabels.add(md.getColumnLabel(i));
+        aType = md.getColumnType(i);
+        metadataTypes[i - 1] = aType;
+        if (aField.equals(thePKeyName)) {
+          thePKeyType = aType; thePKeyIndex = i;
+        }
+        if (md.isNullable(i) == md.columnNullable) {
+          metadataNotNullFields.add(aField);
+        }
+      }
+    } catch (SQLException e) {
+      throwSQLException(e, "evalMetaData");
+    }
+  }
+
+  /**
+   *  Wertet die Metadaten eines Resultsets fuer eine Tabelle aus,
+   *  um die alle Columns und Typen einer Tabelle zu ermitteln.
+   */
+  private void get_meta_data () throws StorageObjectException {
+    Connection con = null;
+    PreparedStatement pstmt = null;
+    String sql = "select * from " + theTable + " where 0=1";
+    try {
+      con = getPooledCon();
+      pstmt = con.prepareStatement(sql);
+      theLog.printInfo("METADATA: " + sql);
+      ResultSet rs = pstmt.executeQuery();
+      evalMetaData(rs.getMetaData());
+      rs.close();
+    } catch (SQLException e) {
+      throwSQLException(e, "get_meta_data");
+    } finally {
+      freeConnection(con, pstmt);
+    }
+  }
+
+
+  public Connection getPooledCon() throws StorageObjectException {
+              /* @todo , doublecheck but I'm pretty sure that this is unnecessary. -mh
+                      try{
+                      Class.forName("com.codestudio.sql.PoolMan").newInstance();
+              } catch (Exception e){
+                      throw new StorageObjectException("Could not find the PoolMan Driver"
+                          +e.toString());
+              }*/
+    Connection con = null;
+
+    try{
+      con = SQLManager.getInstance().requestConnection();
+    }
+    catch(SQLException e){
+      theLog.printError("could not connect to the database "+e.getMessage());
+      System.err.println("could not connect to the database "+e.getMessage());
+      throw new StorageObjectException("Could not connect to the database"+ e.getMessage());
+    }
+
+    return con;
+  }
+
+  public void freeConnection (Connection con, Statement stmt) throws StorageObjectException {
+    SQLManager.getInstance().closeStatement(stmt);
+    SQLManager.getInstance().returnConnection(con);
+  }
+
+  /**
+   * Wertet SQLException aus und wirft dannach eine StorageObjectException
+   * @param sqe SQLException
+   * @param wo Funktonsname, in der die SQLException geworfen wurde
+   * @exception StorageObjectException
+   */
+  protected void throwSQLException (SQLException sqe, String wo) throws StorageObjectException {
+    String state = "";
+    String message = "";
+    int vendor = 0;
+    if (sqe != null) {
+      state = sqe.getSQLState();
+      message = sqe.getMessage();
+      vendor = sqe.getErrorCode();
+    }
+    theLog.printError(state + ": " + vendor + " : " + message + " Funktion: "
+                      + wo);
+    throw new StorageObjectException((sqe == null) ? "undefined sql exception" :
+                                      sqe.getMessage());
+  }
+
+  protected void _throwStorageObjectException (Exception e, String wo)
+      throws StorageObjectException {
+
+    if (e != null) {
+      theLog.printError(e.getMessage()+ wo);
+      throw  new StorageObjectException(wo + e.getMessage());
+    }
+    else {
+      theLog.printError(wo);
+      throw  new StorageObjectException(wo);
+    }
+
+  }
+
+  /**
+   * Loggt Fehlermeldung mit dem Parameter Message und wirft dannach
+   * eine StorageObjectException
+   * @param message Nachricht mit dem Fehler
+   * @exception StorageObjectException
+   */
+  void throwStorageObjectException (String message)
+      throws StorageObjectException {
+    _throwStorageObjectException(null, message);
+  }
+
+}
+
+
+
diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java
index 6e66358f..6d0e6c6e 100755
--- a/source/mircoders/entity/EntityImages.java
+++ b/source/mircoders/entity/EntityImages.java
@@ -54,7 +54,7 @@ import mir.storage.*;
  * Diese Klasse enthält die Daten eines MetaObjekts
  *
  * @author RK, mh, mir-coders
- * @version $Id: EntityImages.java,v 1.12 2002/12/06 08:08:14 mh Exp $
+ * @version $Id: EntityImages.java,v 1.13 2002/12/17 19:20:31 zapata Exp $
  */
 
 
@@ -144,7 +144,9 @@ public class EntityImages extends EntityUploadedMedia
         java.sql.Connection jCon;
         jCon = ((com.codestudio.sql.PoolManConnectionHandle)con)
              .getNativeConnection();
-        lom = ((org.postgresql.Connection)jCon).getLargeObjectAPI();
+
+        lom = ((org.postgresql.Connection) jCon).getLargeObjectAPI();
+
         int oidImage = lom.create();
         int oidIcon = lom.create();
         LargeObject lobImage = lom.open(oidImage);
diff --git a/source/mircoders/media/MediaHandlerImages.java b/source/mircoders/media/MediaHandlerImages.java
index b529aa3a..50952583 100755
--- a/source/mircoders/media/MediaHandlerImages.java
+++ b/source/mircoders/media/MediaHandlerImages.java
@@ -59,7 +59,7 @@ import mircoders.entity.EntityImages;
  *
  * @see mir.media.MirMedia
  * @author mh
- * @version $Id: MediaHandlerImages.java,v 1.14 2002/12/01 15:05:51 zapata Exp $
+ * @version $Id: MediaHandlerImages.java,v 1.15 2002/12/17 19:20:31 zapata Exp $
  */
 
 
@@ -93,6 +93,7 @@ public abstract class MediaHandlerImages implements MirMedia
       ((EntityImages)ent).setImage(in, getType());
     }
     catch ( StorageObjectException e) {
+      e.printStackTrace(System.out);
       theLog.printError("MediaHandlerImages.set: "+e.getMessage());
       throw new MirMediaException(e.getMessage());
     }
diff --git a/source/mircoders/media/MediaRequest.java b/source/mircoders/media/MediaRequest.java
index a9939eaf..104c3888 100755
--- a/source/mircoders/media/MediaRequest.java
+++ b/source/mircoders/media/MediaRequest.java
@@ -55,7 +55,7 @@ import mir.media.*;
  *    appropriate media objects are set.
  *
  * @author mh
- * @version $Id: MediaRequest.java,v 1.9 2002/12/01 15:05:51 zapata Exp $
+ * @version $Id: MediaRequest.java,v 1.10 2002/12/17 19:20:31 zapata Exp $
  *
  */
 
@@ -242,6 +242,7 @@ public class MediaRequest implements FileHandler
         mediaHandler.set(filePart.getInputStream(), mediaEnt, mediaType);
       }
       catch (MirMediaException e) {
+        e.printStackTrace(System.out);
         throw new FileHandlerException(e.getMessage());
       }
       try {
diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index b22ea33e..68b92d01 100755
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -84,7 +84,7 @@ import mircoders.search.*;
  *    open-postings to the newswire
  *
  * @author mir-coders group
- * @version $Id: ServletModuleOpenIndy.java,v 1.50 2002/12/14 17:36:17 zapata Exp $
+ * @version $Id: ServletModuleOpenIndy.java,v 1.51 2002/12/17 19:20:31 zapata Exp $
  *
  */
 
@@ -197,6 +197,7 @@ public class ServletModuleOpenIndy extends ServletModule
             withValues.put(k,StringUtil.removeHTMLTags(v));
           }
           withValues.put("is_published","1");
+          withValues.put("to_comment_status","1");
 
           //checking the onetimepasswd
           if(passwdProtection.equals("yes")){
@@ -261,10 +262,13 @@ public class ServletModuleOpenIndy extends ServletModule
     }
 
     String maxMedia = MirConfig.getProp("ServletModule.OpenIndy.MaxMediaUploadItems");
+    String defaultMedia = MirConfig.getProp("ServletModule.OpenIndy.DefaultMediaUploadItems");
     String numOfMedia = req.getParameter("medianum");
+
     if(numOfMedia==null||numOfMedia.equals("")){
-      numOfMedia="1";
-    } else if(Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {
+      numOfMedia=defaultMedia;
+    }
+    else if(Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {
       numOfMedia = maxMedia;
     }
 
@@ -417,7 +421,10 @@ public class ServletModuleOpenIndy extends ServletModule
         throw new ServletModuleException(t.getMessage());
       }
     }
-    catch (FileHandlerException e) { throw new ServletModuleException("MediaException: "+ e.getMessage());}
+    catch (FileHandlerException e) {
+      e.printStackTrace(System.out);
+      throw new ServletModuleException("MediaException: "+ e.getMessage());
+    }
     catch (IOException e) { throw new ServletModuleException("IOException: "+ e.getMessage());}
     catch (StorageObjectException e) { throw new ServletModuleException("StorageObjectException" + e.getMessage());}
     catch (ModuleException e) { throw new ServletModuleException("ModuleException"+e.getMessage());}
diff --git a/templates/admin/login.template b/templates/admin/login.template
index 84db557f..a3a6c360 100755
--- a/templates/admin/login.template
+++ b/templates/admin/login.template
@@ -1,80 +1,78 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
   <head>
-        <title>${config["Mir.Name"]} | ${lang("login.htmltitle")}</title>
-        <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
-	<script language="JavaScript">
-	function placeFocus() {
-			document.forms[0].elements[1].focus();
-	}
-	</script>
-
+    <title>${config["Mir.Name"]} | ${lang("login.htmltitle")}</title>
+    <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+    <script language="JavaScript">
+      function placeFocus() {
+        document.forms[0].elements[1].focus();
+      }
+    </script>
   </head>
   <body onLoad="placeFocus()" marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
-
-  	<include "templates/admin/head_nonavi.template">
+    <include "templates/admin/head_nonavi.template">
     <center>
-	<p><span class="small">
-        ${lang("login.info")}
-        <a href="mailto:${config["Mir.Contact-email.address"]}"><span class="spezialtext">${config["Mir.Contact-email.name"]}</span></a>.
-        </span></p>
-	<hr>
-    <form method="post" action="${config.actionRoot}">
-    	<input type="hidden" name="module" value="login">
-		<table border="0" cellpadding="2" cellspacing="0" class="dark">
-	  		<tr class="darkgrey">
-	  			<td colspan="2" align="center">
-	  				<span class="witetext">
-		  			<b>${lang("login.title")}</b></span>
-	  			</td>
-	  		</tr>
-	  		<tr>
-	  			<td align="right">
-	  				<span class="witetext">${lang("login.name")}</span>
-	  			</td>
-	  			<td>
-	  				<input type="text" name="login" size="15">
-	  			</td>
-	  		</tr>
-	  		<tr>
-	  			<td align="right">
-	  				<span class="witetext">${lang("login.password")}</span>
-	  			</td>
-	  			<td>
-	  				<input type="password" name="password" size="15">
-	  			</td>
-	  		</tr>
-	  		<tr>
-	  			<td align="right">
-	  				<span class="witetext">${lang("login.language")}</span>
-	  			</td>
-	  			<td>
-	  				<select name="lang">
-                    <!-- this language selection should be solved better
-                            - list all available languages
-                    -->
-
-	  				<option value="en">${lang("login.language.en")}</option>
-	  				<option value="de">${lang("login.language.de")}</option>
-            <option value="es">${lang("login.language.es")}</option>
-            <option value="ay">${lang("login.language.ay")}</option>
-            <option value="gn"">${lang("login.language.gn")}</option>
-            <option value="qu"">${lang("login.language.qu")}</option>
-            <option value="tr">${lang("login.language.tr")}</option>
-
-            </select>
+      <p>
+        <span class="small">
+          ${lang("login.info", 
+                 "<a href=\"mailto:" + config["Mir.Contact-email.address"] +
+                 "\"><span class=\"spezialtext\">" + 
+                 config["Mir.Contact-email.name"] + 
+                 "</span></a>"
+                 )
+           }
+        </span>
+      </p>
+	    <hr>
 
-	  			</td>
-	  		</tr>
-	  		<tr>
-	  			<td align="left">&nbsp;</td>
-	  			<td align="left">
-	  				<input type="submit" value="${lang("login.submit")}">
-	  			</td>
-	  		</tr>
-		</table>
-    </form>
-	<include "templates/admin/foot.template">
+      <form method="post" action="${config.actionRoot}">
+        <input type="hidden" name="module" value="login">
+        <table border="0" cellpadding="2" cellspacing="0" class="dark">
+          <tr class="darkgrey">
+            <td colspan="2" align="center">
+              <span class="witetext">
+                <b>${lang("login.title")}</b>
+              </span>
+            </td>
+          </tr>
+          <tr>
+            <td align="right">
+              <span class="witetext">${lang("login.name")}</span>
+            </td>
+            <td>
+              <input type="text" name="login" size="15">
+            </td>
+          </tr>
+          <tr>
+            <td align="right">
+              <span class="witetext">${lang("login.password")}</span>
+            </td>
+            <td>
+              <input type="password" name="password" size="15">
+            </td>
+          </tr>
+          <tr>
+            <td align="right">
+              <span class="witetext">${lang("login.language")}</span>
+            </td>
+            <td>
+              <select name="language">
+                <list data.languages as l>
+                  <option value="${l.code}" <if l.code==data.defaultlanguage>selected</if> >${l.name}</option>
+                </list>
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td align="left">&nbsp;</td>
+            <td align="left">
+              <input type="submit" value="${lang("login.submit")}">
+            </td>
+          </tr>
+        </table>
+      </form>
+    </center>
+	  <include "templates/admin/foot.template">
   </body>
 </html>