Changeset 5098

Timestamp:

2003-08-06T12:02:10+12:00 (21 years ago)

Author:

kjdon

Message:

gadually standardising my Java code. have turned all class variables from like doc_ to this.doc.

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/service

Files:

• GATEServices.java (modified) (9 diffs)
• GS2Construct.java (modified) (24 diffs)
• GS2MGPPRetrieve.java (modified) (6 diffs)
• GS2MGPPSearch.java (modified) (23 diffs)
• GS2MGRetrieve.java (modified) (7 diffs)
• GS2MGSearch.java (modified) (11 diffs)
• GS2Retrieve.java (modified) (35 diffs)
• GS2Search.java (modified) (14 diffs)
• PhindPhraseBrowse.java (modified) (19 diffs)
• ServiceRack.java (modified) (11 diffs)
• XSLTServices.java (modified) (8 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GATEServices.java

@@ -61 +61 @@
     protected static final String ANNOTATION_TYPE_PARAM = "annotationType";
 
-    protected Element config_info_ = null;
-
-    protected CorpusController application_;
-
-    protected Corpus corpus_;
-
-    protected String[] annotation_types_ = { "Date", "Location",
+    protected Element config_info = null;
+
+    protected CorpusController application;
+
+    protected Corpus corpus;
+
+    protected String[] annotation_types = { "Date", "Location",
                          "Organization", "Person" };
     // Address, 
@@ -81 +81 @@
     {
     System.out.println("Configuring GATEServices...");
-    config_info_ = info;
+    this.config_info = info;
 
     // set up short_service_info_ - for now just has name and type
-    Element tag_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    Element tag_service = this.doc.createElement(GSXML.SERVICE_ELEM);
     tag_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_ENRICH);
     tag_service.setAttribute(GSXML.NAME_ATT, GATE_POS_TAG_SERVICE);
-    short_service_info_.appendChild(tag_service);
+    this.short_service_info.appendChild(tag_service);
 
 
@@ -103 +103 @@
         URL applicationFileURL = ClassLoader.getSystemResource("gate.app");
         File applicationFile = new File(applicationFileURL.getFile());
-        application_ = (CorpusController) PersistenceManager.loadObjectFromFile(applicationFile);
+        this.application = (CorpusController) PersistenceManager.loadObjectFromFile(applicationFile);
 
         /* Collection processing_resources = application.getPRs();
@@ -118 +118 @@
 
         // Create a new corpus
-        corpus_ = Factory.newCorpus("GSDL3 Corpus");
-        application_.setCorpus(corpus_);
+        this.corpus = Factory.newCorpus("GSDL3 Corpus");
+        this.application.setCorpus(this.corpus);
     }
     catch (Exception e) {
@@ -133 +133 @@
         return null;
     }
-    Element tag_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    Element tag_service = this.doc.createElement(GSXML.SERVICE_ELEM);
     tag_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_ENRICH);
     tag_service.setAttribute(GSXML.NAME_ATT, GATE_POS_TAG_SERVICE);
-    tag_service.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_NAME, getTextString(service+".name", lang)));
-    tag_service.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service+".submit", lang)));
-    Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    tag_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(service+".name", lang)));
+    tag_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service+".submit", lang)));
+    Element param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     createParameter(ANNOTATION_TYPE_PARAM, param_list, lang);
     tag_service.appendChild(param_list);
@@ -153 +153 @@
 
     if (name.equals(ANNOTATION_TYPE_PARAM)) {
-        int len = annotation_types_.length;
+        int len = this.annotation_types.length;
         String[] annotation_type_names = new String[len];
         for (int i = 0; i < len; i++) {
-        annotation_type_names[i] = getTextString("param." + name + "." + annotation_types_[i], lang);
+        annotation_type_names[i] = getTextString("param." + name + "." + this.annotation_types[i], lang);
         }
         
-        param = GSXML.createParameterDescription(doc_, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_MULTI, annotation_types_[0], annotation_types_, annotation_type_names);
+        param = GSXML.createParameterDescription(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_MULTI, this.annotation_types[0], this.annotation_types, annotation_type_names);
         param_list.appendChild(param);
     }
@@ -171 +171 @@
 
     // Create a new (empty) result message
-    Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT, GATE_POS_TAG_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -222 +222 @@
 
         annotated_text = "<nodeContent>" + annotated_text + "</nodeContent>";
-        Element annotated_content = converter_.getDOM(annotated_text).getDocumentElement();
+        Element annotated_content = this.converter.getDOM(annotated_text).getDocumentElement();
         doc_node.replaceChild(doc_node.getOwnerDocument().importNode(annotated_content, true), content);
     }
 
-    result.appendChild(doc_.importNode(doc_node_list, true));
+    result.appendChild(this.doc.importNode(doc_node_list, true));
     // System.out.println("GatePOSTag result:\n" + converter_.getPrettyString(result));
     return result;
@@ -245 +245 @@
 
         // Add it to the corpus
-        corpus_.clear();
-        corpus_.add(doc);
+        this.corpus.clear();
+        this.corpus.add(doc);
 
         // Process the corpus
-        application_.execute();
+        this.application.execute();
 
         // Extract all the annotations

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -67 +67 @@
     
     // the list of the collections - store between some method calls
-    private String[] collection_list_ = null;
+    private String[] collection_list = null;
 
     // set of listeners for any construction commands
-    protected Map listeners_ = null;
+    protected Map listeners = null;
     
     public GS2Construct() {
-    listeners_ = Collections.synchronizedMap(new HashMap());
+    this.listeners = Collections.synchronizedMap(new HashMap());
     
     }
@@ -80 +80 @@
     protected Element getServiceDescription(String service, String lang) {
 
-    Element description = doc_.createElement(GSXML.SERVICE_ELEM);
+    Element description = this.doc.createElement(GSXML.SERVICE_ELEM);
     description.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     description.setAttribute(GSXML.NAME_ATT, service);
-    description.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_NAME,  getTextString(service+".name", lang)));
-    description.appendChild(GSXML.createDisplayTextElement(doc_,  GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service+".submit", lang)));
-
-    Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    description.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME,  getTextString(service+".name", lang)));
+    description.appendChild(GSXML.createDisplayTextElement(this.doc,  GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service+".submit", lang)));
+
+    Element param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     description.appendChild(param_list);
     
     if (service.equals(NEW_SERVICE)) {
         
-        Element param = GSXML.createParameterDescription(doc_, NEW_COL_TITLE_PARAM, getTextString("param."+NEW_COL_TITLE_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
-        param_list.appendChild(param);
-        param = GSXML.createParameterDescription(doc_, CREATOR_PARAM, getTextString("param."+CREATOR_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
-        param_list.appendChild(param);
-        param = GSXML.createParameterDescription(doc_, NEW_COL_ABOUT_PARAM, getTextString("param."+NEW_COL_ABOUT_PARAM, lang), GSXML.PARAM_TYPE_TEXT, null, null, null);
+        Element param = GSXML.createParameterDescription(this.doc, NEW_COL_TITLE_PARAM, getTextString("param."+NEW_COL_TITLE_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
+        param_list.appendChild(param);
+        param = GSXML.createParameterDescription(this.doc, CREATOR_PARAM, getTextString("param."+CREATOR_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
+        param_list.appendChild(param);
+        param = GSXML.createParameterDescription(this.doc, NEW_COL_ABOUT_PARAM, getTextString("param."+NEW_COL_ABOUT_PARAM, lang), GSXML.PARAM_TYPE_TEXT, null, null, null);
         param_list.appendChild(param);
         String[] types = {BUILDTYPE_MGPP, BUILDTYPE_MG};
         String[] type_texts = {getTextString("param."+BUILDTYPE_PARAM+"."+BUILDTYPE_MGPP, lang), getTextString("param."+BUILDTYPE_PARAM+"."+BUILDTYPE_MG, lang)};
         
-        param = GSXML.createParameterDescription(doc_, BUILDTYPE_PARAM, getTextString("param."+BUILDTYPE_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, BUILDTYPE_MGPP, types, type_texts);
+        param = GSXML.createParameterDescription(this.doc, BUILDTYPE_PARAM, getTextString("param."+BUILDTYPE_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, BUILDTYPE_MGPP, types, type_texts);
         param_list.appendChild(param);
         return description;
@@ -108 +108 @@
     if (service.equals(ACTIVATE_SERVICE) || service.equals(IMPORT_SERVICE) || service.equals(BUILD_SERVICE) || service.equals(RELOAD_SERVICE) || service.equals(DELETE_SERVICE)) {
         
-        collection_list_ = getCollectionList();
-        Element param = GSXML.createParameterDescription(doc_, COL_PARAM, getTextString("param."+COL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, null, collection_list_, collection_list_); 
+        this.collection_list = getCollectionList();
+        Element param = GSXML.createParameterDescription(this.doc, COL_PARAM, getTextString("param."+COL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, null, this.collection_list, this.collection_list); 
         param_list.appendChild(param);
         
@@ -129 +129 @@
     // decode the file name, add it to the import directory
     String name = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.FROM_ATT, name);
-    Element status = doc_.createElement(GSXML.STATUS_ELEM);
+    Element status = this.doc.createElement(GSXML.STATUS_ELEM);
     response.appendChild(status);
     //String lang = request.getAttribute(GSXML.LANG_ATT);
     //String request_type = request.getAttribute(GSXML.TYPE_ATT);
-    Text t = doc_.createTextNode("AddDocument: not implemented yet");
+    Text t = this.doc.createTextNode("AddDocument: not implemented yet");
     status.appendChild(t);
     status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -164 +164 @@
     }
     String id = status.getAttribute(GSXML.STATUS_PROCESS_ID_ATT);
-    GS2PerlListener listener = (GS2PerlListener)listeners_.get(id);
+    GS2PerlListener listener = (GS2PerlListener)this.listeners.get(id);
     if (listener==null) {
         System.err.println("somethings gone wrong, couldn't find the listener");
@@ -181 +181 @@
     
     // add the rest of the messages to the status node
-    Text t = doc_.createTextNode("\n"+listener.getUpdate());
+    Text t = this.doc.createTextNode("\n"+listener.getUpdate());
     status.appendChild(t);
     status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(listener.getStatus()));
@@ -188 +188 @@
     }
 
-    t = doc_.createTextNode("\n");
+    t = this.doc.createTextNode("\n");
     status.appendChild(t);
     // once have got here, we assume
@@ -200 +200 @@
     // the response to send back
     String name = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.FROM_ATT, name);
-    Element status = doc_.createElement(GSXML.STATUS_ELEM);
+    Element status = this.doc.createElement(GSXML.STATUS_ELEM);
     response.appendChild(status);
     Text t = null; // the text node for the error/success message
@@ -225 +225 @@
     String coll_name = (String)params.get(COL_PARAM);   
     String[] args={coll_name};
-    File coll_dir = new File(GSFile.collectionBaseDir(site_home_, coll_name));
+    File coll_dir = new File(GSFile.collectionBaseDir(this.site_home, coll_name));
     // check that the coll is there in the first place
     if (!coll_dir.exists()) {
-        t = doc_.createTextNode(getTextString("delete.exists_error", args, lang));
+        t = this.doc.createTextNode(getTextString("delete.exists_error", args, lang));
         status.appendChild(t);
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -236 +236 @@
     // try to delete the directory
     if (!GSFile.deleteFile(coll_dir)) {
-        t = doc_.createTextNode(getTextString("delete.delete_error", args, lang));
+        t = this.doc.createTextNode(getTextString("delete.delete_error", args, lang));
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
         status.appendChild(t);
@@ -249 +249 @@
     // the response to send back
     String name = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.FROM_ATT, name);
-    Element status = doc_.createElement(GSXML.STATUS_ELEM);
+    Element status = this.doc.createElement(GSXML.STATUS_ELEM);
     response.appendChild(status);
     Text t = null; // the text node for the error/success message
@@ -287 +287 @@
     
     // send the request to the MR
-    Element message = doc_.createElement(GSXML.MESSAGE_ELEM);
-    Element request = doc_.createElement(GSXML.REQUEST_ELEM);
+    Element message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+    Element request = this.doc.createElement(GSXML.REQUEST_ELEM);
     request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_CONFIGURE);
     request.setAttribute(GSXML.TO_ATT, "");
     message.appendChild(request);
-    Element command = doc_.createElement(GSXML.CONFIGURE_ELEM);
+    Element command = this.doc.createElement(GSXML.CONFIGURE_ELEM);
     command.setAttribute(GSXML.TYPE_ATT, GSXML.COLLECTION_ELEM);
     command.setAttribute(GSXML.NAME_ATT, coll_name);
@@ -304 +304 @@
     }
     request.appendChild(command);
-    Element response = router_.process(message); // at the moment, get no info in response so ignore it
+    Element response = this.router.process(message); // at the moment, get no info in response so ignore it
     Text t;
     String[] args={coll_name};
         
     if (response == null) {
-        t = doc_.createTextNode(getTextString(action_name+".configure_error", args , lang));
+        t = this.doc.createTextNode(getTextString(action_name+".configure_error", args , lang));
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
         status.appendChild(t);
@@ -316 +316 @@
         
     // if we got here, we have succeeded!
-    t = doc_.createTextNode(getTextString(action_name+".success", args, lang));
+    t = this.doc.createTextNode(getTextString(action_name+".success", args, lang));
     status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.SUCCESS));
     status.appendChild(t);
@@ -333 +333 @@
     // set up short_service_info_ - for now just has name and type
 
-    e = doc_.createElement(GSXML.SERVICE_ELEM);
+    e = this.doc.createElement(GSXML.SERVICE_ELEM);
     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     e.setAttribute(GSXML.NAME_ATT, NEW_SERVICE);
-    short_service_info_.appendChild(e);
-
-    e = doc_.createElement(GSXML.SERVICE_ELEM);
+    this.short_service_info.appendChild(e);
+
+    e = this.doc.createElement(GSXML.SERVICE_ELEM);
     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     e.setAttribute(GSXML.NAME_ATT, IMPORT_SERVICE);
-    short_service_info_.appendChild(e);
-
-    e = doc_.createElement(GSXML.SERVICE_ELEM);
+    this.short_service_info.appendChild(e);
+
+    e = this.doc.createElement(GSXML.SERVICE_ELEM);
     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     e.setAttribute(GSXML.NAME_ATT, BUILD_SERVICE);
-    short_service_info_.appendChild(e);
-
-    e = doc_.createElement(GSXML.SERVICE_ELEM);
+    this.short_service_info.appendChild(e);
+
+    e = this.doc.createElement(GSXML.SERVICE_ELEM);
     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     e.setAttribute(GSXML.NAME_ATT, ACTIVATE_SERVICE);
-    short_service_info_.appendChild(e);
-
-    e = doc_.createElement(GSXML.SERVICE_ELEM);
+    this.short_service_info.appendChild(e);
+
+    e = this.doc.createElement(GSXML.SERVICE_ELEM);
     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     e.setAttribute(GSXML.NAME_ATT, DELETE_SERVICE);
-    short_service_info_.appendChild(e);
-
-    e = doc_.createElement(GSXML.SERVICE_ELEM);
+    this.short_service_info.appendChild(e);
+
+    e = this.doc.createElement(GSXML.SERVICE_ELEM);
     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     e.setAttribute(GSXML.NAME_ATT, RELOAD_SERVICE);
-    short_service_info_.appendChild(e);
-
-    //e = doc_.createElement(GSXML.SERVICE_ELEM);
+    this.short_service_info.appendChild(e);
+
+    //e = this.doc.createElement(GSXML.SERVICE_ELEM);
     //e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
     //e.setAttribute(GSXML.NAME_ATT, ADD_DOC_SERVICE);
-    //short_service_info_.appendChild(e);
+    //this.short_service_info.appendChild(e);
 
 
@@ -377 +377 @@
     // the response to send back
     String name = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.FROM_ATT, name);
-    Element status = doc_.createElement(GSXML.STATUS_ELEM);
+    Element status = this.doc.createElement(GSXML.STATUS_ELEM);
     response.appendChild(status);
 
@@ -397 +397 @@
         String id = (String)params.get(PROCESS_ID_PARAM);
         status.setAttribute(GSXML.STATUS_PROCESS_ID_ATT, id);
-        GS2PerlListener listener = (GS2PerlListener)listeners_.get(id);
+        GS2PerlListener listener = (GS2PerlListener)this.listeners.get(id);
         if (listener==null) {
-        Text t = doc_.createTextNode(getTextString("general.process_id_error", lang));
+        Text t = this.doc.createTextNode(getTextString("general.process_id_error", lang));
         status.appendChild(t);
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
         } else {
-        Text t = doc_.createTextNode(listener.getUpdate());
+        Text t = this.doc.createTextNode(listener.getUpdate());
         status.appendChild(t);
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(listener.getStatus()));
         // check that we actually should be removing the listener here
         if (listener.isFinished()) { // remove this listener - its job is done
-            listeners_.remove(id); // not working
+            this.listeners.remove(id); // not working
         }
         }
@@ -431 +431 @@
     GS2PerlConstructor constructor = new GS2PerlConstructor("perl_build");
     if (!constructor.configure()) {
-        Text t = doc_.createTextNode(getTextString("general.configure_constructor_error", lang));
+        Text t = this.doc.createTextNode(getTextString("general.configure_constructor_error", lang));
         status.appendChild(t);
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -437 +437 @@
     }
         
-    constructor.setSiteHome(site_home_);
+    constructor.setSiteHome(this.site_home);
     constructor.setCollectionName(coll_name);
     constructor.setActionType(type);
@@ -447 +447 @@
 
     String id = newID();
-    listeners_.put(id, listener);
+    this.listeners.put(id, listener);
 
     status.setAttribute(GSXML.STATUS_PROCESS_ID_ATT, id);
     status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ACCEPTED));
-    Text t = doc_.createTextNode(getTextString("general.process_start", lang));
+    Text t = this.doc.createTextNode(getTextString("general.process_start", lang));
     status.appendChild(t);
     return response;
@@ -465 +465 @@
     protected String[] getCollectionList() {
     
-    File collectDir = new File(GSFile.collectDir(site_home_));
+    File collectDir = new File(GSFile.collectDir(this.site_home));
     if (!collectDir.exists()) {
         System.err.println("couldn't find collect dir: "+collectDir.toString());
@@ -513 +513 @@
         base_name = coll_title.substring(0,6);
     }
-    File coll_dir = new File(GSFile.collectionBaseDir(site_home_, base_name));
+    File coll_dir = new File(GSFile.collectionBaseDir(this.site_home, base_name));
     if (!coll_dir.exists()) { // this name is ok - not used yet
         return base_name;
@@ -523 +523 @@
     while(coll_dir.exists()) {
         i++;
-        coll_dir = new File(GSFile.collectionBaseDir(site_home_, base_name+Integer.toString(i)));
+        coll_dir = new File(GSFile.collectionBaseDir(this.site_home, base_name+Integer.toString(i)));
     }
     return base_name+Integer.toString(i);
@@ -534 +534 @@
     protected Element extractOtherParams(HashMap params, int type) {
 
-    Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    Element param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (type == GS2PerlConstructor.NEW) {
-        Element param = doc_.createElement(GSXML.PARAM_ELEM);
+        Element param = this.doc.createElement(GSXML.PARAM_ELEM);
         param.setAttribute(GSXML.NAME_ATT, "creator");
         param.setAttribute(GSXML.VALUE_ATT, (String)params.get(CREATOR_PARAM));
         
         param_list.appendChild(param);
-        param = doc_.createElement(GSXML.PARAM_ELEM);
+        param = this.doc.createElement(GSXML.PARAM_ELEM);
         param.setAttribute(GSXML.NAME_ATT, "about");
         param.setAttribute(GSXML.VALUE_ATT, (String)params.get(NEW_COL_ABOUT_PARAM));
         param_list.appendChild(param);
-        param = doc_.createElement(GSXML.PARAM_ELEM);
+        param = this.doc.createElement(GSXML.PARAM_ELEM);
         param.setAttribute(GSXML.NAME_ATT, "title");
         param.setAttribute(GSXML.VALUE_ATT, (String)params.get(NEW_COL_TITLE_PARAM));
         param_list.appendChild(param);
-        param = doc_.createElement(GSXML.PARAM_ELEM);
+        param = this.doc.createElement(GSXML.PARAM_ELEM);
         param.setAttribute(GSXML.NAME_ATT, "buildtype");
         param.setAttribute(GSXML.VALUE_ATT, (String)params.get(BUILDTYPE_PARAM));

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java

@@ -47 +47 @@
     private static final String DEFAULT_LEVEL_ELEM = "defaultLevel";
 
-    private MGPPWrapper mgpp_src_ = null;
+    private MGPPWrapper mgpp_src = null;
     
-    private String default_level_ = null;
+    private String default_level = null;
 
 
@@ -55 +55 @@
     public GS2MGPPRetrieve()
     {
-    mgpp_src_ = new MGPPWrapper();
+    this.mgpp_src = new MGPPWrapper();
     }
 
@@ -68 +68 @@
     Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_LEVEL_ELEM);
     if (def != null) {
-        default_level_ = def.getAttribute(GSXML.NAME_ATT);
+        this.default_level = def.getAttribute(GSXML.NAME_ATT);
     }
-    if (default_level_ == null || default_level_.equals("")) {
+    if (this.default_level == null || this.default_level.equals("")) {
         System.err.println("Error: default level not specified!");
         return false;
@@ -85 +85 @@
     {
     // Create a new (empty) result message
-    Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT,DOCUMENT_CONTENT_RETRIEVE_SERVICE );
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -99 +99 @@
     }
 
-    Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(doc_list);
 
     // The location of the MGPP text files
-    String textdir = GSFile.collectionBaseDir(site_home_, cluster_name_) +
-        File.separatorChar + GSFile.collectionTextPath(cluster_name_);
+    String textdir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) +
+        File.separatorChar + GSFile.collectionTextPath(this.cluster_name);
 
     // Get the documents
@@ -113 +113 @@
 
         if (OID.needsTranslating(doc_id)) {
-        doc_id = gdbm_src_.translateOID(doc_id);
+        doc_id = this.gdbm_src.translateOID(doc_id);
         }
 
-        long doc_num = gdbm_src_.oid2Docnum(doc_id);
-        String doc_content = mgpp_src_.getDocument(textdir, default_level_, doc_num);
+        long doc_num = this.gdbm_src.oid2Docnum(doc_id);
+        String doc_content = this.mgpp_src.getDocument(textdir, this.default_level, doc_num);
         doc_content = resolveImages(doc_content, doc_id);
 
         // For now, stick it in a text node - eventually should be parsed as xml??
 
-        Element doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
+        Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
         doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
-        GSXML.addDocText(doc_, doc, doc_content);
+        GSXML.addDocText(this.doc, doc, doc_content);
         doc_list.appendChild(doc);
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java

@@ -76 +76 @@
     
     protected static final String FIELD_ATT = "field";
-    private MGPPWrapper mgpp_src_=null;
+    private MGPPWrapper mgpp_src=null;
 
     // the default level for retrieval - and we'll use it for searching too
-    private String default_level_=null;
+    private String default_level=null;
     
     /** constructor */
     public GS2MGPPSearch()
     {
-    mgpp_src_ = new MGPPWrapper();
+    this.mgpp_src = new MGPPWrapper();
     }
 
@@ -101 +101 @@
     Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_LEVEL_ELEM);
     if (def != null) {
-        default_level_ = def.getAttribute(GSXML.NAME_ATT);
-    }
-    if (default_level_ == null || default_level_.equals("")) {
+        this.default_level = def.getAttribute(GSXML.NAME_ATT);
+    }
+    if (this.default_level == null || this.default_level.equals("")) {
         System.err.println("Error: default level not specified!");
         return false;
@@ -110 +110 @@
     // the default level is also the level which gdbm is expecting
     // this must not be overwritten
-    mgpp_src_.setReturnLevel(default_level_);
+    this.mgpp_src.setReturnLevel(this.default_level);
     // return term info
-    mgpp_src_.setReturnTerms(true);
+    this.mgpp_src.setReturnTerms(true);
     // set the default - this may be overwritten by query params
-    mgpp_src_.setQueryLevel(default_level_);
+    this.mgpp_src.setQueryLevel(this.default_level);
 
     // set up the extra services which are available for this collection
@@ -127 +127 @@
     
     // set up short_service_info_ - for now just has id and type - name will be added in on teh fly
-    Element fq_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    Element fq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
     fq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
     fq_service.setAttribute(GSXML.NAME_ATT, FIELD_QUERY_SERVICE);
-    short_service_info_.appendChild(fq_service);
-    
-    Element afq_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    this.short_service_info.appendChild(fq_service);
+    
+    Element afq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
     afq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
     afq_service.setAttribute(GSXML.NAME_ATT, ADVANCED_FIELD_QUERY_SERVICE);
-    short_service_info_.appendChild(afq_service);
+    this.short_service_info.appendChild(afq_service);
     
 
     //set up format info - the info is the same as that for text query
-    Element format_info = (Element)format_info_map_.get(TEXT_QUERY_SERVICE);
+    Element format_info = (Element)format_info_map.get(TEXT_QUERY_SERVICE);
     if (format_info != null) {
-        format_info_map_.put(FIELD_QUERY_SERVICE, format_info);
-        format_info_map_.put(ADVANCED_FIELD_QUERY_SERVICE, format_info);
+        this.format_info_map.put(FIELD_QUERY_SERVICE, format_info);
+        this.format_info_map.put(ADVANCED_FIELD_QUERY_SERVICE, format_info);
     }
     return true;
@@ -153 +153 @@
     }
     
-    Element service = doc_.createElement(GSXML.SERVICE_ELEM);
+    Element service = this.doc.createElement(GSXML.SERVICE_ELEM);
     service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
     service.setAttribute(GSXML.NAME_ATT, service_id);
-    service.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_NAME, getTextString(service_id+".name", lang)));
-    service.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service_id+".submit", lang)));
-    Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);  
+    service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(service_id+".name", lang)));
+    service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service_id+".submit", lang)));
+    service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(service_id+".description", lang)));
+    Element param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);  
     service.appendChild(param_list);
     if (service_id.equals(FIELD_QUERY_SERVICE)) {
@@ -176 +177 @@
     if (id.equals(LEVEL_PARAM)) {
         // the level info - read from config file
-        Element level_list = (Element)GSXML.getChildByTagName(config_info_, LEVEL_ELEM+GSXML.LIST_MODIFIER);
+        Element level_list = (Element)GSXML.getChildByTagName(this.config_info, LEVEL_ELEM+GSXML.LIST_MODIFIER);
         NodeList levels = level_list.getElementsByTagName(LEVEL_ELEM);
         int len = levels.getLength();
@@ -188 +189 @@
         }
         // the first one is the default
-            param = GSXML.createParameterDescription(doc_, LEVEL_PARAM, getTextString("param."+LEVEL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, levs[0], levs, lev_names);
+            param = GSXML.createParameterDescription(this.doc, LEVEL_PARAM, getTextString("param."+LEVEL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, levs[0], levs, lev_names);
             
         }
@@ -195 +196 @@
         String [] vals1_texts = { getTextString("param."+RANK_PARAM+"."+RANK_PARAM_RANK, lang), getTextString("param."+RANK_PARAM+"."+RANK_PARAM_NONE, lang)};
         
-        param = GSXML.createParameterDescription(doc_, RANK_PARAM, getTextString("param."+RANK_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, RANK_PARAM_RANK, vals1, vals1_texts );
+        param = GSXML.createParameterDescription(this.doc, RANK_PARAM, getTextString("param."+RANK_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, RANK_PARAM_RANK, vals1, vals1_texts );
         
     } else if (id.equals(FIELD_QUERY_PARAM)) {
-        param = GSXML.createParameterDescription(doc_, FIELD_QUERY_PARAM, getTextString("param."+FIELD_QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
+        param = GSXML.createParameterDescription(this.doc, FIELD_QUERY_PARAM, getTextString("param."+FIELD_QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
         
         
@@ -204 +205 @@
         String[] bool_ops = {"0", "1"};
         String[] bool_texts = {getTextString("param.boolean.off", lang),getTextString("param.boolean.on", lang)}; 
-        param = GSXML.createParameterDescription(doc_, id, getTextString("param."+id, lang), GSXML.PARAM_TYPE_BOOLEAN, BOOLEAN_PARAM_ON, bool_ops, bool_texts);
+        param = GSXML.createParameterDescription(this.doc, id, getTextString("param."+id, lang), GSXML.PARAM_TYPE_BOOLEAN, BOOLEAN_PARAM_ON, bool_ops, bool_texts);
         
     } else if (id.equals(FIELD_FIELD_PARAM) || id.equals(INDEX_FIELD_PARAM)) {
         
         // the field list -  read from config file
-        Element field_list = (Element)GSXML.getChildByTagName(config_info_, GSXML.FIELD_ELEM+GSXML.LIST_MODIFIER);
+        Element field_list = (Element)GSXML.getChildByTagName(this.config_info, GSXML.FIELD_ELEM+GSXML.LIST_MODIFIER);
         NodeList fields = field_list.getElementsByTagName(GSXML.FIELD_ELEM);
         int len = fields.getLength();
@@ -222 +223 @@
         
         }
-        param = GSXML.createParameterDescription(doc_, id, getTextString("param."+id, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, f_names[0], f_names, f_texts );
+        param = GSXML.createParameterDescription(this.doc, id, getTextString("param."+id, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, f_names[0], f_names, f_texts );
         
     } else if (id.equals(FIELD_COMBINE_PARAM)) {
@@ -230 +231 @@
         
         
-        param = GSXML.createParameterDescription(doc_, FIELD_COMBINE_PARAM, "", GSXML.PARAM_TYPE_ENUM_SINGLE, FIELD_COMBINE_PARAM_AND, vals, val_texts);
+        param = GSXML.createParameterDescription(this.doc, FIELD_COMBINE_PARAM, "", GSXML.PARAM_TYPE_ENUM_SINGLE, FIELD_COMBINE_PARAM_AND, vals, val_texts);
         param.setAttribute(GSXML.PARAM_IGNORE_POS_ATT, "0");
         
@@ -291 +292 @@
     Element multiparam = null;
     Element param=null;
-    multiparam = GSXML.createParameterDescription(doc_, SIMPLE_FIELD_PARAM, "", GSXML.PARAM_TYPE_MULTI, null, null, null);
+    multiparam = GSXML.createParameterDescription(this.doc, SIMPLE_FIELD_PARAM, "", GSXML.PARAM_TYPE_MULTI, null, null, null);
     multiparam.setAttribute("occurs", "4");
     param_list.appendChild(multiparam);
@@ -318 +319 @@
     Element param=null;
 
-    multiparam = GSXML.createParameterDescription(doc_, ADVANCED_FIELD_PARAM, "", GSXML.PARAM_TYPE_MULTI, null, null, null);
+    multiparam = GSXML.createParameterDescription(this.doc, ADVANCED_FIELD_PARAM, "", GSXML.PARAM_TYPE_MULTI, null, null, null);
     multiparam.setAttribute("occurs", "4");
     param_list.appendChild(multiparam);
@@ -376 +377 @@
     
     // Create a new (empty) result message
-    Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT, service_name);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -403 +404 @@
     
     // set up mgpp_src
-    String indexdir = GSFile.collectionBaseDir(site_home_, cluster_name_) +
-        File.separatorChar + GSFile.collectionIndexPath(cluster_name_, default_index_);
-    mgpp_src_.loadIndexData(indexdir);
+    String indexdir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) +
+        File.separatorChar + GSFile.collectionIndexPath(this.cluster_name, this.default_index);
+    this.mgpp_src.loadIndexData(indexdir);
     setStandardQueryParams(params);
     
@@ -421 +422 @@
     }
     // run the query
-        mgpp_src_.runQuery(query);
-    MGPPQueryResult mqr= mgpp_src_.getQueryResult();
+        this.mgpp_src.runQuery(query);
+    MGPPQueryResult mqr= this.mgpp_src.getQueryResult();
 
     // build up the response
@@ -428 +429 @@
     // Create a metadata list to store information about the query results
     // should we be using metadataList? or something else?
-    Element metadata_list = doc_.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 
+    Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 
     result.appendChild(metadata_list);
     
     // Add a metadata element specifying the number of matching documents
     long totalDocs = mqr.getTotalDocs();
-    Element num_matches_elem = doc_.createElement(GSXML.METADATA_ELEM);
+    Element num_matches_elem = this.doc.createElement(GSXML.METADATA_ELEM);
     num_matches_elem.setAttribute(GSXML.NAME_ATT, "numDocsMatched");
     num_matches_elem.setAttribute(GSXML.VALUE_ATT, "" + totalDocs);
@@ -440 +441 @@
     // Create a document list to store the matching documents, and add them
     Vector docs = mqr.getDocs();
-    Element document_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    Element document_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(document_list);
     for (int d = 0; d < docs.size(); d++) {
         long docnum = ((MGPPDocInfo) docs.elementAt(d)).num_;
-        String doc_id = gdbm_src_.docnum2Oid(docnum);
+        String doc_id = this.gdbm_src.docnum2Oid(docnum);
         Element doc_node = createDocumentNodeElement(doc_id);
         document_list.appendChild(doc_node);
@@ -451 +452 @@
     // Create a term list to store the term information, and add it
     String query_level = (String)params.get(LEVEL_PARAM); // the current query level
-    Element term_list = doc_.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
+    Element term_list = this.doc.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(term_list);
     Vector terms = mqr.getTerms();
@@ -457 +458 @@
         MGPPTermInfo term_info = (MGPPTermInfo) terms.get(t);
         
-        Element term_elem = doc_.createElement(GSXML.TERM_ELEM);
+        Element term_elem = this.doc.createElement(GSXML.TERM_ELEM);
         term_elem.setAttribute(GSXML.NAME_ATT, term_info.term_);
         term_elem.setAttribute(STEM_ATT, "" + term_info.stem_method_);
@@ -470 +471 @@
         
         Vector equiv_terms = term_info.equiv_terms_;
-        Element equiv_term_list = doc_.createElement(EQUIV_TERM_ELEM+GSXML.LIST_MODIFIER);
+        Element equiv_term_list = this.doc.createElement(EQUIV_TERM_ELEM+GSXML.LIST_MODIFIER);
         term_elem.appendChild(equiv_term_list);
         
@@ -476 +477 @@
         String equiv_term = (String) equiv_terms.get(et);
 
-        Element equiv_term_elem = doc_.createElement(GSXML.TERM_ELEM);
+        Element equiv_term_elem = this.doc.createElement(GSXML.TERM_ELEM);
         equiv_term_elem.setAttribute(GSXML.NAME_ATT, equiv_term);
         equiv_term_elem.setAttribute(NUM_DOCS_MATCH_ATT, "");
@@ -501 +502 @@
         if (name.equals(CASE_PARAM)) {
         boolean val = (value.equals(BOOLEAN_PARAM_ON)?true:false);
-        mgpp_src_.setCase(val);     
+        this.mgpp_src.setCase(val);     
         } else if (name.equals(STEM_PARAM)) {
         boolean val = (value.equals(BOOLEAN_PARAM_ON)?true:false);
-        mgpp_src_.setStem(val);
+        this.mgpp_src.setStem(val);
         } else if (name.equals(MAXDOCS_PARAM)&& !value.equals("")) {
         int docs = Integer.parseInt(value);
-        mgpp_src_.setMaxDocs(docs);
+        this.mgpp_src.setMaxDocs(docs);
         } else if (name.equals(LEVEL_PARAM)) {
-        mgpp_src_.setQueryLevel(value);
+        this.mgpp_src.setQueryLevel(value);
         } else if (name.equals(MATCH_PARAM)) {
         int mode;
         if (value.equals(MATCH_PARAM_ALL)) mode=1;
         else mode=0;
-        mgpp_src_.setMatchMode(mode);
+        this.mgpp_src.setMatchMode(mode);
         } else if (name.equals(RANK_PARAM)) {
         if (value.equals(RANK_PARAM_RANK)) {
-            mgpp_src_.setSortByRank(true);
+            this.mgpp_src.setSortByRank(true);
         } else if (value.equals(RANK_PARAM_NONE)) {
-            mgpp_src_.setSortByRank(false);
+            this.mgpp_src.setSortByRank(false);
         }
         } // ignore any others

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java

@@ -46 +46 @@
     private static final String DEFAULT_INDEX_ELEM = "defaultIndex";
 
-    private MGWrapper mg_src_ = null;
+    private MGWrapper mg_src = null;
 
-    private String default_index_ = null;
+    private String default_index = null;
 
 
@@ -54 +54 @@
     public GS2MGRetrieve()
     {
-    mg_src_ = new MGWrapper();
+    this.mg_src = new MGWrapper();
     }
 
@@ -69 +69 @@
     Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_ELEM);
     if (def != null) {
-        default_index_ = def.getAttribute(GSXML.NAME_ATT);
+        this.default_index = def.getAttribute(GSXML.NAME_ATT);
     }
-    if (default_index_ == null || default_index_.equals("")) {
+    if (this.default_index == null || this.default_index.equals("")) {
         System.err.println("Error: default index not specified!");
         return false;
     }
-    // System.out.println("Default index: " + default_index_);
+    // System.out.println("Default index: " + this.default_index);
 
     // Do generic configuration
@@ -86 +86 @@
     {
     // Create a new (empty) result message
-    Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -101 +101 @@
     }
     
-    Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(doc_list);
     
     // The location of the MG index and text files
-    String basedir = GSFile.collectionBaseDir(site_home_, cluster_name_)
+    String basedir = GSFile.collectionBaseDir(this.site_home, this.cluster_name)
                           + File.separatorChar;  // Needed by MG
-    String textdir = GSFile.collectionTextPath(cluster_name_);
+    String textdir = GSFile.collectionTextPath(this.cluster_name);
     // index is only needed to start up MG, not used so just use the default index
-    String indexpath = GSFile.collectionIndexPath(cluster_name_, default_index_);
-    mg_src_.setIndex(indexpath);
+    String indexpath = GSFile.collectionIndexPath(this.cluster_name, this.default_index);
+    this.mg_src.setIndex(indexpath);
     
     // Get the documents
@@ -118 +118 @@
         String doc_id = doc_ids[i];
         if (OID.needsTranslating(doc_id)) {
-        doc_id = gdbm_src_.translateOID(doc_id);
+        doc_id = this.gdbm_src.translateOID(doc_id);
         }
-        long doc_num = gdbm_src_.oid2Docnum(doc_id);
-        String doc_content = mg_src_.getDocument(basedir, textdir, doc_num);
+        long doc_num = this.gdbm_src.oid2Docnum(doc_id);
+        String doc_content = this.mg_src.getDocument(basedir, textdir, doc_num);
         // remove any ctrl-c or ctrl-b (I hope these are the right codes)
         doc_content = doc_content.replaceAll("\u0002|\u0003", "");
@@ -127 +127 @@
         doc_content = resolveImages(doc_content, doc_id);
         // Stick it in a text node
-        Element doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
+        Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
         doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
-        GSXML.addDocText(doc_, doc, doc_content);
+        GSXML.addDocText(this.doc, doc, doc_content);
         doc_list.appendChild(doc);
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGSearch.java

@@ -48 +48 @@
 
 
-    private MGWrapper mg_src_ = null;
+    private MGWrapper mg_src = null;
 
 
@@ -54 +54 @@
     public GS2MGSearch()
     {
-    mg_src_ = new MGWrapper();
+    this.mg_src = new MGWrapper();
     }
 
@@ -82 +82 @@
     {
     // Create a new (empty) result message
-    Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT, TEXT_QUERY_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -105 +105 @@
     String index = (String) params.get(INDEX_PARAM); 
     if (index == null) {
-        index = default_index_;
+        index = this.default_index;
     }
 
     // The location of the MG index and text files
-    String basedir = GSFile.collectionBaseDir(site_home_, cluster_name_) +
+    String basedir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) +
                        File.separatorChar;  // Needed for MG
-    String textdir = GSFile.collectionTextPath(cluster_name_);
-    String indexpath = GSFile.collectionIndexPath(cluster_name_, index);
-    mg_src_.setIndex(indexpath);
+    String textdir = GSFile.collectionTextPath(this.cluster_name);
+    String indexpath = GSFile.collectionIndexPath(this.cluster_name, index);
+    this.mg_src.setIndex(indexpath);
 
     // set the mg query parameters to the values the user has specified
     setStandardQueryParams(params);
-    mg_src_.runQuery(basedir, textdir, query);
-    MGQueryResult mqr = mg_src_.getQueryResult();
+    this.mg_src.runQuery(basedir, textdir, query);
+    MGQueryResult mqr = this.mg_src.getQueryResult();
     long totalDocs = mqr.getTotalDocs();
 
@@ -128 +128 @@
 
     // Create a metadata list to store information about the query results
-    Element metadata_list = doc_.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 
+    Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 
     result.appendChild(metadata_list);
 
     // Add a metadata element specifying the number of matching documents
-    Element num_matches_elem = doc_.createElement(GSXML.METADATA_ELEM);
+    Element num_matches_elem = this.doc.createElement(GSXML.METADATA_ELEM);
     num_matches_elem.setAttribute(GSXML.NAME_ATT, "numDocsMatched");
     num_matches_elem.setAttribute(GSXML.VALUE_ATT, "" + totalDocs);
@@ -138 +138 @@
 
     // Create a document list to store the matching documents, and add them
-    Element document_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    Element document_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(document_list);
     for (int d = 0; d < docs.size(); d++) {
         long docnum = ((MGDocInfo) docs.elementAt(d)).num_;
-        String doc_id = gdbm_src_.docnum2Oid(docnum);
+        String doc_id = this.gdbm_src.docnum2Oid(docnum);
         Element doc_node = createDocumentNodeElement(doc_id);
         document_list.appendChild(doc_node);
@@ -148 +148 @@
 
     // Create a term list to store the term information, and add it
-    Element term_list = doc_.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
+    Element term_list = this.doc.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(term_list);
     Vector terms = mqr.getTerms();
@@ -158 +158 @@
         Vector equiv_terms = term_info.equiv_terms_;
 
-        Element term_elem = doc_.createElement(GSXML.TERM_ELEM);
+        Element term_elem = this.doc.createElement(GSXML.TERM_ELEM);
         term_elem.setAttribute(GSXML.NAME_ATT, term);
         term_elem.setAttribute(STEM_ATT, "" + stem_method);
 
-        Element equiv_term_list = doc_.createElement(EQUIV_TERM_ELEM+GSXML.LIST_MODIFIER);
+        Element equiv_term_list = this.doc.createElement(EQUIV_TERM_ELEM+GSXML.LIST_MODIFIER);
         term_elem.appendChild(equiv_term_list);
 
@@ -169 +169 @@
         MGEquivTermInfo equiv_term_info = (MGEquivTermInfo) equiv_terms.get(et);
 
-        Element equiv_term_elem = doc_.createElement(GSXML.TERM_ELEM);
+        Element equiv_term_elem = this.doc.createElement(GSXML.TERM_ELEM);
         equiv_term_elem.setAttribute(GSXML.NAME_ATT, equiv_term_info.term_);
         equiv_term_elem.setAttribute(NUM_DOCS_MATCH_ATT, "" + equiv_term_info.match_docs_);
@@ -190 +190 @@
     {
     // set the default ones
-    mg_src_.setReturnTerms(true);
+    this.mg_src.setReturnTerms(true);
     Set entries = params.entrySet();
     Iterator i = entries.iterator();
@@ -200 +200 @@
         if (name.equals(CASE_PARAM)) {
         boolean val = (value.equals(BOOLEAN_PARAM_ON) ? true : false);
-        mg_src_.setCase(val);
+        this.mg_src.setCase(val);
         }
         else if (name.equals(STEM_PARAM)) {
         boolean val = (value.equals(BOOLEAN_PARAM_ON) ? true : false);
-        mg_src_.setStem(val);
+        this.mg_src.setStem(val);
         }
         else if (name.equals(MATCH_PARAM)) {
         int mode = (value.equals(MATCH_PARAM_ALL) ? 1 : 0);
-        mg_src_.setMatchMode(mode);
+        this.mg_src.setMatchMode(mode);
         }
         else if (name.equals(MAXDOCS_PARAM)) {
         int docs = Integer.parseInt(value);
-        mg_src_.setMaxDocs(docs);
+        this.mg_src.setMaxDocs(docs);
         } // ignore any others
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java

@@ -74 +74 @@
     protected static final int CLASSIFIER=2;
 
-    protected GDBMWrapper gdbm_src_ = null;
-    protected Element config_info_ = null; // the xml from the config file
+    protected GDBMWrapper gdbm_src = null;
+    protected Element config_info = null; // the xml from the config file
 
     /** constructor */
     protected GS2Retrieve()
     {
-    gdbm_src_ = new GDBMWrapper();
+    this.gdbm_src = new GDBMWrapper();
     }
 
@@ -88 +88 @@
     {
     System.out.println("Configuring GS2Retrieve...");
-    config_info_ = info;
+    this.config_info = info;
 
     // set up short_service_info_ - for now just has name and type
-    Element dsr_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    Element dsr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
     dsr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
     dsr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_STRUCTURE_RETRIEVE_SERVICE);
-    short_service_info_.appendChild(dsr_service);
-
-    Element dmr_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    this.short_service_info.appendChild(dsr_service);
+
+    Element dmr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
     dmr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
     dmr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_METADATA_RETRIEVE_SERVICE);
-    short_service_info_.appendChild(dmr_service);
-
-    Element dcr_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    this.short_service_info.appendChild(dmr_service);
+
+    Element dcr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
     dcr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
     dcr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
-    short_service_info_.appendChild(dcr_service);
+    this.short_service_info.appendChild(dcr_service);
 
     // Open GDBM database for querying
-    String gdbm_db_file = GSFile.GDBMDatabaseFile(site_home_, cluster_name_);
-    if (!gdbm_src_.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
+    String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name);
+    if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
         System.err.println("Error: Could not open GDBM database!");
         return false;
@@ -125 +125 @@
     // the classifiers
     extractExtraClassifierInfo(info, extra_info);
-    config_info_ = info;
+    this.config_info = info;
     
         // short_service_info_ - the browse one
-        Element cb_service = doc_.createElement(GSXML.SERVICE_ELEM);
+        Element cb_service = this.doc.createElement(GSXML.SERVICE_ELEM);
         cb_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_BROWSE);
         cb_service.setAttribute(GSXML.NAME_ATT, CLASSIFIER_SERVICE);
-        short_service_info_.appendChild(cb_service);
+        this.short_service_info.appendChild(cb_service);
     
     // metadata retrieval for the browsing  
-        Element cbmr_service = doc_.createElement(GSXML.SERVICE_ELEM);
+        Element cbmr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
         cbmr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         cbmr_service.setAttribute(GSXML.NAME_ATT, CLASSIFIER_METADATA_SERVICE);
-        short_service_info_.appendChild(cbmr_service);
+        this.short_service_info.appendChild(cbmr_service);
 
     // the format info
-    Element cb_format_info = doc_.createElement(GSXML.FORMAT_ELEM);
+    Element cb_format_info = this.doc.createElement(GSXML.FORMAT_ELEM);
     boolean format_found = false;
     // add in to the description a simplified list of classifiers
@@ -146 +146 @@
     for(int i=0; i<classifiers.getLength(); i++) {
         Element cl = (Element)classifiers.item(i);
-        Element new_cl = (Element)doc_.importNode(cl, false); // just import this node, not the children
+        Element new_cl = (Element)this.doc.importNode(cl, false); // just import this node, not the children
         
         // get the format info out, and put inside a classifier element
@@ -156 +156 @@
         NodeList elems = format.getChildNodes();
         for (int j=0; j<elems.getLength();j++) {
-            format_cl.appendChild(doc_.importNode(elems.item(j), true));
+            format_cl.appendChild(this.doc.importNode(elems.item(j), true));
         }
         cb_format_info.appendChild(format_cl);
@@ -166 +166 @@
         
     if (format_found) {
-        format_info_map_.put(CLASSIFIER_SERVICE, cb_format_info);
+        this.format_info_map.put(CLASSIFIER_SERVICE, cb_format_info);
     }
 
@@ -174 +174 @@
     if (display_format != null) {
         System.out.println("display format not null!");
-        format_info_map_.put(DOCUMENT_METADATA_RETRIEVE_SERVICE, doc_.importNode(display_format, true));
+        this.format_info_map.put(DOCUMENT_METADATA_RETRIEVE_SERVICE, this.doc.importNode(display_format, true));
         // shoudl we make a copy?
     }
@@ -184 +184 @@
     if (service_id.equals(CLASSIFIER_SERVICE)) {
         
-        Element class_list = (Element)GSXML.getChildByTagName(config_info_, GSXML.CLASSIFIER_ELEM+GSXML.LIST_MODIFIER);
+        Element class_list = (Element)GSXML.getChildByTagName(this.config_info, GSXML.CLASSIFIER_ELEM+GSXML.LIST_MODIFIER);
         if (class_list == null) {
             // no classifiers specified
@@ -190 +190 @@
         }
         
-        Element cb_service = doc_.createElement(GSXML.SERVICE_ELEM);
+        Element cb_service = this.doc.createElement(GSXML.SERVICE_ELEM);
         cb_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_BROWSE);
         cb_service.setAttribute(GSXML.NAME_ATT, CLASSIFIER_SERVICE);
-        cb_service.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_NAME,  getTextString(CLASSIFIER_SERVICE+".name", lang)));
-        
-        Element cl_list = doc_.createElement(GSXML.CLASSIFIER_ELEM+GSXML.LIST_MODIFIER);
+        cb_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME,  getTextString(CLASSIFIER_SERVICE+".name", lang)));
+        
+        Element cl_list = this.doc.createElement(GSXML.CLASSIFIER_ELEM+GSXML.LIST_MODIFIER);
         cb_service.appendChild(cl_list);
         NodeList classifiers = class_list.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
         for(int i=0; i<classifiers.getLength(); i++) {
         Element cl = (Element)classifiers.item(i);
-        Element new_cl = (Element)doc_.importNode(cl, false); // just import this node, not the children
+        Element new_cl = (Element)this.doc.importNode(cl, false); // just import this node, not the children
         
         cl_list.appendChild(new_cl);
@@ -213 +213 @@
         }
         
-        Element cl_name = GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_NAME, text);
+        Element cl_name = GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, text);
         new_cl.appendChild(cl_name);
         
@@ -224 +224 @@
     if (service_id.equals(CLASSIFIER_METADATA_SERVICE)) {
         
-        Element cbmr_service = doc_.createElement(GSXML.SERVICE_ELEM);
+        Element cbmr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
         cbmr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         cbmr_service.setAttribute(GSXML.NAME_ATT, CLASSIFIER_METADATA_SERVICE);
@@ -231 +231 @@
 
     if (service_id.equals(DOCUMENT_STRUCTURE_RETRIEVE_SERVICE)) {
-        Element dsr_service = doc_.createElement(GSXML.SERVICE_ELEM);
+        Element dsr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
         dsr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         dsr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_STRUCTURE_RETRIEVE_SERVICE);
@@ -237 +237 @@
     }
     if (service_id.equals(DOCUMENT_METADATA_RETRIEVE_SERVICE)) {
-        Element dmr_service = doc_.createElement(GSXML.SERVICE_ELEM);
+        Element dmr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
         dmr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         dmr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_METADATA_RETRIEVE_SERVICE);
@@ -244 +244 @@
 
     if (service_id.equals(DOCUMENT_CONTENT_RETRIEVE_SERVICE)) {
-        Element dcr_service = doc_.createElement(GSXML.SERVICE_ELEM);
+        Element dcr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
         dcr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         dcr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
@@ -307 +307 @@
     
     // create this here or pass it in?
-    DBInfo info = gdbm_src_.getInfo(node_id);
+    DBInfo info = this.gdbm_src.getInfo(node_id);
     Element node;
     if (isClassifier(node_id)) {
-        node = doc_.createElement(GSXML.CLASS_NODE_ELEM);
+        node = this.doc.createElement(GSXML.CLASS_NODE_ELEM);
         //String childtype = info.getInfo("childtype");
         //String orientation="";
@@ -321 +321 @@
     } else {
         
-        node = doc_.createElement(GSXML.DOC_NODE_ELEM);
+        node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
 
         String top_id = OID.getTop(node_id);
@@ -345 +345 @@
         
         if (!is_top) { // we need to look at the top info
-            info = gdbm_src_.getInfo(top_id);
+            info = this.gdbm_src.getInfo(top_id);
         }
         
@@ -377 +377 @@
                   boolean recursive)
     {
-    DBInfo info = gdbm_src_.getInfo(doc_id);
+    DBInfo info = this.gdbm_src.getInfo(doc_id);
     String contains = info.getInfo("contains");
 
@@ -421 +421 @@
     protected boolean isLeafNode(String oid)
     {
-    DBInfo info = gdbm_src_.getInfo(oid);
+    DBInfo info = this.gdbm_src.getInfo(oid);
     String children = info.getInfo("contains");
     return (children.equals(""));
@@ -447 +447 @@
     {
     // Create a new (empty) result message
-    Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
     
     String node_name;
@@ -524 +524 @@
     }
     
-    Element doc_list = doc_.createElement(node_name+GSXML.LIST_MODIFIER);
+    Element doc_list = this.doc.createElement(node_name+GSXML.LIST_MODIFIER);
     result.appendChild(doc_list);
     
@@ -535 +535 @@
         System.out.println("doc_id = "+doc_id);
         if (OID.needsTranslating(doc_id)) {
-        doc_id = gdbm_src_.translateOID(doc_id);
+        doc_id = this.gdbm_src.translateOID(doc_id);
         System.out.println("translated doc_id = "+doc_id);
         }
 
         // Add the document to the list
-        Element doc = doc_.createElement(node_name);
+        Element doc = this.doc.createElement(node_name);
         doc_list.appendChild(doc);
         doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
@@ -547 +547 @@
         if (want_info) {
 
-        Element info_elem = doc_.createElement("nodeStructureInfo");
+        Element info_elem = this.doc.createElement("nodeStructureInfo");
         doc.appendChild(info_elem);
         
@@ -560 +560 @@
         if (want_structure) {
         // all structure info goes into a nodeStructure elem
-        Element structure_elem = doc_.createElement(GSXML.NODE_STRUCTURE_ELEM);
+        Element structure_elem = this.doc.createElement(GSXML.NODE_STRUCTURE_ELEM);
         doc.appendChild(structure_elem);
         
@@ -627 +627 @@
     {
     // Create a new (empty) result message
-    Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
 
     String node_name;
@@ -667 +667 @@
     }
     
-    Element node_list = doc_.createElement(node_name+GSXML.LIST_MODIFIER);
+    Element node_list = this.doc.createElement(node_name+GSXML.LIST_MODIFIER);
     result.appendChild(node_list);
     
@@ -683 +683 @@
 
         if (OID.needsTranslating(node_id)) {
-        node_id = gdbm_src_.translateOID(node_id);
+        node_id = this.gdbm_src.translateOID(node_id);
         }
 
         // Add the document to the list
-        Element new_node = (Element)doc_.importNode(request_node, false);
+        Element new_node = (Element)this.doc.importNode(request_node, false);
         node_list.appendChild(new_node);
 
         // Add the requested metadata information
-        Element node_meta_list = doc_.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+        Element node_meta_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
         new_node.appendChild(node_meta_list);
-        DBInfo info = gdbm_src_.getInfo(node_id);
+        DBInfo info = this.gdbm_src.getInfo(node_id);
         if (info == null) {// I have had a case where it is null!
         continue;
@@ -707 +707 @@
             System.out.println("getting metadata "+key);
             String value = info.getInfo(key);
-            GSXML.addMetadata(doc_, node_meta_list, key, value);
+            GSXML.addMetadata(this.doc, node_meta_list, key, value);
         }
         } else { // just get the selected ones
@@ -714 +714 @@
             String metadata = (String) metadata_list.get(m);
             String value = getMetadata(node_id, info, metadata);
-            GSXML.addMetadata(doc_, node_meta_list, metadata, value);
+            GSXML.addMetadata(this.doc, node_meta_list, metadata, value);
         }
         }
@@ -743 +743 @@
         return "";
         }
-        DBInfo parent_info = gdbm_src_.getInfo(parent_id);
+        DBInfo parent_info = this.gdbm_src.getInfo(parent_id);
         if (parent_info == null) return "";
         String new_meta = metadata.substring(pos+1);
@@ -763 +763 @@
         parent_id = OID.getParent(current_id);
         while (!parent_id.equals(current_id)) {
-        parent_info = gdbm_src_.getInfo(parent_id);
+        parent_info = this.gdbm_src.getInfo(parent_id);
         if (parent_info == null) return value.toString();
         value.insert(0, separator);
@@ -788 +788 @@
     {
     String top_doc_id = OID.getTop(doc_id);
-    DBInfo info = gdbm_src_.getInfo(top_doc_id);
+    DBInfo info = this.gdbm_src.getInfo(top_doc_id);
     String archivedir = info.getInfo("archivedir");
-    String image_dir  = site_http_address_ + "/collect/"+cluster_name_+"/index/assoc/"+archivedir;
+    String image_dir  = this.site_http_address + "/collect/"+this.cluster_name+"/index/assoc/"+archivedir;
 
     // Resolve all "_httpdocimg_"s
@@ -814 +814 @@
         value="-1";
         } else {
-        DBInfo info = gdbm_src_.getInfo(parent_id);
+        DBInfo info = this.gdbm_src.getInfo(parent_id);
         String contains = info.getInfo("contains");
         contains = contains.replaceAll("\"", parent_id);
@@ -830 +830 @@
         return null;
     }
-    Element info_elem = doc_.createElement("info");
+    Element info_elem = this.doc.createElement("info");
     info_elem.setAttribute(GSXML.NAME_ATT, info_type);
     info_elem.setAttribute(GSXML.VALUE_ATT, value);
@@ -837 +837 @@
 
     protected int getNumChildren(String doc_id) {
-    DBInfo info = gdbm_src_.getInfo(doc_id);
+    DBInfo info = this.gdbm_src.getInfo(doc_id);
     String contains = info.getInfo("contains");
     if (contains.equals("")) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Search.java

@@ -67 +67 @@
     protected static final String LEVEL_ELEM = "level";
 
-    protected GDBMWrapper gdbm_src_ = null;
-
-    protected Element config_info_ = null;
+    protected GDBMWrapper gdbm_src = null;
+
+    protected Element config_info = null;
 
     /** the default index */
-    protected String default_index_ = null;
+    protected String default_index = null;
 
 
@@ -78 +78 @@
     public GS2Search()
     {
-    gdbm_src_ = new GDBMWrapper();
+    this.gdbm_src = new GDBMWrapper();
     }
 
@@ -87 +87 @@
     System.out.println("Configuring GS2Search...");
     addExtraQueryInfo(info, extra_info);
-    config_info_ = info;
+    this.config_info = info;
 
     // Get the default index out of <defaultIndex> (buildConfig.xml)
     Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_ELEM);
     if (def != null) {
-        default_index_ = def.getAttribute(GSXML.NAME_ATT);
-    }
-    if (default_index_ == null || default_index_.equals("")) {
+        this.default_index = def.getAttribute(GSXML.NAME_ATT);
+    }
+    if (this.default_index == null || this.default_index.equals("")) {
         System.err.println("Error: default index not specified!");
         return false;
@@ -101 +101 @@
     // these entries should reflect the build config file - some services may not be available depending on how the collection was built.
     // set up short_service_info_ - for now just has id and type. the name (lang dependent) will be added in if the list is requested.
-    Element tq_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    Element tq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
     tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
     tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
-    short_service_info_.appendChild(tq_service);
+    this.short_service_info.appendChild(tq_service);
 
 
     // Open GDBM database for querying
-    String gdbm_db_file = GSFile.GDBMDatabaseFile(site_home_, cluster_name_);
-    if (!gdbm_src_.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
+    String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name);
+    if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
         System.err.println("Error: Could not open GDBM database!");
         return false;
@@ -117 +117 @@
     Element format = (Element) GSXML.getChildByTagName(info, GSXML.FORMAT_ELEM);
     if (format != null) {
-        format_info_map_.put(TEXT_QUERY_SERVICE, doc_.importNode(format, true));
+        this.format_info_map.put(TEXT_QUERY_SERVICE, this.doc.importNode(format, true));
     }
         
@@ -128 +128 @@
         return null;
     }
-    Element tq_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    Element tq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
     tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
     tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
-    tq_service.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE+".name", lang)));
-    tq_service.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE+".submit", lang)));
-    Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE+".name", lang)));
+    tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE+".submit", lang)));
+    Element param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     createTextQueryParamList(param_list, lang);
     tq_service.appendChild(param_list);
