From: mh <mh>
Date: Tue, 26 Feb 2002 12:11:07 +0000 (+0000)
Subject: make ProducerImage use dated directories. plus coding style cleanup. sorry, I know... 
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=0eb38e04e238fe826fdb223bf7fa3c14fe1c626f;p=mir.git

make ProducerImage use dated directories. plus coding style cleanup. sorry, I know it makes the actual code change hard to see.
---

diff --git a/source/mircoders/producer/ProducerImages.java b/source/mircoders/producer/ProducerImages.java
index e18c850d..0e0f94a3 100755
--- a/source/mircoders/producer/ProducerImages.java
+++ b/source/mircoders/producer/ProducerImages.java
@@ -20,16 +20,19 @@ public class ProducerImages extends Producer {
 
 	public static void main(String argv[]){
 		try {
-			new ProducerContent().handle(new PrintWriter(System.out), null, false,false);
+			new ProducerContent().handle(new PrintWriter(System.out), null,
+                                        false,false);
 		} catch(Exception e) { System.err.println(e.toString()); }
 	}
 
-	public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync)
+	public void handle(PrintWriter htmlout, EntityUsers user, boolean force,
+                        boolean sync)
 		throws StorageObjectException, ModuleException {
 		handle(htmlout,user,force,sync,null);
 	}
 
-	public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync, String id)
+	public void handle(PrintWriter htmlout, EntityUsers user, boolean force,
+                        boolean sync, String id)
 		throws StorageObjectException, ModuleException
 	{
 		long                sessionConnectTime = 0;
@@ -42,7 +45,8 @@ public class ProducerImages extends Producer {
 		EntityList          batchEntityList;
         String              orderBy = "date desc, webdb_lastchange desc";
 
-        int contentBatchsize = Integer.parseInt(MirConfig.getProp("Producer.Content.Batchsize"));
+        int contentBatchsize = Integer.parseInt(MirConfig.getProp(
+                                        "Producer.Content.Batchsize"));
         String imageHost = MirConfig.getProp("Producer.Image.Host");
         String imagePath = MirConfig.getProp("Producer.Image.Path");
         String iconPath = MirConfig.getProp("Producer.Image.IconPath");
@@ -53,7 +57,8 @@ public class ProducerImages extends Producer {
 			whereClause += " and id="+id;
 		if (force==false) whereClause += " and icon_is_produced='0'";
 
-		batchEntityList = imageModule.getByWhereClause(whereClause, orderBy, 0, contentBatchsize);
+		batchEntityList = imageModule.getByWhereClause(whereClause, orderBy, 0,
+                                                        contentBatchsize);
 		theLog.printDebugInfo("whereclause: " + whereClause);
 
 
@@ -65,34 +70,51 @@ public class ProducerImages extends Producer {
             try {
 				// make filenames
 				String date = currentImage.getValue("date");
+                String datePath = StringUtil.webdbDate2path(date);
 
-				iconFilename = producerDocRoot + iconPath + StringUtil.webdbDate2path(date) +
-					currentImage.getId() + (( currentImage.getValue("to_img_type").equals("0") ) ? ".jpg":".gif");
+				iconFilename=producerDocRoot + iconPath + datePath +
+                             currentImage.getId() +
+                             ((currentImage.getValue("to_img_type").equals("0"))
+                             ? ".jpg":".gif");
 
-				imageFilename = currentImage.getId() + (( currentImage.getValue("to_img_type").equals("0") ) ? ".jpg":".gif");
+				imageFilename=datePath + currentImage.getId() +
+                             ((currentImage.getValue("to_img_type").equals("0"))
+                             ? ".jpg":".gif");
 				productionPath = imagePath + "/" + imageFilename ;
 
 				currentImage.setValueForProperty("icon_path",iconFilename);
                 currentImage.setValueForProperty("publish_path",imageFilename);
 				currentImage.setValueForProperty("publish_server", imageHost);
 
-				if (currentImage.getValue("icon_data")!= null && currentImage.getValue("image_data")!= null) {
+				if (currentImage.getValue("icon_data")!= null &&
+                    currentImage.getValue("image_data")!= null) {
 					// make icon
-					boolean iconProduced = produceFile(iconFilename, currentImage.getIcon(), htmlout, true);
-					logHTML(htmlout,"icon : " + iconFilename + (( iconProduced==true )? " succeded":" <font color=\"Red\" failed!</font>"));
+					boolean iconProduced = produceFile(iconFilename,
+                                                       currentImage.getIcon(),
+                                                       htmlout, true);
+					logHTML(htmlout,"icon : "+iconFilename+((
+                            iconProduced==true )?
+                            " succeded":" <font color=\"Red\" failed!</font>"));
 					// make image
-					boolean imageProduced = produceFile(productionPath, currentImage.getImage(), htmlout, false);
-					logHTML(htmlout,"image: " + productionPath + ((imageProduced==true)?" succeded":" <font color=\"Red\" failed!</font>"));
+					boolean imageProduced = produceFile(productionPath,
+                                                        currentImage.getImage(),
+                                                        htmlout, false);
+					logHTML(htmlout,"image: "+productionPath +
+                            ((imageProduced==true)?
+                            " succeded":" <font color=\"Red\" failed!</font>"));
 
 					// update image-data
 					if (iconProduced && imageProduced) {
-						currentImage.setValueForProperty("icon_is_produced", "1");
+						currentImage.setValueForProperty("icon_is_produced",
+                                                        "1");
 						currentImage.update();
 					}
 
 				}
             } catch (Exception e) {
-               logHTML(htmlout, "Producer.Images ERROR with: image ID " + currentImage.getId() + " <font color=\"Red\"> failed!</font>");
+               logHTML(htmlout, "Producer.Images ERROR with: image ID "+
+                       currentImage.getId() +
+                       " <font color=\"Red\"> failed!</font>");
             }
 			}//end for
 
@@ -107,7 +129,8 @@ public class ProducerImages extends Producer {
 		}
 		// Finish
 		sessionConnectTime = new java.util.Date().getTime() - startTime;
-		logHTML(htmlout, "Producer.Images finished: " + sessionConnectTime + " ms.");
+		logHTML(htmlout, "Producer.Images finished: " + sessionConnectTime +
+                " ms.");
 
 	}