bugfixes mainly...

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

diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java
index d495f0b..c4635c9 100755 (executable)
--- a/source/mircoders/entity/EntityImages.java
+++ b/source/mircoders/entity/EntityImages.java
@@ -64,9 +64,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 +89,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 +97,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 +183,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();
                        }