Changeset 3455 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action

Timestamp:

2002-10-11T13:37:05+13:00 (22 years ago)

Author:

kjdon

Message:

dynamically determined stylesheet inclusions

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/action

Files:

• AppletAction.java (modified) (2 diffs)
• PageAction.java (modified) (4 diffs)
• QueryAction.java (modified) (6 diffs)
• ResourceAction.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/AppletAction.java

@@ -10 +10 @@
 
 import java.util.HashMap;
+import java.io.File;
 
 public class AppletAction extends Action {
@@ -86 +87 @@
         addLibraryName(app_desc, config_.library_name_);
         page.appendChild(app_desc);
-        return transformer_.transform(stylesheet, page);
+
+        // process using the stylesheet
+        Document style_doc = converter_.getDOM(new File(stylesheet));
+        GSXSLT.absoluteIncludePaths(style_doc, config_);
+        return transformer_.transform(style_doc, page);    
+
     }
     else if (request_type.equals("r")) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -10 +10 @@
 
 import java.util.HashMap;
+import java.io.File;
+
 public class PageAction extends Action {
 
@@ -51 +53 @@
     coll_list_message.appendChild(coll_list_request);
     coll_list_request.setAttribute("type", "describe");
-    coll_list_request.setAttribute("info", "collectionList");
+    //coll_list_request.setAttribute("info", "collectionList");
     
     Element coll_list_response = (Element)mr_.process(coll_list_message);
@@ -83 +85 @@
 
     String stylesheet = GSFile.stylesheetFile(config_, "home.xsl");
-    String transformed_result = transformer_.transform(stylesheet,
-                               page);    
-    return transformed_result;
+    Document style_doc = converter_.getDOM(new File(stylesheet));
+    GSXSLT.absoluteIncludePaths(style_doc, config_);
+    return transformer_.transform(style_doc, page);    
+    
              
     } // homePage
@@ -111 +114 @@
     // process using the stylesheet
     String stylesheet = GSFile.stylesheetFile(config_, "about.xsl");
+    Document style_doc = converter_.getDOM(new File(stylesheet));
+    GSXSLT.absoluteIncludePaths(style_doc, config_);
+    return transformer_.transform(style_doc, page);    
 
-    //System.out.println("response="+converter_.getString(page));
-    String transformed_result = transformer_.transform(stylesheet,
-                               page);    
-    return transformed_result;
-    
     
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java

@@ -13 +13 @@
 //import java.util.Map;
 import java.util.Iterator;
+import java.io.File;
 
 public class QueryAction extends Action {
@@ -44 +45 @@
         return fieldQuery(page, request);
     }
-    return unknownQuery(page, request);
+    return unknownQuery(page, request, query_type);
 
     
@@ -124 +125 @@
     if (query==null|| query.equals("")) {
         // if there is no q set, just output the search form
-        return transformer_.transform(stylesheet, page);       
+
+        Document style_doc = converter_.getDOM(new File(stylesheet));
+        GSXSLT.absoluteIncludePaths(style_doc, config_);
+        return transformer_.transform(style_doc, page);       
     }
     
@@ -173 +177 @@
         
         page.appendChild(doc_.importNode(result_response, true));
-        return transformer_.transform(stylesheet, page);
+
+        Document style_doc = converter_.getDOM(new File(stylesheet));
+        GSXSLT.absoluteIncludePaths(style_doc, config_);
+        return transformer_.transform(style_doc, page);    
+
     }
 
@@ -206 +214 @@
     page.appendChild(doc_.importNode(result_response, true));
     
-    return transformer_.transform(stylesheet, page);
+    // process using the stylesheet
+    Document style_doc = converter_.getDOM(new File(stylesheet));
+    GSXSLT.absoluteIncludePaths(style_doc, config_);
+    return transformer_.transform(style_doc, page);    
     
     }
@@ -215 +226 @@
 
     }
-    protected String unknownQuery(Element page, Element request) {
-
-    return GSHTML.errorPage("unknown query subtype - unknown query not implemented");
+    protected String unknownQuery(Element page, Element request, String query_type) {
+
+    return GSHTML.errorPage("unknown query subtype - "+query_type+" query not implemented");
     }
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/ResourceAction.java

@@ -9 +9 @@
 
 import java.util.HashMap;
+import java.io.File;
+
 public class ResourceAction extends Action {
 
@@ -77 +79 @@
     page.appendChild(doc_.importNode(GSXML.getChildByTagName(mr_result, "response"), true));
     
+    // process using the stylesheet
+    Document style_doc = converter_.getDOM(new File(stylesheet));
+    GSXSLT.absoluteIncludePaths(style_doc, config_);
+    return transformer_.transform(style_doc, page);    
 
-    String transformed_result = transformer_.transform(stylesheet, page);
-                               
-    
-    return transformed_result;
     }