Changeset 3895

Timestamp:

2003-03-18T15:01:35+12:00 (21 years ago)

Author:

kjdon

Message:

tidied up a bit

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java (modified) (10 diffs)

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

@@ -52 +52 @@
         return null;
     }
+    Document style_doc = converter_.getDOM(new File(stylesheet));
+
+    // part of the data for the page is the cgi-params
+    // if we have this here, do we need to overwrite default values in the 
+    // param list down below??
+    Element cgi_request = (Element)doc_.importNode(request, true);
+    page.appendChild(cgi_request);
 
     // extract the params from the cgi-request, and check that we have a coll specified
     Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    
     HashMap params = GSXML.extractParams(cgi_param_list, false);
     
@@ -65 +71 @@
         return null; 
     }
-
-    // get the service info from the MR - this will probably need to be cached somehow later on. and add the service node to the page 
-    Element mr_info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-    Element mr_info_request = doc_.createElement(GSXML.REQUEST_ELEM);
-    mr_info_message.appendChild(mr_info_request);
-    mr_info_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
-    mr_info_request.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
-
-    String to = collection;
-    to = GSPath.appendLink(to, service_name);
-    mr_info_request.setAttribute(GSXML.TO_ATT, to);
-
+    
+    String lang = request.getAttribute(GSXML.LANG_ATT);
+    String to = GSPath.appendLink(collection, service_name);
+
+    // the second part of the page is the service description 
+    // for now get this again from the service. 
+    // this will probably need to be cached somehow later on. 
+    Element mr_info_message = createDescribeRequest(to, lang, null);
     Element mr_info_response = (Element) mr_.process(mr_info_message);
-    String path = GSXML.RESPONSE_ELEM;
-    path = GSPath.appendLink(path, GSXML.SERVICE_ELEM);
+    
+    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.SERVICE_ELEM);
     Element description = (Element)doc_.importNode(GSXML.getNodeByPath(mr_info_response, path), true);
     Element pl = (Element)GSXML.getChildByTagName(description, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     
     if (pl !=null) {
-        System.out.println("adding shortnames");
         // add short names to the params in the param list
         cgi_.paramListAddShortNames(pl);
@@ -116 +117 @@
     }
     
-    // part of the data for the description is the cgi-params
-    // if we have this here, do we need to do the previous step?
-    Element cgi_request = (Element)doc_.importNode(request, true);
-    page.appendChild(cgi_request);
-
+    // append the description to the page
     page.appendChild(description);
-
+    
     // just a display request
     if (request_type.equals("d")) {
         // output the page
         // process using the stylesheet
-        Document style_doc = converter_.getDOM(new File(stylesheet));
         GSXSLT.absoluteIncludePaths(style_doc, config_);
         return (Element)transformer_.transform(style_doc, page);    
     }
-        
+    
     // do the query
     Element mr_query_message = doc_.createElement(GSXML.MESSAGE_ELEM);
@@ -145 +141 @@
         
         
-    System.out.println("Query request: " + converter_.getString(mr_query_request));
+    //System.out.println("Query request: " + converter_.getString(mr_query_request));
     Element mr_query_response = (Element)mr_.process(mr_query_message);
-    System.out.println("Query response: " + converter_.getString(mr_query_response));
+    //System.out.println("Query response: " + converter_.getString(mr_query_response));
 
     Element query_result_metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/metadataList");
@@ -154 +150 @@
     }
 
-    Element query_term_info_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/content/termList");
+    Element query_term_info_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/termList");
     if (query_term_info_list == null) {
         System.err.println("Warning: No query term information.\n");
@@ -165 +161 @@
     
     // check that there are some documents - for now check the list, but later should use a numdocs metadata elem
-    path = GSXML.RESPONSE_ELEM;
-    //path = GSPath.appendLink(path, GSXML.CONTENT_ELEM);
-    path = GSPath.appendLink(path, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     
     Element document_list = (Element)GSXML.getNodeByPath(mr_query_response,
-                                 path); // documentList not present if no docs found
+                                 path); 
+    // documentList not present if no docs found
     if (document_list == null) {
         
@@ -177 +172 @@
         page.appendChild(doc_.importNode(result_response, true));
         
-        Document style_doc = converter_.getDOM(new File(stylesheet));
         GSXSLT.absoluteIncludePaths(style_doc, config_);
         return (Element)transformer_.transform(style_doc, page);    
@@ -202 +196 @@
     dm_param.setAttribute(GSXML.VALUE_ATT, "Title");
 
-    //Element meta_content = doc_.createElement(GSXML.CONTENT_ELEM);
-    //mr_metadata_request.appendChild(meta_content);
-    
-    // the first part of the content is the doc list
-    //meta_content.appendChild(doc_.importNode(document_list, true));
     mr_metadata_request.appendChild(doc_.importNode(document_list, true));
     // System.out.println("Metadata request: " + converter_.getString(mr_metadata_message));
@@ -219 +208 @@
     // If there is some metadata about the query results, add it in
     if (query_term_info_list != null) {
-        //Element result_content = (Element) GSXML.getChildByTagName(result_response, GSXML.CONTENT_ELEM);
-        //result_content.appendChild(query_term_info_list);
         result_response.appendChild(query_term_info_list);
     }
@@ -226 +213 @@
     page.appendChild(doc_.importNode(result_response, true));
     
-    System.out.println("XMLTransformer input: " + converter_.getString(page));
+    System.out.println("Query XMLTransformer input:\n " + converter_.getString(page));
     
     // output the page
     // process using the stylesheet
-    Document style_doc = converter_.getDOM(new File(stylesheet));
     GSXSLT.absoluteIncludePaths(style_doc, config_);
-    // Node temp = transformer_.transform(style_doc, page);
-        // System.out.println("XMLTransformer output: " + converter_.getString(temp));
-    // return (Element) temp;
     return (Element)transformer_.transform(style_doc, page);
     
     }
-
-
 }