Changeset 7800

Timestamp:

07/24/09 09:52:34 (12 months ago)

Author:

dragisak

Message:

Fix for browser title on article page.

Files:

• head/ambra/webapp/src/main/java/org/topazproject/ambra/struts2/AmbraFreemarkerConfig.java (modified) (5 diffs)

head/ambra/webapp/src/main/java/org/topazproject/ambra/struts2/AmbraFreemarkerConfig.java

@@ -74 +74 @@
    * follow the standard templates.  Creates its own composite configuration by iterating over each
    * of the configs in the config to assemble a union of pages defined.
+   * @param configuration Ambra configuration
+   * @throws Exception Exception
    *
    */
@@ -251 +253 @@
 
         final int numPages = configuration.getList(journal + ".page.name").size();
-        int numCss, numJavaScript, j;
-        String pageName, page;
-
-        Map<String, String> titles = jc.getTitles();
-        if (titles == null) {
-          titles = new HashMap<String, String>();
-        }
-        Map<String, String[]> cssFiles = jc.getCssFiles();
-        if (cssFiles == null) {
-          cssFiles = new HashMap<String, String[]>();
-        }
-        Map<String, String[]> javaScriptFiles = jc.getJavaScriptFiles();
-        if (javaScriptFiles == null) {
-          javaScriptFiles = new HashMap<String, String[]>();
-        }
-
-        String[] cssArray;
-        String[] javaScriptArray;
 
         for (int i = 0; i < numPages; i++) {
-          page = journal + ".page(" + i + ")";
-          pageName = configuration.getString(page + ".name");
+          String page = journal + ".page(" + i + ")";
+          String pageName = configuration.getString(page + ".name");
           if (log.isDebugEnabled())
             log.debug("Reading config for page name: " + pageName);
 
-          if (!titles.containsKey(pageName)) {
+          if (!jc.getTitles().containsKey(pageName)) {
             final String title = configuration.getString(page + ".title");
             if (title != null) {
-              titles.put(pageName, title);
+              jc.getTitles().put(pageName, title);
             }
           }
 
-          if (!cssFiles.containsKey(pageName)) {
-            Object obj = configuration.getProperty(page+".css");
-            final boolean isDefined = (obj != null);
-            numCss = configuration.getList(page + ".css.file").size();
-            cssArray = new String[numCss];
-            for (j = 0; j < numCss; j++) {
-              cssArray[j] =  dirPrefix + subdirPrefix +
-                             configuration.getString(page + ".css.file(" + j + ")");
+          if (!jc.getCssFiles().containsKey(pageName)) {
+            if ((configuration.getProperty(page+".css") != null)) {
+
+              int numCss = configuration.getList(page + ".css.file").size();
+              String[] cssArray = new String[numCss];
+
+              for (int j = 0; j < numCss; j++) {
+                cssArray[j] =  dirPrefix + subdirPrefix +
+                               configuration.getString(page + ".css.file(" + j + ")");
+              }
+              jc.getCssFiles().put(pageName, cssArray);
             }
-            if ((numCss > 0) || (numCss == 0 && isDefined)) {
-              cssFiles.put(pageName, cssArray);
+          }
+
+          if (!jc.getJavaScriptFiles().containsKey(pageName)) {
+            if ((configuration.getProperty(page+".javascript") != null)) {
+
+              int numJavaScript = configuration.getList(page + ".javascript.file").size();
+              String[] javaScriptArray = new String[numJavaScript];
+
+              for (int j = 0; j < numJavaScript; j++) {
+                String fileName = configuration.getString(page + ".javascript.file(" + j + ")");
+                String filePath;
+                if (fileName.endsWith(".ftl")) {
+                  filePath = subdirPrefix + fileName;
+                } else {
+                  filePath = dirPrefix + subdirPrefix + fileName;
+                }
+                javaScriptArray[j] =  filePath;
+              }
+              jc.getJavaScriptFiles().put(pageName, javaScriptArray);
             }
           }
-
-          if (!javaScriptFiles.containsKey(pageName)) {
-            Object obj = configuration.getProperty(page+".javascript");
-            final boolean isDefined = (obj != null);
-            numJavaScript = configuration.getList(page + ".javascript.file").size();
-            javaScriptArray = new String[numJavaScript];
-
-            for (j = 0; j < numJavaScript; j++) {
-              String fileName = configuration.getString(page + ".javascript.file(" + j + ")");
-              String filePath;
-              if (fileName.endsWith(".ftl")) {
-                filePath = subdirPrefix + fileName;
-              } else {
-                filePath = dirPrefix + subdirPrefix + fileName;
-              }
-              javaScriptArray[j] =  filePath;
-            }
-            if ((numJavaScript > 0) || (numJavaScript == 0 && isDefined)){
-              javaScriptFiles.put(pageName, javaScriptArray);
-            }
-          }
-        }
-        jc.setCssFiles(cssFiles);
-        jc.setJavaScriptFiles(javaScriptFiles);
-        jc.setTitles(titles);
+        }
       }
 
@@ -371 +351 @@
   public String getTitle(String templateName, String journalName) {
     JournalConfig jc = journals.get(journalName);
-    boolean usingDefault = false;
-    if (jc == null) {
-      if (log.isDebugEnabled()) {
-        log.debug("Failed to get journal for given journalName '" + journalName +
-                  "'. Attempting to load default journal '" + defaultJournalName + "'");
-      }
-      usingDefault = true;
-      jc = journals.get(defaultJournalName);
-      if (jc == null) {
-        log.error("Failed to get Journal. defaultJournalName '" + defaultJournalName +
-                  "'. Attempted to get default Journal when given journal name parameter '" +
-                  journalName + "' also returned null. Check your configuration for '" +
-                  DEFAULT_JOURNAL_NAME_CONFIG_KEY + "'");
-        return DEFAULT_TITLE;
-      }
-    }
+    JournalConfig defaultJc = journals.get(defaultJournalName);
+
     String defaultTemplateName = "/"+trimJournalFromTemplatePath(templateName);
 
-    String title = getJournalTitle(jc, templateName, defaultTemplateName);
-
-    if ((title == null) && !usingDefault) {
-      jc = journals.get(defaultJournalName);
-      title = getJournalTitle(jc, templateName, defaultTemplateName);
-    }
-
-    return title != null ? title : DEFAULT_TITLE;
-  }
-
-  private String getJournalTitle(JournalConfig jc, String templateName, String defaultTemplateName) {
-    String title = jc.getTitles().get(templateName);
+    String title = null;
+    if (jc != null) {
+      title = jc.getTitles().get(defaultTemplateName);
+    }
+
+    if (title == null && defaultJc != null) {
+      title = defaultJc.getTitles().get(defaultTemplateName);
+    }
+
+    if (title == null && jc != null) {
+      title = jc.getDefaultTitle();
+    }
+
+    if (title == null && defaultJc != null) {
+      title = defaultJc.getDefaultTitle();
+    }
+
     if (title == null) {
-      title = jc.getTitles().get(defaultTemplateName);
-      if (title == null) {
-        title = jc.getDefaultTitle();
-      }
-    }
+      title = DEFAULT_TITLE;
+    }
+
     return title;
   }
@@ -618 +587 @@
   /**
    * Get the article level metrics host
-   * @return the ALM host string 
+   * @return the ALM host string
    */
   public String getALMHost() {
@@ -824 +793 @@
 
     public JournalConfig () {
-    }
+      cssFiles = new HashMap<String, String[]>();
+      javaScriptFiles = new HashMap<String, String[]>();
+      titles = new HashMap<String, String>();
+    }
+
     /**
      * @return Returns the cssFiles.