cleanup / abuse system fix / prepping for a release

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

diff --git a/source/mircoders/pdf/PDFGenerator.java b/source/mircoders/pdf/PDFGenerator.java
index e1a2fa8..ebfe984 100755 (executable)
--- a/source/mircoders/pdf/PDFGenerator.java
+++ b/source/mircoders/pdf/PDFGenerator.java
@@ -45,7 +45,8 @@ import mir.config.MirPropertiesConfiguration;
 import mir.entity.EntityBrowser;
 import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
-import mir.util.DateTimeFunctions;
+import mir.util.DateTimeRoutines;
+import mir.util.HTMLRoutines;
 import mircoders.entity.EntityContent;
 import mircoders.entity.EntityImages;
 import mircoders.storage.DatabaseImages;
@@ -643,7 +644,7 @@ public class PDFGenerator{
     String isHTML  = entityContent.getFieldValue("is_html");
     String theTitle = entityContent.getFieldValue("title");
     String theCreator = entityContent.getFieldValue("creator");
-    String theDate = DateTimeFunctions.advancedDateFormat(
+    String theDate = DateTimeRoutines.advancedDateFormat(
         configuration.getString("RDF.Meta.DateFormat"),
         StringUtil.convertMirInternalDateToDate(entityContent.getFieldValue("webdb_create")),
         configuration.getString("Mir.DefaultTimezone"));
@@ -725,8 +726,8 @@ public class PDFGenerator{
   theContent= noTags.substituteAll(theContent," ");
   theDescription= noTags.substituteAll(theDescription," ");
 
-  theContent=mir.util.Translate.decode(theContent);
-  theDescription=mir.util.Translate.decode(theDescription);
+  theContent = HTMLRoutines.resolveHTMLEntites(theContent);
+  theDescription = HTMLRoutines.resolveHTMLEntites(theDescription);
 
   RE re1 = new RE("\r?\n\r?\n");
   String theDescription1 = re1.substituteAll(theDescription,"BREAKHERE");