Changeset 26062 for main

Timestamp:

2012-08-02T16:14:23+12:00 (12 years ago)

Author:

ak19

Message:

1. Getting the Reset To Default button in Format features to work when it is pressed on the global format statement. 2. default browse format statement needs to call the choose-title template.

File:

• main/trunk/gli/src/org/greenstone/gatherer/cdm/Format4gs3Manager.java (modified) (4 diffs)

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

@@ -64 +64 @@
 public class Format4gs3Manager implements SharedByTwoFormatManager
 {
-
-  // The default global format
-  static final private String GLOBAL_FORMAT = "";
-  static final private String GLOBAL = "global";
+    // The default global format
+    static final private String GLOBAL_FORMAT;
+    static
+    {       
+        // @formatter:off
+        String GLOBAL_FORMAT_TEMP = "" +
+        "<gsf:template name=\"choose-title\">" +
+            "<gsf:choose-metadata>" +
+                "<gsf:metadata name=\"dc.Title\"/>" +
+                "<gsf:metadata name=\"exp.Title\"/>" +
+                "<gsf:metadata name=\"ex.dc.Title\"/>" +
+                "<gsf:metadata name=\"Title\"/>" +
+                "<gsf:default>Untitled</gsf:default>" +
+            "</gsf:choose-metadata>" +
+        "</gsf:template>";
+        GLOBAL_FORMAT = GLOBAL_FORMAT_TEMP;
+        // @formatter:on
+    }
+    static final private String GLOBAL = "global";
     //The default search format
     static final private String SEARCH_FORMAT;
@@ -177 +192 @@
             "<td valign=\"top\">" +
                 "<gsf:link type=\"document\">" +
-                    "<gsf:choose-metadata>" +
-                        "<gsf:metadata name=\"dc.Title\"/>" +
-                        "<gsf:metadata name=\"exp.Title\"/>" +
-                        "<gsf:metadata name=\"ex.dc.Title\"/>" +
-                        "<gsf:metadata name=\"Title\"/>" +
-                        "<gsf:default>Untitled</gsf:default>" +
-                    "</gsf:choose-metadata>" +
+                    "<xsl:call-template name=\"choose-title\">" +                   
                 "</gsf:link>" +
                 "<gsf:switch>" +
@@ -206 +215 @@
             "</td>" +
             "<td valign=\"top\">" +
-                "<gsf:choose-metadata>" +
-                    "<gsf:metadata name=\"dc.Title\"/>" +
-                    "<gsf:metadata name=\"exp.Title\"/>" +
-                    "<gsf:metadata name=\"ex.dc.Title\"/>" +
-                    "<gsf:metadata name=\"Title\"/>" +
-                    "<gsf:default>Untitled</gsf:default>" +
-                "</gsf:choose-metadata>" +
+                "<xsl:call-template name=\"choose-title\">" +
                 "<gsf:switch>" +
                     "<gsf:metadata name=\"Source\"/>" +
@@ -230 +233 @@
     static final private String SEARCHTYPE_FORMAT = "plain,simpleform,advancedform";
     static final private String SEARCHTYPE = "searchType";
-    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 final private String[] FEATURE_NAME = { SEARCH, GLOBAL, DISPLAY, CLASSIFIER_DEFAULT, SEARCHTYPE };
+    static final private String[] FEATURE_FORMAT = { SEARCH_FORMAT, GLOBAL_FORMAT, DISPLAY_DEFAULT_FORMAT, CLASSIFIER_DEFAULT_FORMAT, SEARCHTYPE_FORMAT };
 
     static private HashMap default_format_map = null;