major cleanup:

[mir.git] / source / mircoders / pdf / PDFGenerator.java

diff --git a/source/mircoders/pdf/PDFGenerator.java b/source/mircoders/pdf/PDFGenerator.java
index 9487e0c..b3d5f62 100755 (executable)
--- a/source/mircoders/pdf/PDFGenerator.java
+++ b/source/mircoders/pdf/PDFGenerator.java
@@ -32,6 +32,7 @@ package mircoders.pdf;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.*;
 
 import com.lowagie.text.BadElementException;
 import com.lowagie.text.Document;
@@ -53,13 +54,13 @@ import gnu.regexp.REMatch;
 import gnu.regexp.REMatchEnumeration;
 
 import mir.config.MirPropertiesConfiguration;
-import mir.entity.EntityList;
+import mir.entity.*;
 import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
 import mir.util.DateTimeFunctions;
 import mircoders.entity.EntityContent;
 import mircoders.entity.EntityImages;
-import mircoders.storage.DatabaseContentToMedia;
+import mircoders.storage.*;
 
 public class PDFGenerator{
 
@@ -417,7 +418,7 @@ public class PDFGenerator{
       logger.error("runaway description...try increasing the line height or decreasing the font size");
   }
 
-  public void addArticleContent(ColumnText ct,String theContent,EntityList images){
+  public void addArticleContent(ColumnText ct,String theContent,Iterator images){
     //let's go ahead and add in all the body text
     Paragraph contentP=new Paragraph(theContent,new Font(contentFontFamily,contentFontSize));
     ct.addText(contentP);
@@ -635,7 +636,11 @@ public class PDFGenerator{
      * source
     */
 
-    EntityList images=DatabaseContentToMedia.getInstance().getImages(entityContent);
+   Iterator images = new EntityBrowser(
+      DatabaseImages.getInstance(),
+       "exists (select * from content_x_media where content_id=" + entityContent.getId() + " and media_id=id)",
+       "id desc", 30, -1, 0);
+
     String isHTML  = entityContent.getValue("is_html");
     String theTitle = entityContent.getValue("title");
     String theCreator = entityContent.getValue("creator");