Mir goes GPL

[mir.git] / source / mircoders / entity / EntityImages.java

diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java
index d495f0b..75da1ee 100755 (executable)
--- a/source/mircoders/entity/EntityImages.java
+++ b/source/mircoders/entity/EntityImages.java
@@ -1,3 +1,34 @@
+/*
+ * 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 mircoders.entity;
 
 import java.lang.*;
@@ -64,9 +95,7 @@ public class EntityImages extends EntityUploadedMedia
               if (rs.next()) {
                 LargeObject lob = lom.open(rs.getInt(1));
                 img_data = lob.read(lob.size());
-                System.err.println("LOB IMG SIZE: "+lob.size());
                 lob.close();
-                System.err.println("res set img NOT NULL2");
                 //img_data = rs.getBytes(1);
               }
             rs.close();
@@ -91,7 +120,7 @@ public class EntityImages extends EntityUploadedMedia
                return img_data;
        }
 
-       public void setImage(byte[] uploadData)
+       public void setImage(byte[] uploadData, String type)
            throws StorageObjectException {
 
                if (uploadData!=null) {
@@ -99,13 +128,14 @@ public class EntityImages extends EntityUploadedMedia
                        try {
 
                                theLog.printDebugInfo("settimage :: making internal representation of image");
-                               WebdbImage webdbImage= new WebdbImage(uploadData);
+                               WebdbImage webdbImage= new WebdbImage(uploadData, type);
                                theLog.printDebugInfo("settimage :: made internal representation of image");
                                byte[] imageData = webdbImage.getImage();
                                theLog.printDebugInfo("settimage :: getImage");
                                byte[] iconData = webdbImage.getIcon();
                                theLog.printDebugInfo("settimage :: getIcon");
 
+
                                if (iconData!=null && imageData!=null) {
                                        con = theStorageObject.getPooledCon();
                                        con.setAutoCommit(false);
@@ -184,15 +214,11 @@ public class EntityImages extends EntityUploadedMedia
                     .getNativeConnection();
             lom = ((org.postgresql.Connection)jCon).getLargeObjectAPI();
                        if(rs!=null) {
-                System.err.println("res set NOT NULL");
                                if (rs.next()) {
                   LargeObject lob = lom.open(rs.getInt(1));
                   img_data = lob.read(lob.size());
-                  System.err.println("LOB SIZE: "+lob.size());
                   lob.close();
-                  System.err.println("res set NOT NULL2");
                   //img_data = rs.getBytes(1);
-                  System.err.println("res set NOT NULL3");
                                }
                 rs.close();
                        }