rework of media handling vis a vis storage and producing. making it more

[mir.git] / source / mircoders / producer / ProducerImages.java

diff --git a/source/mircoders/producer/ProducerImages.java b/source/mircoders/producer/ProducerImages.java
index 0e0f94a..f75af22 100755 (executable)
--- a/source/mircoders/producer/ProducerImages.java
+++ b/source/mircoders/producer/ProducerImages.java
@@ -12,126 +12,13 @@ import mir.module.*;
 import mir.entity.*;
 
 import mircoders.entity.*;
-import mir.storage.*;
-
-
-
-public class ProducerImages extends Producer {
-
-       public static void main(String argv[]){
-               try {
-                       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)
-               throws StorageObjectException, ModuleException {
-               handle(htmlout,user,force,sync,null);
-       }
-
-       public void handle(PrintWriter htmlout, EntityUsers user, boolean force,
-                        boolean sync, String id)
-               throws StorageObjectException, ModuleException
-       {
-               long                sessionConnectTime = 0;
-               long                startTime = (new java.util.Date()).getTime();
-               String              whereClause;
-               String              iconFilename;
-               String              imageFilename;
-               String              productionPath;
-               EntityImages         currentImage;
-               EntityList          batchEntityList;
-        String              orderBy = "date desc, webdb_lastchange desc";
-
-        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");
-
-               // get batch of non-produced images, that are to be published
-               whereClause="is_published='1'";
-               if (id!= null)
-                       whereClause += " and id="+id;
-               if (force==false) whereClause += " and icon_is_produced='0'";
-
-               batchEntityList = imageModule.getByWhereClause(whereClause, orderBy, 0,
-                                                        contentBatchsize);
-               theLog.printDebugInfo("whereclause: " + whereClause);
-
-
-               while (batchEntityList != null) {
-                       for(int i=0;i<batchEntityList.size();i++) {
-                               theLog.printDebugInfo("trying image: " + i);
-                               currentImage = (EntityImages)batchEntityList.elementAt(i);
-
-            try {
-                               // make filenames
-                               String date = currentImage.getValue("date");
-                String datePath = StringUtil.webdbDate2path(date);
-
-                               iconFilename=producerDocRoot + iconPath + datePath +
-                             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) {
-                                       // make icon
-                                       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>"));
-
-                                       // update image-data
-                                       if (iconProduced && imageProduced) {
-                                               currentImage.setValueForProperty("icon_is_produced",
-                                                        "1");
-                                               currentImage.update();
-                                       }
+import mircoders.storage.*;
 
-                               }
-            } catch (Exception e) {
-               logHTML(htmlout, "Producer.Images ERROR with: image ID "+
-                       currentImage.getId() +
-                       " <font color=\"Red\"> failed!</font>");
-            }
-                       }//end for
 
-                       // if next batch get it...
-                       if (batchEntityList.hasNextBatch()){
-                               batchEntityList = imageModule.getByWhereClause(whereClause, 
-                                    orderBy, batchEntityList.getNextBatch(),
-                                    contentBatchsize);
-                       } else {
-                               batchEntityList=null;
-                       }
-               }
-               // Finish
-               sessionConnectTime = new java.util.Date().getTime() - startTime;
-               logHTML(htmlout, "Producer.Images finished: " + sessionConnectTime +
-                " ms.");
+public class ProducerImages extends ProducerMedia {
 
-       }
+  protected Database getStorage() throws StorageObjectException {
+    return DatabaseImages.getInstance();
+  }
 
 }