Changeset 22306 for main

Timestamp:

2010-06-26T16:11:41+12:00 (14 years ago)

Author:

ak19

Message:

1. AbstractBrowse's method extractExtraClassifierInfo() is now package access and static (it never used member variables anyway) so that the FedoraServiceProxy class can reuse it in entirety.

Location:

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

Files:

• AbstractBrowse.java (modified) (3 diffs)
• FedoraServiceProxy.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

@@ -94 +94 @@
 
     }
-
  
         // check that there are classifiers specified
@@ -102 +101 @@
             return false;
         }
-    
+
     // get the display and format elements from the coll config file for
     // the classifiers
     extractExtraClassifierInfo(info, extra_info);
-    
+
         // short_service_info_ - the browse one
         Element cb_service = this.doc.createElement(GSXML.SERVICE_ELEM);
@@ -249 +248 @@
 
     /** this looks for any classifier specific display or format info from extra_info and adds it in to the correct place in info */
-    protected boolean extractExtraClassifierInfo(Element info, Element extra_info) {
+    static boolean extractExtraClassifierInfo(Element info, Element extra_info) {
     
     if (extra_info == null) {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java

@@ -131 +131 @@
     // short_service_info Element which needs to be done in this FedoraServiceProxy.configure().
     
-
-    if(extra_info != null) {
-        logger.error("extra_info is not null. May need to merge eventually with info. NOT YET IMPLEMENTED!");
-    }
+    // get the display and format elements from the coll config file for
+    // the classifiers
+    AbstractBrowse.extractExtraClassifierInfo(info, extra_info);
 
     // Copied from IViaProxy.java:
@@ -281 +280 @@
     }
 
-    //Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentMetadata(this.cluster_name, docIDs));
     Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentMetadata(this.cluster_name, docIDs, metafields));
     //logger.info("**** FedoraServiceProxy - Response from documentmetaretrieve: " + GSXML.nodeToFormattedString(response));
@@ -349 +347 @@
         info = info + param.getAttribute("value") + "|";
         }
-    }   
+    }
     
     Element response 
@@ -541 +539 @@
     } else { // documentnode
     response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentStructure(this.cluster_name, new String[]{doc_id},
-                                             new String[]{"children"}, new String[]{"siblingPosition"}));
+                                         new String[]{"children"}, new String[]{"siblingPosition"}));
     String path = GSPath.createPath(new String[]{GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER, 
                           GSXML.DOC_NODE_ELEM, GSXML.NODE_STRUCTURE_ELEM, GSXML.DOC_NODE_ELEM});