@@ -191 +191 @@
     if (name.equals(INDEX_PARAM)) {
         // the index info - read from config file
-        Element index_list = (Element)GSXML.getChildByTagName(config_info_, INDEX_ELEM+GSXML.LIST_MODIFIER);
+        Element index_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_ELEM+GSXML.LIST_MODIFIER);
         NodeList indexes = index_list.getElementsByTagName(INDEX_ELEM);
         int len = indexes.getLength();
@@ -203 +203 @@
         
         }
-        param = GSXML.createParameterDescription(doc_, INDEX_PARAM, getTextString("param."+INDEX_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, default_index_, inds, ind_names);
+        param = GSXML.createParameterDescription(this.doc, INDEX_PARAM, getTextString("param."+INDEX_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, this.default_index, inds, ind_names);
         
     } 
@@ -209 +209 @@
         String[] bool_ops = {"0", "1"};
         String[] bool_texts = {getTextString("param.boolean.off", lang),getTextString("param.boolean.on", lang)}; 
-        param = GSXML.createParameterDescription(doc_, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_BOOLEAN, BOOLEAN_PARAM_ON, bool_ops, bool_texts);
+        param = GSXML.createParameterDescription(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_BOOLEAN, BOOLEAN_PARAM_ON, bool_ops, bool_texts);
     } 
     else if (name.equals(MATCH_PARAM)) {
         String[] vals = {MATCH_PARAM_ALL, MATCH_PARAM_SOME};
         String[] val_texts = {getTextString("param."+MATCH_PARAM+"."+MATCH_PARAM_ALL, lang),getTextString("param."+MATCH_PARAM+"."+MATCH_PARAM_SOME, lang)}; 
-        param = GSXML.createParameterDescription(doc_, MATCH_PARAM, getTextString("param."+MATCH_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, MATCH_PARAM_ALL, vals, val_texts);
+        param = GSXML.createParameterDescription(this.doc, MATCH_PARAM, getTextString("param."+MATCH_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, MATCH_PARAM_ALL, vals, val_texts);
         
     }
     else if (name.equals(MAXDOCS_PARAM)) {
-        param = GSXML.createParameterDescription(doc_, MAXDOCS_PARAM, getTextString("param."+MAXDOCS_PARAM, lang), GSXML.PARAM_TYPE_INTEGER, "10", null, null);
+        param = GSXML.createParameterDescription(this.doc, MAXDOCS_PARAM, getTextString("param."+MAXDOCS_PARAM, lang), GSXML.PARAM_TYPE_INTEGER, "10", null, null);
         
     }
     else if (name.equals(QUERY_PARAM)) {
-        param = GSXML.createParameterDescription(doc_, QUERY_PARAM, getTextString("param."+QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
+        param = GSXML.createParameterDescription(this.doc, QUERY_PARAM, getTextString("param."+QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
         
     }
@@ -244 +244 @@
     protected Element createDocumentNodeElement(String node_id)
     {
-    Element doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
+    Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
     doc_node.setAttribute(GSXML.NODE_ID_ATT, node_id);
 
@@ -250 +250 @@
     boolean is_top = (top_id.equals(node_id) ? true : false);
     
-    DBInfo info = gdbm_src_.getInfo(node_id);
+    DBInfo info = this.gdbm_src.getInfo(node_id);
     if (info == null) { // make it up - cant query the gdbm db
         doc_node.setAttribute(GSXML.DOC_TYPE_ATT, "simple");
@@ -273 +273 @@
     
     if (!is_top) { // we need to look at the top info
-        info = gdbm_src_.getInfo(top_id);
+        info = this.gdbm_src.getInfo(top_id);
     }
 
@@ -289 +289 @@
 
     String doc_id = OID.getTop(node_id);
-    DBInfo info = gdbm_src_.getInfo(doc_id);
+    DBInfo info = this.gdbm_src.getInfo(doc_id);
     String child_type = info.getInfo("childtype");
     if (child_type.equals("Paged")) {
@@ -302 +302 @@
     protected boolean isLeafNode(String oid)
     {
-    DBInfo info = gdbm_src_.getInfo(oid);
+    DBInfo info = this.gdbm_src.getInfo(oid);
     String children = info.getInfo("contains");
     return (children.equals(""));

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java

@@ -42 +42 @@
     private static final String PHIND_SERVICE = "PhindApplet";
 
-    private MGPPWrapper mgpp_src_=null;
-    private String basepath_ = null;
+    private MGPPWrapper mgpp_src=null;
+    private String basepath = null;
 
     private Element applet_description = null;
     
     public PhindPhraseBrowse() {
-    mgpp_src_ = new MGPPWrapper();
+    this.mgpp_src = new MGPPWrapper();
     // set up the default params
-    mgpp_src_.setQueryLevel("Document");
-    mgpp_src_.setReturnLevel("Document");
-    mgpp_src_.setMaxDocs(5);
-    mgpp_src_.setStem(false);
-    mgpp_src_.setCase(true);
+    this.mgpp_src.setQueryLevel("Document");
+    this.mgpp_src.setReturnLevel("Document");
+    this.mgpp_src.setMaxDocs(5);
+    this.mgpp_src.setStem(false);
+    this.mgpp_src.setCase(true);
     }
     /** configure the service module
@@ -66 +66 @@
 
     // set up short_service_info_ - for now just has name and type
-    Element e = doc_.createElement(GSXML.SERVICE_ELEM);
+    Element e = this.doc.createElement(GSXML.SERVICE_ELEM);
     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_APPLET);
     e.setAttribute(GSXML.NAME_ATT, PHIND_SERVICE);
-    short_service_info_.appendChild(e);
+    this.short_service_info.appendChild(e);
 
     // set up the static applet description
 
-    applet_description = doc_.createElement(GSXML.SERVICE_ELEM);
+    applet_description = this.doc.createElement(GSXML.SERVICE_ELEM);
     applet_description.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_APPLET);
     applet_description.setAttribute(GSXML.NAME_ATT, PHIND_SERVICE);
@@ -85 +85 @@
     app_info += GSCGI.ACTION_ARG +"=a&"+GSCGI.REQUEST_TYPE_ARG +"=r&"+GSCGI.SERVICE_ARG+"="+PHIND_SERVICE+"&"+GSCGI.OUTPUT_ARG+"=xml&"+GSCGI.RESPONSE_ONLY_ARG+"=1'/>";
     app_info +="<PARAM NAME='collection'   VALUE='";
-    app_info += cluster_name_;
+    app_info += this.cluster_name;
     app_info += "'/> <PARAM NAME='classifier' VALUE='1'/>  <PARAM NAME='orientation'  VALUE='vertical'/> <PARAM NAME='depth' VALUE='2'/> <PARAM NAME='resultorder' VALUE='L,l,E,e,D,d'/> <PARAM NAME='backdrop' VALUE='interfaces/default/images/phindbg1.jpg'/><PARAM NAME='fontsize' VALUE='10'/> <PARAM NAME='blocksize'    VALUE='10'/>The Phind java applet.</"+GSXML.APPLET_ELEM+">";
     
-    Document dom = converter_.getDOM(app_info);
+    Document dom = this.converter.getDOM(app_info);
     Element app_elem = dom.getDocumentElement();
-    applet_description.appendChild(doc_.importNode(app_elem, true));
+    applet_description.appendChild(this.doc.importNode(app_elem, true));
     
     return true;
@@ -100 +100 @@
     }
     Element describe = (Element) applet_description.cloneNode(true);
-    describe.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_NAME,  getTextString(PHIND_SERVICE+".name", lang)));
+    describe.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME,  getTextString(PHIND_SERVICE+".name", lang)));
     return describe;
     }
@@ -126 +126 @@
     String phind_index = (String)params.get("pc");
     // the location of the mgpp database files
-    basepath_ = GSFile.phindBaseDir(site_home_, cluster_name_, phind_index);
+    this.basepath = GSFile.phindBaseDir(this.site_home, this.cluster_name, phind_index);
 
     // the result element
-    Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT, PHIND_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
 
     // applet result info must be in appletInfo element
-    Element applet_data = doc_.createElement(GSXML.APPLET_DATA_ELEM);
+    Element applet_data = this.doc.createElement(GSXML.APPLET_DATA_ELEM);
     result.appendChild(applet_data);
-    Element phind_data = doc_.createElement("phindData");
+    Element phind_data = this.doc.createElement("phindData");
     applet_data.appendChild(phind_data);
 
@@ -168 +168 @@
 
     // set the mgpp index data - we are looking up pword
-    mgpp_src_.loadIndexData(basepath_+File.separatorChar+"pword");
-
-    mgpp_src_.runQuery(word);
-
-    MGPPQueryResult res = mgpp_src_.getQueryResult();
+    this.mgpp_src.loadIndexData(this.basepath+File.separatorChar+"pword");
+
+    this.mgpp_src.runQuery(word);
+
+    MGPPQueryResult res = this.mgpp_src.getQueryResult();
     Vector docs = res.getDocs();
     if (docs.size()==0) {
@@ -187 +187 @@
                     long last_d) {
 
-    String record = mgpp_src_.getDocument(basepath_+File.separatorChar+"pdata", "Document",
+    String record = this.mgpp_src.getDocument(this.basepath+File.separatorChar+"pdata", "Document",
                           phrase);
     if (record.equals("")) {
@@ -229 +229 @@
     phind_data.setAttribute("lf", lf);
     phind_data.setAttribute("tf", tf);
-    GSXML.createTextElement(doc_, "phrase", word);
+    GSXML.createTextElement(this.doc, "phrase", word);
 
     addExpansionList(phind_data, expansions, word, ef, first_e, last_e);
@@ -244 +244 @@
                        long first, long last) {
 
-    Element expansion_list = doc_.createElement("expansionList");
+    Element expansion_list = this.doc.createElement("expansionList");
     phind_data.appendChild(expansion_list);
     expansion_list.setAttribute("length", freq);
@@ -267 +267 @@
     
     // look up the phrase in the pdata thingy
-    String record = mgpp_src_.getDocument(basepath_+File.separatorChar+"pdata", "Document",
+    String record = this.mgpp_src.getDocument(this.basepath+File.separatorChar+"pdata", "Document",
                           phrase_num);
 
@@ -281 +281 @@
     String df = fields[3];
 
-    Element expansion = doc_.createElement("expansion");
+    Element expansion = this.doc.createElement("expansion");
     expansion.setAttribute("tf", tf);
     expansion.setAttribute("df", df);
@@ -289 +289 @@
     String [] ends = splitPhraseOnWord(phrase, orig_phrase);
     if (!ends[0].equals("")) {
-        expansion.appendChild(GSXML.createTextElement(doc_, "prefix", ends[0]));
+        expansion.appendChild(GSXML.createTextElement(this.doc, "prefix", ends[0]));
     }
     if (!ends[1].equals("")) {
-        expansion.appendChild(GSXML.createTextElement(doc_, "suffix", ends[1]));
+        expansion.appendChild(GSXML.createTextElement(this.doc, "suffix", ends[1]));
     }
 
@@ -304 +304 @@
                       long first, long last) {
 
-    Element document_list = doc_.createElement("documentList");
+    Element document_list = this.doc.createElement("documentList");
     phind_data.appendChild(document_list);
     document_list.setAttribute("length", freq);
@@ -341 +341 @@
     
     // look up the phrase in the docs thingy
-    String record = mgpp_src_.getDocument(basepath_+File.separatorChar+"docs", "Document",
+    String record = this.mgpp_src.getDocument(this.basepath+File.separatorChar+"docs", "Document",
                           doc_num);
     
@@ -353 +353 @@
     String title = fields[1];
 
-    Element d = doc_.createElement("document");
+    Element d = this.doc.createElement("document");
     d.setAttribute("hash", hash);
-    d.appendChild(GSXML.createTextElement(doc_, "title", title));
+    d.appendChild(GSXML.createTextElement(this.doc, "title", title));
     
     return d;
@@ -366 +366 @@
 
 
-    Element thesaurus_list = doc_.createElement("thesaurusList");
+    Element thesaurus_list = this.doc.createElement("thesaurusList");
     phind_data.appendChild(thesaurus_list);
     thesaurus_list.setAttribute("length", freq);
@@ -397 +397 @@
 
     // look up the phrase in the pdata thingy
-    String record = mgpp_src_.getDocument(basepath_+File.separatorChar+"pdata", "Document",
+    String record = this.mgpp_src.getDocument(this.basepath+File.separatorChar+"pdata", "Document",
                           phrase_num);
 
@@ -411 +411 @@
     String df = fields[3];
 
-    Element thesaurus = doc_.createElement("thesaurus");
+    Element thesaurus = this.doc.createElement("thesaurus");
     thesaurus.setAttribute("tf", tf);
     thesaurus.setAttribute("df", df);
     thesaurus.setAttribute("id", Long.toString(phrase_num));
-    thesaurus.appendChild(GSXML.createTextElement(doc_, "phrase", phrase));
+    thesaurus.appendChild(GSXML.createTextElement(this.doc, "phrase", phrase));
     return thesaurus;
 
@@ -435 +435 @@
 
     protected Element phindError(String message) {
-    Element e = doc_.createElement("phindError");
-    Text t = doc_.createTextNode(message);
+    Element e = this.doc.createElement("phindError");
+    Text t = this.doc.createTextNode(message);
     e.appendChild(t);
     return e;

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -59 +59 @@
 
     /** the absolute address of the site home */
-    protected String site_home_ =null;
+    protected String site_home =null;
     /** the http address of the site home */
-    protected String site_http_address_ =null;
+    protected String site_http_address =null;
 
     /** the name of the cluster (or collection) that this service 
     belongs to - if any */ 
-    protected String cluster_name_ = null;
+    protected String cluster_name = null;
 
     /** some services can talk back to the message router */
-    protected ModuleInterface router_ = null;
+    protected ModuleInterface router = null;
 
     /** a converter class to create Documents etc */
-    protected XMLConverter converter_ = null;
+    protected XMLConverter converter = null;
 
     /** the original config info - if need to store it */
-    protected Element config_info_ = null;
+    protected Element config_info = null;
 
     /** XML element for describe requests - the container doc */
-    protected Document doc_ = null;
+    protected Document doc = null;
 
     /** XML element for describe requests - list of supported services
     - this is static     */
-    protected Element short_service_info_ = null;
+    protected Element short_service_info = null;
 
     /** XML element for stylesheet requests - map of service name to format 
     elem */
-    protected HashMap format_info_map_ = null;
+    protected HashMap format_info_map = null;
 
     /** sets the cluster name */
     public void setClusterName(String cluster_name) {
-    cluster_name_ = cluster_name;
+    this.cluster_name = cluster_name;
     }
     /** sets the collect name */
@@ -98 +98 @@
     /** sets the site home */
     public void setSiteHome(String site_home) {
-    site_home_ = site_home;
+    this.site_home = site_home;
     }
     /** sets the site http address */
     public void setSiteAddress(String site_address) {
-    site_http_address_ = site_address;
+    this.site_http_address = site_address;
     }
 
     /** sets the message router */
     public void setMessageRouter(ModuleInterface m) {
-       router_ = m;
+       this.router = m;
     }
 
     /** the no-args constructor */
     public ServiceRack() {
-    converter_ = new XMLConverter();
-    doc_ = converter_.newDOM();
-    short_service_info_ = doc_.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
-    format_info_map_ = new HashMap();
+    this.converter = new XMLConverter();
+    this.doc = this.converter.newDOM();
+    this.short_service_info = this.doc.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
+    this.format_info_map = new HashMap();
     }
     
@@ -143 +143 @@
     public String process(String xml_in) {
     
-    Document doc = converter_.getDOM(xml_in);
+    Document doc = this.converter.getDOM(xml_in);
     
     Element res = process(doc.getDocumentElement());
-    return converter_.getString(res);
+    return this.converter.getString(res);
     
     }
@@ -161 +161 @@
     NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);
     Document mess_doc = message.getOwnerDocument();
-    Element mainResult = doc_.createElement(GSXML.MESSAGE_ELEM);
+    Element mainResult = this.doc.createElement(GSXML.MESSAGE_ELEM);
     if (requests.getLength()==0) {
         // no requests
@@ -174 +174 @@
         Element response = processDescribe(request);
         if (response !=null) {
-            mainResult.appendChild(doc_.importNode(response, true));
+            mainResult.appendChild(this.doc.importNode(response, true));
         }
         
         } else if (type.equals(GSXML.REQUEST_TYPE_FORMAT)) {
         Element response = processFormat(request);
-            mainResult.appendChild(doc_.importNode(response, true));
+            mainResult.appendChild(this.doc.importNode(response, true));
         
            
@@ -220 +220 @@
             }
             if (response !=null) {
-            mainResult.appendChild(doc_.importNode(response, true));
+            mainResult.appendChild(this.doc.importNode(response, true));
             }
             
@@ -240 +240 @@
     protected Element processDescribe(Element request) {
     
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
     
@@ -264 +264 @@
      */
     protected Element processFormat(Element request) {
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_FORMAT);
     
@@ -275 +275 @@
     
     // describe a particular service    
-    if (format_info_map_.containsKey(to)) {
+    if (this.format_info_map.containsKey(to)) {
         response.appendChild(getServiceFormat(to));
         response.setAttribute(GSXML.FROM_ATT, to);
@@ -288 +288 @@
     protected Element getServiceList(String lang) {
     // for now, it is static and has no language stuff
-    return (Element) short_service_info_.cloneNode(true);
+    return (Element) this.short_service_info.cloneNode(true);
     }
     
@@ -295 +295 @@
 
     protected Element getServiceFormat(String service) {
-    Element format = (Element)((Element)format_info_map_.get(service)).cloneNode(true);
+    Element format = (Element)((Element)this.format_info_map.get(service)).cloneNode(true);
     return format;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/XSLTServices.java

@@ -104 +104 @@
       
       System.out.println("configuring XSLTServices");
-      config_info_ = info;
+      this.config_info = info;
     try {
       System.out.println("XSLTService::configure() called with:");
@@ -137 +137 @@
     }
     // create the response so we can report the error
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
-    String from = GSPath.appendLink(cluster_name_, RESOURCE_RETRIEVE_SERVICE);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    String from = GSPath.appendLink(this.cluster_name, RESOURCE_RETRIEVE_SERVICE);
     response.setAttribute(GSXML.FROM_ATT, from);
     response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
     
     System.err.println("XSLTServices:should never get here. service type wrong:"+service);
-    GSXML.addError(doc_, response,"XSLTServices:should never get here. service type wrong:"+service);
+    GSXML.addError(this.doc, response,"XSLTServices:should never get here. service type wrong:"+service);
     return response;
   }
@@ -151 +151 @@
     
     // create the result and set the path so we know where we are
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
-    String from = GSPath.appendLink(cluster_name_, RESOURCE_RETRIEVE_SERVICE);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    String from = GSPath.appendLink(this.cluster_name, RESOURCE_RETRIEVE_SERVICE);
     response.setAttribute(GSXML.FROM_ATT, from);
     response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
@@ -170 +170 @@
     if (param_elem==null) { 
     System.err.println("bad query request");
-    GSXML.addError(doc_, response,"bad query request in XSLTServices");
+    GSXML.addError(this.doc, response,"bad query request in XSLTServices");
     return response; 
     }
@@ -186 +186 @@
       }
       // something funny with the doc - 
-      Element new_doc = doc_.createElement(GSXML.DOCUMENT_ELEM);
+      Element new_doc = this.doc.createElement(GSXML.DOCUMENT_ELEM);
       new_doc.setAttribute(GSXML.NAME_ATT, ids[j]); //GSXML.createDocumentElement(doc_, ids[j]);
-      GSXML.addDocText(doc_, new_doc, document);
+      GSXML.addDocText(this.doc, new_doc, document);
       response.appendChild(new_doc);
     }
@@ -199 +199 @@
     
     // create the result and set the path so we know where we are
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
-    String from = GSPath.appendLink(cluster_name_, XSLT_QUERY_SERVICE);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    String from = GSPath.appendLink(this.cluster_name, XSLT_QUERY_SERVICE);
     response.setAttribute(GSXML.FROM_ATT, from);
     response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
@@ -226 +226 @@
     } else {
       System.err.println("XSLTServices: bad alphabet name : "+ alphabet);
-      GSXML.addError(doc_, response,"XSLTServices: bad alphabet name : "+ alphabet);
+      GSXML.addError(this.doc, response,"XSLTServices: bad alphabet name : "+ alphabet);
       stream = new GeneratedDocumentStream();
     }
 
-    Element resource_list = doc_.createElement(GSXML.RESOURCE_ELEM+GSXML.LIST_MODIFIER);
+    Element resource_list = this.doc.createElement(GSXML.RESOURCE_ELEM+GSXML.LIST_MODIFIER);
     response.appendChild(resource_list);
 
@@ -247 +247 @@
     transformer.transform(source,result);
     String id = writer.toString();
-    Element e = doc_.createElement(GSXML.DOCUMENT_ELEM);
+    Element e = this.doc.createElement(GSXML.DOCUMENT_ELEM);
     e.setAttribute(GSXML.NAME_ATT, id); 
     //Node no = GSXML.createDocumentElement(doc_, id);
     resource_list.appendChild(e);
       } catch (Throwable t) {
-    GSXML.addError(doc_, response, "Error in XSLTServices finding results:" + t.toString());
+    GSXML.addError(this.doc, response, "Error in XSLTServices finding results:" + t.toString());
       }
     }