Changeset 26018 for main/trunk/gli

Timestamp:

2012-07-24T15:36:28+12:00 (12 years ago)

Author:

sjm84

Message:

Changing the default format statement to include some templates for document display

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/Format4gs3Manager.java (modified) (3 diffs)
• util/XMLTools.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/cdm/Format4gs3Manager.java

@@ -32 +32 @@
 import javax.swing.undo.*;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.ws.Dispatch;
 
 import org.fife.ui.rsyntaxtextarea.*;
@@ -95 +96 @@
     }
     static final private String SEARCH = "search";
-    static final private String DISPLAY_FORMAT = "<gsf:option name=\"TOC\" value=\"true\"/>";
+    static final private String DISPLAY_DEFAULT_FORMAT;
+    static
+    {
+        // @formatter:off
+        String DISPLAY_DEFAULT_FORMAT_TEMP = "" +
+        "<gsf:option name=\"TOC\" value=\"true\"/>" +
+        "<!--" +
+            "Overwriting this template allows you to change the heading of the document." +
+        "-->" +
+        "<!--" +
+        "<gsf:template name=\"documentHeading\">" +
+            "<span style=\"font-weight:bold; font-size: 120%;\">" +
+                "<xsl:call-template name=\"choose-title\"/>" +
+            "</span>" +
+        "</gsf:template>" +
+        "-->" +
+        "<!--" +
+            "Overwriting this template can be used to redefine the content of the whole document." + 
+            "This is useful for simple documents, but not recommended for more complex documents" +
+            "(e.g. hierachical and paged documents) as it can prevent any sub-sections from showing." +
+        "-->" +
+        "<!--" +
+        "<gsf:template name=\"documentContent\">" +
+            "<xsl:call-template name=\"wrappedSectionImage\"/>" +
+            "<xsl:call-template name=\"wrappedSectionText\"/>" +
+        "</gsf:template>" +
+        "-->" +
+        "<!--" +
+            "Overwriting this template can be used to change the content of section headings." +
+        "-->" +
+        "<!--" +
+        "<gsf:template name=\"sectionHeading\">" +
+            "<xsl:call-template name=\"choose-title\"/>" +
+        "</gsf:template>" +
+        "-->" +
+        "<!--" +
+            "Overwriting this template can be used to change the content of the top-level section." +
+        "-->" +
+        "<!--" +
+        "<gsf:template name=\"topLevelSectionContent\">" +
+            "<xsl:call-template name=\"wrappedSectionImage\"/>" +
+            "<xsl:call-template name=\"wrappedSectionText\"/>" +
+        "</gsf:template>" +
+        "-->" +
+        "<!--" +
+            "Overwriting this template can be used to change the content of sections." +
+        "-->" +
+        "<!--" +
+        "<gsf:template name=\"sectionContent\">" +
+            "<xsl:call-template name=\"wrappedSectionImage\"/>" +
+            "<xsl:call-template name=\"wrappedSectionText\"/>" +
+        "</gsf:template>" +
+        "-->";
+        // @formatter:on
+        
+        DISPLAY_DEFAULT_FORMAT = DISPLAY_DEFAULT_FORMAT_TEMP;
+    }
     static final private String DISPLAY = "display";
 
@@ -173 +230 @@
     static final private String SEARCHTYPE_FORMAT = "plain,simpleform,advancedform";
     static final private String SEARCHTYPE = "searchType";
-  static final private String[] FEATURE_NAME = { GLOBAL, SEARCH, DISPLAY, CLASSIFIER_DEFAULT, SEARCHTYPE };
-  static final private String[] FEATURE_FORMAT = { GLOBAL_FORMAT, SEARCH_FORMAT, DISPLAY_FORMAT, CLASSIFIER_DEFAULT_FORMAT, SEARCHTYPE_FORMAT };
+    static final private String[] FEATURE_NAME = { SEARCH, DISPLAY, CLASSIFIER_DEFAULT, SEARCHTYPE };
+    static final private String[] FEATURE_FORMAT = { SEARCH_FORMAT, DISPLAY_DEFAULT_FORMAT, CLASSIFIER_DEFAULT_FORMAT, SEARCHTYPE_FORMAT };
 
     static private HashMap default_format_map = null;

main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java

@@ -1000 +1000 @@
             return;
         }
-
+        
         if (e.getNodeType() == Node.COMMENT_NODE)
         {
             if (e.getNodeValue() != "")
             {
-                sb.append("<!--" + e.getNodeValue() + "-->");
+                sb.append("<!--\n" + e.getNodeValue() + "\n-->\n");
             }
             return;