X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fentity%2FEntityImages.java;h=019ee22cf2f1c3e1d885493b0f89e2889a0d32c5;hb=d74a52d5f65389e5cf89d3fcf14d07afbb78a9f9;hp=6e66358fd7d6462b0288016c33605be2c5b7b9d5;hpb=d4e7323204edc2c3bcebaec8fc0cc04f1fd10560;p=mir.git diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java index 6e66358f..019ee22c 100755 --- a/source/mircoders/entity/EntityImages.java +++ b/source/mircoders/entity/EntityImages.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001, 2002 The Mir-coders group + * Copyright (C) 2001, 2002 The Mir-coders group * * This file is part of Mir. * @@ -18,169 +18,81 @@ * 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. + * the code of this program with 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.*; -import java.io.*; -import java.util.*; -import java.sql.*; - -/* - * kind of hack for postgres non-standard LargeObjects that Poolman - * doesn't know about. see all the casting, LargeObj stuff in getIcon, getImage - * at some point when postgres has normal BLOB support, this should go. - */ -import org.postgresql.Connection; -import org.postgresql.largeobject.LargeObject; -import org.postgresql.largeobject.LargeObjectManager; -import org.postgresql.largeobject.BlobInputStream; - -import mir.entity.*; -import mir.misc.*; -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 $ - */ +import mir.log.LoggerWrapper; +import mir.media.image.ImageMagickImageProcessor; +import mir.media.image.ImageProcessor; +import mir.storage.DatabaseFailure; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.sql.SQLException; public class EntityImages extends EntityUploadedMedia { + private int maxImageSize = configuration.getInt("Producer.Image.MaxSize"); + private int maxIconSize = configuration.getInt("Producer.Image.MaxIconSize"); + private float minDescaleRatio = configuration.getFloat("Producer.Image.MinDescalePercentage")/100; + private int minDescaleReduction = configuration.getInt("Producer.Image.MinDescaleReduction"); + public EntityImages() { super(); } - public EntityImages(StorageObject theStorage) { - this(); - setStorage(theStorage); - } - - // - // methods - - - public InputStream getImage() throws StorageObjectException - { - theLog.printDebugInfo("--getimage started"); - java.sql.Connection con=null;Statement stmt=null; - BlobInputStream in; InputStream img_in = null; - + /** + * Retrieves the image data + */ + public byte[] getImage() throws DatabaseFailure { try { - con = theStorageObject.getPooledCon(); - con.setAutoCommit(false); - LargeObjectManager lom; - java.sql.Connection jCon; - stmt = con.createStatement(); - ResultSet rs = theStorageObject.executeSql(stmt, - "select image_data from images where id="+getId()); - jCon = ((com.codestudio.sql.PoolManConnectionHandle)con) - .getNativeConnection(); - lom = ((org.postgresql.Connection)jCon).getLargeObjectAPI(); - if(rs!=null) { - if (rs.next()) { - LargeObject lob = lom.open(rs.getInt(1)); - in = (BlobInputStream)lob.getInputStream(); - img_in = new ImageInputStream(in, con, stmt); - } - rs.close(); - } + return database.getBinaryField("select image_data from images where id="+getId()); } - catch (Exception e) { - e.printStackTrace(); - theLog.printError("EntityImages -- getImage failed"+e.toString()); - try { - con.setAutoCommit(true); - } catch (Exception e2) { - e.printStackTrace(); - theLog.printError( - "EntityImages -- getImage reseting transaction mode failed" - +e2.toString()); - } - theStorageObject.freeConnection(con,stmt); - throwStorageObjectException(e, "EntityImages -- getImage failed: "); + catch (SQLException e) { + throw new DatabaseFailure(e); } - //} - return img_in; } - public void setImage(InputStream in, String type) - throws StorageObjectException { - - if (in!=null) { - java.sql.Connection con=null;PreparedStatement pstmt=null; - File f = null; + /** + * Processes and saves image data + */ + public void setImage(InputStream anInputStream, String type) throws DatabaseFailure { + if (anInputStream != null) { try { + ImageProcessor processor = new ImageMagickImageProcessor(anInputStream); - theLog.printDebugInfo("settimage :: making internal representation of image"); + processor.descaleImage(maxImageSize, minDescaleRatio, minDescaleReduction); - File tempDir = new File(MirConfig.getProp("TempDir")); - f = File.createTempFile("mir", ".tmp", tempDir); - FileUtil.write(f, in); - WebdbImage webdbImage= new WebdbImage(f, type); - theLog.printDebugInfo("settimage :: made internal representation of image"); + ByteArrayOutputStream imageData = new ByteArrayOutputStream(); + processor.writeScaledData(imageData, type); + database.setBinaryField("image_data", getId(), imageData.toByteArray()); - con = theStorageObject.getPooledCon(); - con.setAutoCommit(false); - theLog.printDebugInfo("settimage :: trying to insert image"); + setFieldValue("img_height", Integer.toString(processor.getScaledHeight())); + setFieldValue("img_width", Integer.toString(processor.getScaledWidth())); - // setting values - LargeObjectManager lom; - java.sql.Connection jCon; - jCon = ((com.codestudio.sql.PoolManConnectionHandle)con) - .getNativeConnection(); - lom = ((org.postgresql.Connection)jCon).getLargeObjectAPI(); - int oidImage = lom.create(); - int oidIcon = lom.create(); - LargeObject lobImage = lom.open(oidImage); - LargeObject lobIcon = lom.open(oidIcon); - webdbImage.setImage(lobImage.getOutputStream()); - webdbImage.setIcon(lobIcon.getOutputStream()); - lobImage.close(); - lobIcon.close(); + imageData.reset(); + processor.descaleImage(maxIconSize, minDescaleRatio, minDescaleReduction); + processor.writeScaledData(imageData, type); + database.setBinaryField("icon_data", getId(), imageData.toByteArray()); - setValueForProperty("img_height", - new Integer(webdbImage.getImageHeight()).toString()); - setValueForProperty("img_width", - new Integer(webdbImage.getImageWidth()).toString()); - setValueForProperty("icon_height", - new Integer(webdbImage.getIconHeight()).toString()); - setValueForProperty("icon_width", - new Integer(webdbImage.getIconWidth()).toString()); - setValueForProperty("image_data", new Integer(oidImage).toString()); - setValueForProperty("icon_data", new Integer(oidIcon).toString()); + setFieldValue("icon_height", Integer.toString(processor.getScaledHeight())); + setFieldValue("icon_width", Integer.toString(processor.getScaledWidth())); + processor.cleanup(); update(); } catch (Exception e) { - throwStorageObjectException(e, "settimage :: setImage gescheitert: "); - } - finally { - try { - if (con!=null) - con.setAutoCommit(true); - // get rid of the temp. file - f.delete(); - } - catch (Exception e) { - } - - if (con!=null) - theStorageObject.freeConnection(con,pstmt); + throw new DatabaseFailure(e); } } } @@ -191,84 +103,12 @@ public class EntityImages extends EntityUploadedMedia * * It will also take care of closing the OutputStream. */ - public InputStream getIcon() throws StorageObjectException - { - java.sql.Connection con=null;Statement stmt=null; - BlobInputStream in=null;ImageInputStream img_in=null; - + public byte[] getIcon() throws DatabaseFailure { try { - con = theStorageObject.getPooledCon(); - con.setAutoCommit(false); - LargeObjectManager lom; - java.sql.Connection jCon; - stmt = con.createStatement(); - ResultSet rs = theStorageObject.executeSql(stmt, - "select icon_data from images where id="+getId()); - jCon = ((com.codestudio.sql.PoolManConnectionHandle)con) - .getNativeConnection(); - lom = ((org.postgresql.Connection)jCon).getLargeObjectAPI(); - if(rs!=null) { - if (rs.next()) { - LargeObject lob = lom.open(rs.getInt(1)); - in = (BlobInputStream)lob.getInputStream(); - img_in = new ImageInputStream( in, con ,stmt); - //img_data = rs.getBytes(1); - } - rs.close(); - } - } - catch (Exception e) { - e.printStackTrace(); - theLog.printError("EntityImages -- getIcon failed"+e.toString()); - try { - con.setAutoCommit(true); - } - catch (Exception e2) { - e.printStackTrace(); - theLog.printError( - "EntityImages -- getIcon reseting transaction mode failed" - +e2.toString()); - } - theStorageObject.freeConnection(con,stmt); - throwStorageObjectException(e, "EntityImages -- getIcon failed:"); - } - - return img_in; - } - - /** - * a small wrapper class that allows us to store the DB connection resources - * that the BlobInputStream is using and free them upon closing of the stream - */ - private class ImageInputStream extends InputStream { - - InputStream _in; - java.sql.Connection _con; - Statement _stmt; - - public ImageInputStream(BlobInputStream in, java.sql.Connection con, - Statement stmt ) - { - _in = in; - _con = con; - _stmt = stmt; - } - - public void close () throws IOException { - _in.close(); - - try { - _con.setAutoCommit(true); - theStorageObject.freeConnection(_con,_stmt); - } - catch (Exception e) { - throw new IOException("close(): "+e.toString()); - } + return database.getBinaryField("select icon_data from images where id="+getId()); } - - public int read() throws IOException { - return _in.read(); + catch (SQLException e) { + throw new DatabaseFailure(e); } - } }