From: idfx <idfx>
Date: Sun, 31 Mar 2002 12:42:21 +0000 (+0000)
Subject: live debugging: finding a nullpointer
X-Git-Tag: prexmlproducerconfig~174
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=13fd1cb27dfaaeba8590daae63e1f577e017b55c;p=mir.git

live debugging: finding a nullpointer
---

diff --git a/source/mircoders/producer/ProducerContent.java b/source/mircoders/producer/ProducerContent.java
index 0296d12b..9880ba8e 100755
--- a/source/mircoders/producer/ProducerContent.java
+++ b/source/mircoders/producer/ProducerContent.java
@@ -23,13 +23,14 @@ import org.apache.log.*;
 public class ProducerContent extends Producer {
 
 	private String contentTemplate=MirConfig.getProp("Producer.Content.Template");
-        private String contentPrintableTemplate=MirConfig.getProp("Producer.PrintableContent.Template");
-        private String html2foStyleSheetName=MirConfig.getProp("Producer.PrintableContent.html2foStyleSheetName");
-        private String generateFO=MirConfig.getProp("GenerateFO");
-        private String generatePDF=MirConfig.getProp("GeneratePDF");
-        private String producerStorageRoot=MirConfig.getProp("Producer.StorageRoot");
-        private Logger fopLog=null;
-        private String templateDir = MirConfig.getPropWithHome("HTMLTemplateProcessor.Dir");
+	private String contentPrintableTemplate=MirConfig.getProp("Producer.PrintableContent.Template");
+	private String html2foStyleSheetName=MirConfig.getProp("Producer.PrintableContent.html2foStyleSheetName");
+	private String generateFO=MirConfig.getProp("GenerateFO");
+	private String generatePDF=MirConfig.getProp("GeneratePDF");
+	private String producerStorageRoot=MirConfig.getProp("Producer.StorageRoot");
+	private Logger fopLog=null;
+	private String templateDir = MirConfig.getPropWithHome("HTMLTemplateProcessor.Dir");
+	
 	public static void main(String argv[]){
 		/**
 		 * Why are we reloading the config here?
@@ -126,9 +127,6 @@ public class ProducerContent extends Producer {
 					htmlFileName =  producerDocRoot + "/" + year + "/" + month + "/" +
 													currentContent.getValue("id") + ".shtml";
 					
-					
-					
-
 					//produce html
 					boolean retVal = produce(contentTemplate, htmlFileName, mergeData, htmlout);
 					if ( retVal ) currentContent.setProduced(true);
@@ -139,26 +137,24 @@ public class ProducerContent extends Producer {
 					boolean foRetVal = produce(contentPrintableTemplate, foFileName, mergeData, htmlout);
 					
 					if (generatePDF.toLowerCase().equals("yes")){
-					    pdfFileName =  producerStorageRoot + producerDocRoot +"/" + year + "/" + month + "/" + currentContent.getValue("id") + ".pdf";
-					    Driver driver = new Driver();
-					    
-					    Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
-					    fopLog = hierarchy.getLoggerFor("fop");
-					    fopLog.setPriority(Priority.WARN);
-					    
-					    driver.setLogger(fopLog);
-					    driver.setRenderer(Driver.RENDER_PDF);
-					    File foFile=new File(producerStorageRoot + foFileName);
-					    File html2foStyleSheet=new File(templateDir+"/"+html2foStyleSheetName);
-					    InputHandler inputHandler = new XSLTInputHandler(foFile, html2foStyleSheet);
-					    XMLReader parser = inputHandler.getParser();
-					    driver.setOutputStream(new FileOutputStream(pdfFileName));
-					    driver.render(parser, inputHandler.getInputSource());			
-					    }
+						pdfFileName =  producerStorageRoot + producerDocRoot +"/" + year + "/" + month + "/" + currentContent.getValue("id") + ".pdf";
+						Driver driver = new Driver();
+						
+						Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
+						fopLog = hierarchy.getLoggerFor("fop");
+						fopLog.setPriority(Priority.WARN);
+						
+						driver.setLogger(fopLog);
+						driver.setRenderer(Driver.RENDER_PDF);
+						File foFile=new File(producerStorageRoot + foFileName);
+						File html2foStyleSheet=new File(templateDir+"/"+html2foStyleSheetName);
+						InputHandler inputHandler = new XSLTInputHandler(foFile, html2foStyleSheet);
+						XMLReader parser = inputHandler.getParser();
+						driver.setOutputStream(new FileOutputStream(pdfFileName));
+						driver.render(parser, inputHandler.getInputSource());
+						}
 					}
-				}
-				catch(Exception e)
-				{
+				} catch(Exception e) {
 					String errorText = "Producer.Content <font color=red>ERROR</font> while producing content ID:"
 										+ currentContent.getId()+", skipping it :: "+e.toString();
 					logHTML(htmlout, errorText);
@@ -169,25 +165,15 @@ public class ProducerContent extends Producer {
 			}//for
 			// if next batch get it...
 			if (batchEntityList.hasNextBatch()){
-				//batchEntityList = contentModule.getByWhereClause(whereClause,
-				//														null, batchEntityList.getNextBatch(),
-				//														contentBatchsize);
-               batchEntityList = contentModule.getContent(whereClause, orderBy,
-                                                batchEntityList.getNextBatch(),
-                                                contentBatchsize, userEntity);
+				batchEntityList = contentModule.getContent(whereClause, orderBy,
+																				batchEntityList.getNextBatch(),
+																				contentBatchsize, userEntity);
 			} else {
 				batchEntityList=null;
 			}
-
 		}
-
-
-
 		logHTMLFinish(htmlout, "Content", pageCount, startTime, System.currentTimeMillis());
-
 		/** @todo why no syncing here? */
-
 	}
-
 }
 
diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index 21cc2d45..f9ebde38 100755
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -119,7 +119,8 @@ public abstract class ServletModuleUploadedMedia
       // otherwise just use the first one.
       // @todo this should probably be moved to DatabaseMediaType -mh
       for (int j = 0; j < mediaTypesList.size(); j++) {
-        if (contentType.equals(
+        theLog.printDebugInfo("mediaTypesList: "+mediaTypesList.size());
+				if (contentType.equals(
                 mediaTypesList.elementAt(j).getValue("mime_type")))
           mediaType = mediaTypesList.elementAt(j);
       }
@@ -350,3 +351,4 @@ public abstract class ServletModuleUploadedMedia
 
 }
 
+