merge of localization branch into HEAD. mh and zap
[mir.git] / source / mir / storage / Database.java
index 9f56efc..d82264c 100755 (executable)
@@ -7,6 +7,8 @@ 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.*;
@@ -25,8 +27,26 @@ import  mir.misc.*;
  * Treiber, Host, User und Passwort, ueber den der Zugriff auf die
  * Datenbank erfolgt.
  *
- * @author RK
- * @version 16.7.1999
+ * @version $Revision: 1.22 $ $Date: 2002/08/25 19:00:09 $
+ * @author $Author: mh $
+ *
+ * $Log: Database.java,v $
+ * Revision 1.22  2002/08/25 19:00:09  mh
+ * merge of localization branch into HEAD. mh and zap
+ *
+ * Revision 1.21  2002/08/04 23:38:22  mh
+ * fix up the webdb_create update stuff
+ *
+ * Revision 1.20  2002/07/21 22:32:25  mh
+ * on insert, the "webdb_lastchange" field should get a value
+ *
+ * Revision 1.19  2002/06/29 15:44:46  mh
+ * make the webdb_create update be called webdb_create_update. it breaks things otherwise. a fixme case I know..
+ *
+ * Revision 1.18  2002/06/28 20:42:13  mh
+ * added necessary bits in templates and Database.java to make webdb_create modifiable. make the conversion from sql/Timestamp to String more robust
+ *
+ *
  */
 public class Database implements StorageObject {
 
@@ -52,6 +72,14 @@ public class Database implements StorageObject {
                                       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
@@ -249,17 +277,24 @@ public class Database implements StorageObject {
                                        case java.sql.Types.LONGVARBINARY:
                                                outValue = rs.getString(valueIndex);
                                                //if (outValue != null)
-                                                       //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
+                                               //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));
                                                break;
                                        case java.sql.Types.TIMESTAMP:
-                                               //Timestamp timestamp = (rs.getTimestamp(valueIndex));
-                                               //jbdc drops time zone info, 
-                                               //so just get the string from 
-                                               //postgres
-                                               String timestamp = (rs.getString(valueIndex));
-                                               if (!rs.wasNull()) {
-                                                       outValue = 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>";
@@ -560,11 +595,11 @@ public class Database implements StorageObject {
                        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) {
-                                       InputStream us = rs.getAsciiStream(i + 1);
-                                       if (us != null) {
-                                               InputStreamReader is = new InputStreamReader(us);
+                                       InputStreamReader is = (InputStreamReader)rs.getCharacterStream(i + 1);
+                                       if (is != null) {
                                                char[] data = new char[32768];
                                                StringBuffer theResultString = new StringBuffer();
                                                int len;
@@ -643,7 +678,8 @@ public class Database implements StorageObject {
                                if (!aField.equals(thePKeyName)) {
                                        aValue = null;
                                        // sonderfaelle
-                                       if (aField.equals("webdb_create")) {
+                                       if (aField.equals("webdb_create") ||
+              aField.equals("webdb_lastchange")) {
                                                aValue = "NOW()";
                                        }
                                        else {
@@ -764,6 +800,27 @@ public class Database implements StorageObject {
                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.toString());
+        }
+      }
+               }
                if (streamedInput != null) {
                        for (int i = 0; i < streamedInput.size(); i++) {
                                sql.append(",").append(streamedInput.get(i)).append("=?");
@@ -1008,7 +1065,9 @@ public class Database implements StorageObject {
                throws SQLException,StorageObjectException
        {
                long  startTime = System.currentTimeMillis();
-               String sql = "SELECT count(*) FROM "+ theTable + " where " + where;
+               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;