projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it
[mir.git]
/
source
/
mir
/
misc
/
HTMLTemplateProcessor.java
diff --git
a/source/mir/misc/HTMLTemplateProcessor.java
b/source/mir/misc/HTMLTemplateProcessor.java
index
4729e10
..
1abaae5
100755
(executable)
--- a/
source/mir/misc/HTMLTemplateProcessor.java
+++ b/
source/mir/misc/HTMLTemplateProcessor.java
@@
-38,11
+38,12
@@
public final class HTMLTemplateProcessor {
// init
static {
// init
static {
-
+ /** @todo either in the above block or here :) //rk */
templateDir = MirConfig.getPropWithHome("HTMLTemplateProcessor.Dir");
templateCache = new FileTemplateCache(templateDir);
templateCache.setLoadingPolicy(templateCache.LOAD_ON_DEMAND);
templateDir = MirConfig.getPropWithHome("HTMLTemplateProcessor.Dir");
templateCache = new FileTemplateCache(templateDir);
templateCache.setLoadingPolicy(templateCache.LOAD_ON_DEMAND);
- templateCache.startAutoUpdate();
+ // gone in freemarker 1.7.1
+ // templateCache.startAutoUpdate();
theLog = Logfile.getInstance(MirConfig.getPropWithHome("HTMLTemplateProcessor.Logfile"));
docRoot = MirConfig.getProp("RootUri");
//the quick hack is back in effect as it was more broken than ever before
theLog = Logfile.getInstance(MirConfig.getPropWithHome("HTMLTemplateProcessor.Logfile"));
docRoot = MirConfig.getProp("RootUri");
//the quick hack is back in effect as it was more broken than ever before
@@
-50,9
+51,12
@@
public final class HTMLTemplateProcessor {
// sorry: nadir back in town, i have to debug the mirbase.jar in the
// nadir evironment. from my point of coding, this needs an urgent
// fixxx.
// sorry: nadir back in town, i have to debug the mirbase.jar in the
// nadir evironment. from my point of coding, this needs an urgent
// fixxx.
- //actionRoot = docRoot + "/servlet/" + MirConfig.getProp("ServletName");
+ // yeah, from my point too - tob.
+ //actionRoot = docRoot + "/servlet/" + MirConfig.getProp("ServletName");
//actionRoot = docRoot + "/servlet/NadirAktuell";
//actionRoot = docRoot + "/servlet/NadirAktuell";
+
actionRoot = docRoot + "/servlet/Mir";
actionRoot = docRoot + "/servlet/Mir";
+
openAction = MirConfig.getProp("Producer.OpenAction");
productionHost = MirConfig.getProp("Producer.ProductionHost");
videoHost = MirConfig.getProp("Producer.VideoHost");
openAction = MirConfig.getProp("Producer.OpenAction");
productionHost = MirConfig.getProp("Producer.ProductionHost");
videoHost = MirConfig.getProp("Producer.VideoHost");
@@
-194,6
+198,10
@@
public final class HTMLTemplateProcessor {
session=res.encodeURL("");
}
session=res.encodeURL("");
}
+ /** @todo why do we double those? should be cleaned up and
+ * statically initialized, we do not need to assemble a config
+ * hash everytime we give out a page, only exception is
+ * date "now" // rk */
// put standard configuration into tempalteRootmodel
SimpleHash configHash = new SimpleHash();
configHash.put("docroot", new SimpleScalar(producerDocRoot));
// put standard configuration into tempalteRootmodel
SimpleHash configHash = new SimpleHash();
configHash.put("docroot", new SimpleScalar(producerDocRoot));
@@
-211,6
+219,8
@@
public final class HTMLTemplateProcessor {
tmr.put("videoHost", new SimpleScalar(videoHost));
tmr.put("audioHost", new SimpleScalar(audioHost));
tmr.put("imageHost", new SimpleScalar(imageHost));
tmr.put("videoHost", new SimpleScalar(videoHost));
tmr.put("audioHost", new SimpleScalar(audioHost));
tmr.put("imageHost", new SimpleScalar(imageHost));
+ // this conform to updated freemarker syntax
+ tmr.put("compressWhitespace", new freemarker.template.utility.CompressWhitespace() );
tmr.put("config", configHash);
tmpl.process(tmr, out);
tmr.put("config", configHash);
tmpl.process(tmr, out);
@@
-222,13
+232,16
@@
public final class HTMLTemplateProcessor {
* Converts Entity-List to SimpleList of SimpleHashes.
* @param aList ist eine Liste von Entity
* @return eine freemarker.template.SimpleList von SimpleHashes.
* Converts Entity-List to SimpleList of SimpleHashes.
* @param aList ist eine Liste von Entity
* @return eine freemarker.template.SimpleList von SimpleHashes.
+ *
+ * @deprecated EntityLists comply with TemplateListModel now.
*/
public static SimpleList makeSimpleList(EntityList aList) throws StorageObjectException
{
*/
public static SimpleList makeSimpleList(EntityList aList) throws StorageObjectException
{
+ theLog.printWarning("## using deprecated makeSimpleList(entityList) - a waste of resources");
SimpleList simpleList = new SimpleList();
if (aList != null) {
for(int i=0;i<aList.size();i++) {
SimpleList simpleList = new SimpleList();
if (aList != null) {
for(int i=0;i<aList.size();i++) {
- simpleList.add(
makeSimpleHash(aList.elementAt(i)
));
+ simpleList.add(
aList.elementAt(i
));
}
}
return simpleList;
}
}
return simpleList;
@@
-249,7
+262,7
@@
public final class HTMLTemplateProcessor {
if (aList != null) {
for (int i=0;i<aList.size();i++) {
currentEntity = (Entity)aList.elementAt(i);
if (aList != null) {
for (int i=0;i<aList.size();i++) {
currentEntity = (Entity)aList.elementAt(i);
- simpleHash.put(currentEntity.getId(),
makeSimpleHash(currentEntity)
);
+ simpleHash.put(currentEntity.getId(),
currentEntity
);
}
}
return simpleHash;
}
}
return simpleHash;
@@
-260,10
+273,16
@@
public final class HTMLTemplateProcessor {
* @param entity ist die Entity
* @return SimpleHash mit den entsprechenden freemarker Daten
*
* @param entity ist die Entity
* @return SimpleHash mit den entsprechenden freemarker Daten
*
+ * @deprecated This method is deprecated and will be deleted in the next
+ * release. Entity interfaces freemarker.template.TemplateHashModel now
+ * and can be used in the same way as SimpleHash. It is not necessary any
+ * more to make a SimpleHash from an Entity
*/
public static SimpleHash makeSimpleHash(Entity entity) {
*/
public static SimpleHash makeSimpleHash(Entity entity) {
- if (entity != null)
+ if (entity != null) {
+ theLog.printWarning("## using deprecated makeSimpleHash(entity) - a waste of resources");
return makeSimpleHash(entity.getValues());
return makeSimpleHash(entity.getValues());
+ }
else
return null;
}
else
return null;
}
@@
-304,7
+323,7
@@
public final class HTMLTemplateProcessor {
public static SimpleHash makeSimpleHashWithEntitylistInfos(EntityList entList) throws StorageObjectException {
SimpleHash modelRoot = new SimpleHash();
if (entList!=null) {
public static SimpleHash makeSimpleHashWithEntitylistInfos(EntityList entList) throws StorageObjectException {
SimpleHash modelRoot = new SimpleHash();
if (entList!=null) {
- modelRoot.put("contentlist",
makeSimpleList(entList)
);
+ modelRoot.put("contentlist",
entList
);
modelRoot.put("count", new SimpleScalar((new Integer(entList.getCount())).toString()));
if (entList.getWhere()!=null) {
modelRoot.put("where", new SimpleScalar(entList.getWhere()));
modelRoot.put("count", new SimpleScalar((new Integer(entList.getCount())).toString()));
if (entList.getWhere()!=null) {
modelRoot.put("where", new SimpleScalar(entList.getWhere()));
@@
-333,11
+352,17
@@
public final class HTMLTemplateProcessor {
*/
private static Template getTemplateFor(String templateFilename) throws HTMLParseException
{
*/
private static Template getTemplateFor(String templateFilename) throws HTMLParseException
{
- if (templateFilename!=null) return templateCache.getTemplate(templateFilename);
- else {
+ Template returnTemplate = null;
+ if (templateFilename!=null)
+ returnTemplate = (Template)templateCache.getItem(templateFilename,"template");
+
+
+ if (returnTemplate==null) {
theLog.printError("CACHE (ERR): Unknown template: " + templateFilename);
throw new HTMLParseException("Templatefile: "+ templateFilename + " not found.");
}
theLog.printError("CACHE (ERR): Unknown template: " + templateFilename);
throw new HTMLParseException("Templatefile: "+ templateFilename + " not found.");
}
+
+ return returnTemplate;
}
public static void stopAutoUpdate(){
}
public static void stopAutoUpdate(){