svn commit: r739042 - in /ofbiz/trunk/applications/prod
Locked
svn commit: r739042 - in /ofbiz/trunk/applications/prod
 
|
Author: jleroux
Date: Thu Jan 29 22:06:32 2009 New Revision: 739042 URL: http://svn.apache.org/viewvc?rev=739042&view=rev Log: A modified patch from Eric De Maulde "Product image auto scale" '(https://issues.apache.org/jira/browse/OFBIZ-2128) - OFBIZ-2128 I simply added a dynamic directories creation. This patch works but maybe we could use and API for better result (see Jira issue) Added: ofbiz/trunk/applications/product/config/ImageProperties.xml ofbiz/trunk/applications/product/src/org/ofbiz/image/ ofbiz/trunk/applications/product/src/org/ofbiz/image/ImageTransform.java Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/config/catalog.properties ofbiz/trunk/applications/product/data/ProductTypeData.xml ofbiz/trunk/applications/product/entitydef/entitymodel.xml ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl Added: ofbiz/trunk/applications/product/config/ImageProperties.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ImageProperties.xml?rev=739042&view=auto ============================================================================== --- ofbiz/trunk/applications/product/config/ImageProperties.xml (added) +++ ofbiz/trunk/applications/product/config/ImageProperties.xml Thu Jan 29 22:06:32 2009 @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<imageSize xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <format name="extension" value="jpg"/> + <size name="small"> + <dimension name="height" value="100"/> + <dimension name="width" value="100"/> + </size> + <size name="medium"> + <dimension name="height" value="200"/> + <dimension name="width" value="200"/> + </size> + <size name="large"> + <dimension name="height" value="600"/> + <dimension name="width" value="600"/> + </size> + <size name="detail"> + <dimension name="height" value="1500"/> + <dimension name="width" value="1500"/> + </size> +</imageSize> Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=739042&r1=739041&r2=739042&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Jan 29 22:06:32 2009 @@ -13898,6 +13898,18 @@ <value xml:lang="th">à¸à¸µà¹à¸¡à¸²à¸£à¸«à¸±à¸ªà¸à¸µà¹à¸à¸¢à¸¹à¹à¹à¸à¸£à¸©à¸à¸µà¸¢à¹</value> <value xml:lang="zh">åºåå°éä¿¡å°åæ è¯</value> </property> + <property key="ProductOriginal"> + <value xml:lang="en">Original</value> + <value xml:lang="fr">Original</value> + </property> + <property key="ProductOriginalImage"> + <value xml:lang="en">Original Image</value> + <value xml:lang="fr">Image originale</value> + </property> + <property key="ProductOriginalImageMessage"> + <value xml:lang="en">Automatic scale of the original image, related to the configuration</value> + <value xml:lang="fr">Redimensionne en automatique l'original de l'image, suivant la configuration</value> + </property> <property key="ProductOutgoingProductionRuns"> <value xml:lang="de">Ausgehende Produktionsaufträge</value> <value xml:lang="en">Outgoing Production Runs</value> Modified: ofbiz/trunk/applications/product/config/catalog.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/catalog.properties?rev=739042&r1=739041&r2=739042&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/catalog.properties (original) +++ ofbiz/trunk/applications/product/config/catalog.properties Thu Jan 29 22:06:32 2009 @@ -26,6 +26,7 @@ # -- The prefix to put on auto-generated image urls (can be relative or absolute, whatever you want) image.url.prefix=/images image.filename.format=${location}/${type}/${id} +image.filename.additionalviewsize.format=${location}/${viewtype}/${sizetype}/${id} # -- Which default top category to display... -- top.category.default=CATALOG1 Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=739042&r1=739041&r2=739042&view=diff ============================================================================== --- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original) +++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Thu Jan 29 22:06:32 2009 @@ -227,6 +227,7 @@ <ProductContentType description="Image - Medium" hasTable="N" parentTypeId="" productContentTypeId="MEDIUM_IMAGE_URL"/> <ProductContentType description="Image - Large" hasTable="N" parentTypeId="" productContentTypeId="LARGE_IMAGE_URL"/> <ProductContentType description="Image - Detail" hasTable="N" parentTypeId="" productContentTypeId="DETAIL_IMAGE_URL"/> + <ProductContentType description="Image - Original" hasTable="N" parentTypeId="" productContentTypeId="ORIGINAL_IMAGE_URL"/> <ProductContentType description="Image Alt Text - Small" hasTable="N" parentTypeId="" productContentTypeId="SMALL_IMAGE_ALT"/> <ProductContentType description="Image Alt Text - Medium" hasTable="N" parentTypeId="" productContentTypeId="MEDIUM_IMAGE_ALT"/> <ProductContentType description="Image Alt Text - Large" hasTable="N" parentTypeId="" productContentTypeId="LARGE_IMAGE_ALT"/> Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=739042&r1=739041&r2=739042&view=diff ============================================================================== --- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Thu Jan 29 22:06:32 2009 @@ -2542,6 +2542,7 @@ <field name="mediumImageUrl" type="url"></field> <field name="largeImageUrl" type="url"></field> <field name="detailImageUrl" type="url"></field> + <field name="originalImageUrl" type="url"></field> <field name="detailScreen" type="long-varchar"></field> <field name="inventoryMessage" type="description"></field> <field name="requireInventory" type="indicator"></field> Added: ofbiz/trunk/applications/product/src/org/ofbiz/image/ImageTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/image/ImageTransform.java?rev=739042&view=auto ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/image/ImageTransform.java (added) +++ ofbiz/trunk/applications/product/src/org/ofbiz/image/ImageTransform.java Thu Jan 29 22:06:32 2009 @@ -0,0 +1,451 @@ +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ +package org.ofbiz.image; + +import java.awt.geom.AffineTransform; +import java.awt.image.AffineTransformOp; +import java.awt.image.BufferedImage; +import java.awt.image.ImagingOpException; +import java.awt.RenderingHints; +import java.awt.RenderingHints.Key; +import java.io.File; +import java.io.IOException; +import java.lang.IllegalArgumentException; +import java.lang.Double; +import java.lang.Object; +import java.lang.String; +import java.lang.System; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import javax.imageio.ImageIO; + +import javolution.util.FastList; +import javolution.util.FastMap; + +import org.jdom.Document; +import org.jdom.Element; +import org.jdom.input.SAXBuilder; +import org.jdom.filter.Filter; +import org.jdom.JDOMException; + +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.string.FlexibleStringExpander; +import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.service.ServiceUtil; + + +/** + * ImageTransform Class + * <p> + * Services to apply tranformation for images + */ +public class ImageTransform { + + public static final String module = ImageTransform.class.getName(); +// public static final String err_resource = "ContentErrorUiLabels"; + + public ImageTransform() {} + + + /** + * getBufferedImage + * <p> + * Set a buffered image + * + * @param context + * @param fileLocation Full file Path or Url + * @return Url images for all different size types + * @throws IOException Error prevents the document from being fully parsed + * @throws JDOMException Errors occur in parsing + */ + public Map getBufferedImage(String fileLocation) + throws IllegalArgumentException, IOException { + + /* VARIABLES */ + BufferedImage bufImg; + FastMap result = new FastMap(); + + /* BUFFERED IMAGE */ + try{ + bufImg = ImageIO.read(new File(fileLocation)); + }catch(IllegalArgumentException e){ + String errMsg = "Input is null : " + fileLocation + " ; " + e.toString(); + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + }catch(IOException e){ + String errMsg = "Error occurs during reading : " + fileLocation + " ; " + e.toString(); + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + + result.put("responseMessage", "success"); + result.put("bufferedImage", bufImg); + return result; + + } // getBufferedImage + + + /** + * scaleImageInAllSize + * <p> + * Scale the original image into all different size Types (small, medium, large, detail) + * + * @param context Context + * @param filenameToUse Filename of future image files + * @param viewType "Main" view or "additional" view + * @param viewNumber If it's the main view, viewNumber = "0" + * @return Url images for all different size types + * @throws IllegalArgumentException Any parameter is null + * @throws ImagingOpException The transform is non-invertible + * @throws IOException Error prevents the document from being fully parsed + * @throws JDOMException Errors occur in parsing + */ + public Map scaleImageInAllSize(Map<String, ? extends Object> context, String filenameToUse, String viewType, String viewNumber) + throws IllegalArgumentException, ImagingOpException, IOException, JDOMException { + + /* VARIABLES */ + List<String> sizeTypeList = UtilMisc.toList("small", "medium", "large", "detail"); + List<String> extensionList = UtilMisc.toList("jpeg", "jpg", "png"); + int index; + LinkedHashMap<String, LinkedHashMap<String, String>> imgPropertyMap = new LinkedHashMap<String, LinkedHashMap<String, String>>(); + BufferedImage bufImg, bufNewImg; + double imgHeight, imgWidth, defaultHeight, defaultWidth, scaleFactor; + AffineTransformOp op; + LinkedHashMap<String, String> imgUrlMap = new LinkedHashMap<String, String>(); + LinkedHashMap resultXMLMap = new LinkedHashMap(); + LinkedHashMap resultBufImgMap = new LinkedHashMap(); + LinkedHashMap resultScaleImgMap = new LinkedHashMap(); + FastMap result = new FastMap(); + + /* ImageProperties.xml */ + String imgPropertyFullPath = System.getProperty("ofbiz.home") + "/applications/product/config/ImageProperties.xml"; + resultXMLMap.putAll(getXMLValue(imgPropertyFullPath)); + if(resultXMLMap.containsKey("responseMessage") && resultXMLMap.get("responseMessage").equals("success")){ + imgPropertyMap.putAll((LinkedHashMap) resultXMLMap.get("xml")); + }else{ + String errMsg = "Impossible to parse ImageProperties.xml "; + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + + /* IMAGE */ + // get Name and Extension + index = filenameToUse.lastIndexOf("."); + String imgName = filenameToUse.substring(0, index - 1); + String imgExtension = filenameToUse.substring(index + 1); + // paths + String mainFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format"); + String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); + String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix"); + + String id = new String(); + String type = new String(); + if(viewType.toLowerCase().contains("main")){ + type = "original"; + id = imgName; + }else if(viewType.toLowerCase().contains("additional") && viewNumber != null && !viewNumber.equals("0")){ + type = "additional"; + id = imgName + "_View_" + viewNumber; + }else{ + return ServiceUtil.returnError("View Type : " + type + " is wrong"); + } + FlexibleStringExpander mainFilenameExpander = FlexibleStringExpander.getInstance(mainFilenameFormat); + String fileLocation = mainFilenameExpander.expandString(UtilMisc.toMap("location", "products", "type", type, "id", filenameToUse)); + String filePathPrefix = ""; + if (fileLocation.lastIndexOf("/") != -1) { + filePathPrefix = fileLocation.substring(0, fileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash + } + + + + /* get original BUFFERED IMAGE */ + resultBufImgMap.putAll(this.getBufferedImage(imageServerPath + "/" + filePathPrefix + filenameToUse)); + + if(resultBufImgMap.containsKey("responseMessage") && resultBufImgMap.get("responseMessage").equals("success")){ + bufImg = (BufferedImage) resultBufImgMap.get("bufferedImage"); + + // get Dimensions + imgHeight = (double) bufImg.getHeight(); + imgWidth = (double) bufImg.getWidth(); + if(imgHeight == 0.0 || imgWidth == 0.0){ + String errMsg = "Any current image dimension is null : imgHeight = " + imgHeight + " ; imgWidth = " + imgWidth + ";"; + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + + // new Filename Format + FlexibleStringExpander addFilenameExpander = mainFilenameExpander; + if(viewType.toLowerCase().contains("additional")){ + String addFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format"); + addFilenameExpander = FlexibleStringExpander.getInstance(addFilenameFormat); + } + + /* scale Image for each Size Type */ + Iterator<String> sizeIter = sizeTypeList.iterator(); + while(sizeIter.hasNext()){ + String sizeType = sizeIter.next(); + + resultScaleImgMap.putAll(this.scaleImage(bufImg, imgHeight, imgWidth, imgPropertyMap, sizeType)); + + if(resultScaleImgMap.containsKey("responseMessage") && resultScaleImgMap.get("responseMessage").equals("success")){ + bufNewImg = (BufferedImage) resultScaleImgMap.get("bufferedImage"); + Double scaleFactorDb = (Double) resultScaleImgMap.get("scaleFactor"); + scaleFactor = scaleFactorDb.doubleValue(); + + // define Interpolation + LinkedHashMap<RenderingHints.Key, Object> rhMap = new LinkedHashMap<RenderingHints.Key, Object>(); + rhMap.put(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); + rhMap.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + rhMap.put(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + rhMap.put(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE); + rhMap.put(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON); + rhMap.put(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR); + rhMap.put(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); + //rhMap.put(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE); + rhMap.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); + RenderingHints rh = new RenderingHints(rhMap); + + /* IMAGE TRANFORMATION */ + AffineTransform tx = new AffineTransform(); + tx.scale(scaleFactor, scaleFactor); + + + try{ + op = new AffineTransformOp(tx, rh); + }catch(ImagingOpException e){ + String errMsg = "The transform is non-invertible" + e.toString(); + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + + // write the New Scaled Image + String newFileLocation = new String(); + if(viewType.toLowerCase().contains("main")){ + newFileLocation = mainFilenameExpander.expandString(UtilMisc.toMap("location", "products", "type", sizeType, "id", id)); + }else if(viewType.toLowerCase().contains("additional")){ + newFileLocation = addFilenameExpander.expandString(UtilMisc.toMap("location", "products", "viewtype", viewType, "sizetype", sizeType,"id", id)); + } + String newFilePathPrefix = ""; + if (newFileLocation.lastIndexOf("/") != -1) { + newFilePathPrefix = newFileLocation.substring(0, newFileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash + } + + // choose final extension + String finalExtension = new String(); + if(!extensionList.contains(imgExtension.toLowerCase())){ + finalExtension = imgPropertyMap.get("format").get("extension"); + }else{ + finalExtension = imgExtension; + } + + String targetDirectory = imageServerPath + "/" + newFilePathPrefix; + File targetDir = new File(targetDirectory); + if (!targetDir.exists()) { + boolean created = targetDir.mkdirs(); + if (!created) { + Debug.logFatal("Unable to create target directory - " + targetDirectory, module); + return ServiceUtil.returnError("Unable to create target directory - " + targetDirectory); + } + } + + // write new image + try{ + ImageIO.write(op.filter(bufImg, bufNewImg), imgExtension, new File(imageServerPath + "/" + newFilePathPrefix + filenameToUse)); + }catch(IllegalArgumentException e){ + String errMsg = "Any parameter is null" + e.toString(); + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + }catch(IOException e){ + String errMsg = "An error occurs during writing" + e.toString(); + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + + /* write Return Result */ + String imageUrl = imageUrlPrefix + "/" + newFilePathPrefix + filenameToUse; + imgUrlMap.put(sizeType, imageUrl); + + } // scaleImgMap + } // sizeIter + } + + result.put("responseMessage", "success"); + result.put("imageUrlMap", imgUrlMap); + result.put("original", resultBufImgMap); + return result; + + } // scaleImageInAllSize + + + /** + * scaleImage + * <p> + * scale original image related to the ImageProperties.xml dimensions + * + * @param bufImg Buffered image to scale + * @param imgHeight Original image height + * @param imgwidth Original image width + * @param dimensionMap Image dimensions by size type + * @param sizeType Size type to scale + * @return New scaled buffered image + */ + private Map scaleImage(BufferedImage bufImg, double imgHeight, double imgWidth, LinkedHashMap<String, LinkedHashMap<String, String>> dimensionMap, String sizeType){ + + /* VARIABLES */ + BufferedImage bufNewImg; + double defaultHeight, defaultWidth, scaleFactor; + FastMap result = new FastMap(); + + /* DIMENSIONS from ImageProperties */ + defaultHeight = Double.parseDouble(dimensionMap.get(sizeType).get("height").toString()); + defaultWidth = Double.parseDouble(dimensionMap.get(sizeType).get("width").toString()); + if(defaultHeight == 0.0 || defaultWidth == 0.0){ + String errMsg = "Any default dimension is null : defaultHeight = " + defaultHeight + " ; defaultWidth = " + defaultWidth + ";"; + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + + /* SCALE FACTOR */ + // find the right Scale Factor related to the Image Dimensions + if(imgHeight > imgWidth){ + scaleFactor = defaultHeight / imgHeight; + if(scaleFactor == 0.0){ + String errMsg = "Height scaleFactor is null (defaultHeight = " + defaultHeight + "; imgHeight = " + imgHeight + ";"; + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + // get scaleFactor from the smallest width + if(defaultWidth < (imgWidth * scaleFactor)){ + scaleFactor = defaultWidth / imgWidth; + } + }else{ + scaleFactor = defaultWidth / imgWidth; + if(scaleFactor == 0.0){ + String errMsg = "Width scaleFactor is null (defaultWidth = " + defaultWidth + "; imgWidth = " + imgWidth + ";"; + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + // get scaleFactor from the smallest height + if(defaultHeight < (imgHeight * scaleFactor)){ + scaleFactor = defaultHeight / imgHeight; + } + } + + if(scaleFactor == 0.0){ + String errMsg = "Final scaleFactor is null = " + scaleFactor + ";"; + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + + bufNewImg = new BufferedImage( (int) (imgWidth * scaleFactor), (int) (imgHeight * scaleFactor), bufImg.getType()); + + result.put("responseMessage", "success"); + result.put("bufferedImage", bufNewImg); + result.put("scaleFactor", scaleFactor); + return result; + + } // scaleImage + + + /** + * getXMLValue + * <p> + * From a XML element, get a values map + * + * @param fileFullPath File path to parse + * @return Map contains asked attribute values by attribute name + */ + private Map getXMLValue(String fileFullPath) + throws IllegalStateException, IOException, JDOMException { + + /* VARIABLES */ + Document document; + Element rootElt; + List<Element> eltList; + LinkedHashMap<String, LinkedHashMap> valueMap = new LinkedHashMap<String, LinkedHashMap>(); + FastMap result = new FastMap(); + + /* PARSING */ + SAXBuilder sxb = new SAXBuilder(); + try{ + // JDOM + document = sxb.build(new File(fileFullPath)); + }catch(JDOMException e){ + String errMsg = "Errors occur in parsing ImageProperties.xml" + e.toString(); + Debug.logError(errMsg, module); + result.put("errorMessage", "error"); + return result; + }catch(IOException e){ + String errMsg = "Error prevents the document from being fully parsed" + e.toString(); + Debug.logError(errMsg, module); + result.put("errorMessage", "error"); + return result; + } + // set Root Element + try{ + rootElt = document.getRootElement(); + }catch(IllegalStateException e){ + String errMsg = "Root element hasn't been set" + e.toString(); + Debug.logError(errMsg, module); + result.put("errorMessage", "error"); + return result; + } + + /* get NAME and VALUE */ + Iterator<Element> eltIter = rootElt.getChildren().iterator(); + while(eltIter.hasNext()){ + Element currentElt = eltIter.next(); + LinkedHashMap<String, String> eltMap = new LinkedHashMap<String, String>(); + if(currentElt.getContentSize() > 0){ + LinkedHashMap<String, String> childMap = new LinkedHashMap<String, String>(); + // loop over Children 1st level + Iterator<Element> childrenIter = currentElt.getChildren().iterator(); + while(childrenIter.hasNext()){ + Element currentChild = childrenIter.next(); + childMap.put(currentChild.getAttributeValue("name"), currentChild.getAttributeValue("value")); + } + valueMap.put(currentElt.getAttributeValue("name"), childMap); + }else{ + eltMap.put(currentElt.getAttributeValue("name"), currentElt.getAttributeValue("value")); + valueMap.put(currentElt.getName(), eltMap); + } + } // eltIter + + result.put("responseMessage", "success"); + result.put("xml", valueMap); + return result; + + } // getXMLValue + +} // ImageTransform Class Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=739042&r1=739041&r2=739042&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Thu Jan 29 22:06:32 2009 @@ -31,6 +31,8 @@ import javolution.util.FastMap; import javolution.util.FastSet; +import org.jdom.JDOMException; + import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; @@ -42,6 +44,7 @@ import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.image.ImageTransform; import org.ofbiz.product.catalog.CatalogWorker; import org.ofbiz.product.category.CategoryWorker; import org.ofbiz.service.DispatchContext; @@ -904,7 +907,9 @@ return ServiceUtil.returnSuccess(); } - public static Map<String, Object> addAdditionalViewForProduct(DispatchContext dctx, Map<String, ? extends Object> context) { + public static Map<String, Object> addAdditionalViewForProduct(DispatchContext dctx, Map<String, ? extends Object> context) + throws IOException, JDOMException { + LocalDispatcher dispatcher = dctx.getDispatcher(); GenericDelegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -954,6 +959,23 @@ return ServiceUtil.returnError("Unable to write binary data to: " + file.getAbsolutePath()); } + /* scale Image in different sizes */ + String viewNumber = new String(); + viewNumber = String.valueOf(productContentTypeId.charAt(productContentTypeId.length() - 1)); + ImageTransform imageTransform = new ImageTransform(); + FastMap resultResize = new FastMap(); + try{ + resultResize.putAll(imageTransform.scaleImageInAllSize(context, filenameToUse, "additional", viewNumber)); + }catch(IOException e){ + String errMsg = "Scale additional image in all different sizes is impossible : " + e.toString(); + Debug.logError(e, errMsg, module); + return ServiceUtil.returnError(errMsg); + }catch(JDOMException e){ + String errMsg = "Errors occur in parsing ImageProperties.xml : " + e.toString(); + Debug.logError(e, errMsg, module); + return ServiceUtil.returnError(errMsg); + } + String imageUrl = imageUrlPrefix + "/" + filePathPrefix + filenameToUse; if (UtilValidate.isNotEmpty(imageUrl) && imageUrl.length() > 0) { Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy?rev=739042&r1=739041&r2=739042&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy Thu Jan 29 22:06:32 2009 @@ -17,9 +17,10 @@ * under the License. */ -import org.ofbiz.entity.* -import org.ofbiz.base.util.* -import org.ofbiz.base.util.string.* +import org.ofbiz.entity.*; +import org.ofbiz.base.util.*; +import org.ofbiz.base.util.string.*; +import org.ofbiz.image.ImageTransform; context.nowTimestampString = UtilDateTime.nowTimestamp().toString(); @@ -31,11 +32,12 @@ context.imageServerPath = imageServerPath; context.imageUrlPrefix = imageUrlPrefix; -filenameExpander = new FlexibleStringExpander(imageFilenameFormat); +filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat); context.imageNameSmall = imageUrlPrefix + "/" + filenameExpander.expandString([location : 'products', type : 'small' , id : productId]); context.imageNameMedium = imageUrlPrefix + "/" + filenameExpander.expandString([location : 'products', type : 'medium', id : productId]); context.imageNameLarge = imageUrlPrefix + "/" + filenameExpander.expandString([location : 'products', type : 'large' , id : productId]); context.imageNameDetail = imageUrlPrefix + "/" + filenameExpander.expandString([location : 'products', type : 'detail', id : productId]); +context.imageNameOriginal = imageUrlPrefix + "/" + filenameExpander.expandString([location : 'products', type : 'original', id : productId]); // Start ProductContent stuff productContent = null; @@ -63,6 +65,7 @@ contentType = null; String fileType = request.getParameter("upload_file_type"); if (fileType) { + context.fileType = fileType; fileLocation = filenameExpander.expandString([location : 'products', type : fileType, id : productId]); @@ -84,7 +87,7 @@ uploadObject.setOverrideFilename(defaultFileName); uploadObject.setSavePath(imageServerPath + "/" + filePathPrefix); uploadObject.doUpload(request); - + clientFileName = uploadObject.getFilename(); if (clientFileName) { context.clientFileName = clientFileName; @@ -119,6 +122,20 @@ if (imageUrl && imageUrl.length() > 0) { context.imageUrl = imageUrl; product.set(fileType + "ImageUrl", imageUrl); + + // call scaleImageInAllSize + if(fileType.equals("original")){ + ImageTransform imageTransform = new ImageTransform(); + result = imageTransform.scaleImageInAllSize(context, filenameToUse, "main", "0"); + + if(result.containsKey("responseMessage") && result.get("responseMessage").equals("success")){ + imgMap = result.get("imageUrlMap"); + imgMap.each(){ key, value -> + product.set(key + "ImageUrl", value); + } + } + } + product.store(); } } Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=739042&r1=739041&r2=739042&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl Thu Jan 29 22:06:32 2009 @@ -149,7 +149,28 @@ </div> </#if> </td> - </tr> + </tr> + <tr> + <td width="20%" align="right" valign="top"> + <div><b>${uiLabelMap.ProductOriginalImage}</b></div> + <#if (product.originalImageUrl)?exists> + <a href="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Original Image" src="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>" height="40" width="40"></a> + </#if> + </td> + <td> </td> + <td width="80%" colspan="4" valign="top"> + <input type="text" name="originalImageUrl" value="${(product.originalImageUrl)?default('')}" size="60" maxlength="255"> + <br/><span class="tooltip">${uiLabelMap.ProductOriginalImageMessage} : {ofbiz.home}/applications/product/config/ImageProperties.xml"</span> + <#if productId?has_content> + <div> + <span>${uiLabelMap.ProductInsertDefaultImageUrl}: </span> + <a href="javascript:insertImageName('original','${imageNameOriginal}.jpg');" class="buttontext">.jpg</a> + <a href="javascript:insertImageName('original','${imageNameOriginal}.gif');" class="buttontext">.gif</a> + <a href="javascript:insertImageName('original','');" class="buttontext">${uiLabelMap.CommonClear}</a> + </div> + </#if> + </td> + </tr> <tr> <td colspan="2"> </td> <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></td> @@ -164,17 +185,18 @@ }; </script> <h3>${uiLabelMap.ProductUploadImage}</h3> - <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=small</@ofbizUrl>" name="imageUploadForm"> + <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=original</@ofbizUrl>" name="imageUploadForm"> <table cellspacing="0" class="basic-table"> <tr> <td width="20%" align="right" valign="top"> <input type="file" size="50" name="fname"> <td> </td> <td width="80%" colspan="4" valign="top"> - <input type="radio" name="upload_file_type_bogus" value="small" checked onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=small</@ofbizUrl>");'>${uiLabelMap.CommonSmall} + <input type="radio" name="upload_file_type_bogus" value="small" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=small</@ofbizUrl>");'>${uiLabelMap.CommonSmall} <input type="radio" name="upload_file_type_bogus" value="medium" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=medium</@ofbizUrl>");'>${uiLabelMap.CommonMedium} <input type="radio" name="upload_file_type_bogus" value="large"onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=large</@ofbizUrl>");'>${uiLabelMap.CommonLarge} <input type="radio" name="upload_file_type_bogus" value="detail" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=detail</@ofbizUrl>");'>${uiLabelMap.CommonDetail} + <input type="radio" name="upload_file_type_bogus" value="original" checked onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=original</@ofbizUrl>");'>${uiLabelMap.ProductOriginal} <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"> </td> </tr> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |