Changeset 22306

Show
Ignore:
Timestamp:
26.06.2010 16:11:41 (9 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

    r15326 r22306  
    9494 
    9595    } 
    96  
    9796  
    9897        // check that there are classifiers specified 
     
    102101            return false; 
    103102        } 
    104      
     103 
    105104    // get the display and format elements from the coll config file for 
    106105    // the classifiers 
    107106    extractExtraClassifierInfo(info, extra_info); 
    108      
     107 
    109108        // short_service_info_ - the browse one 
    110109        Element cb_service = this.doc.createElement(GSXML.SERVICE_ELEM); 
     
    249248 
    250249    /** this looks for any classifier specific display or format info from extra_info and adds it in to the correct place in info */ 
    251     protected boolean extractExtraClassifierInfo(Element info, Element extra_info) { 
     250    static boolean extractExtraClassifierInfo(Element info, Element extra_info) { 
    252251     
    253252    if (extra_info == null) { 
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java

    r22301 r22306  
    131131    // short_service_info Element which needs to be done in this FedoraServiceProxy.configure(). 
    132132     
    133  
    134     if(extra_info != null) { 
    135         logger.error("extra_info is not null. May need to merge eventually with info. NOT YET IMPLEMENTED!"); 
    136     } 
     133    // get the display and format elements from the coll config file for 
     134    // the classifiers 
     135    AbstractBrowse.extractExtraClassifierInfo(info, extra_info); 
    137136 
    138137    // Copied from IViaProxy.java: 
     
    281280    } 
    282281 
    283     //Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentMetadata(this.cluster_name, docIDs)); 
    284282    Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentMetadata(this.cluster_name, docIDs, metafields)); 
    285283    //logger.info("**** FedoraServiceProxy - Response from documentmetaretrieve: " + GSXML.nodeToFormattedString(response)); 
     
    349347        info = info + param.getAttribute("value") + "|"; 
    350348        } 
    351     }    
     349    } 
    352350     
    353351    Element response  
     
    541539    } else { // documentnode 
    542540    response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentStructure(this.cluster_name, new String[]{doc_id}, 
    543                                              new String[]{"children"}, new String[]{"siblingPosition"})); 
     541                                         new String[]{"children"}, new String[]{"siblingPosition"})); 
    544542    String path = GSPath.createPath(new String[]{GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER,  
    545543                          GSXML.DOC_NODE_ELEM, GSXML.NODE_STRUCTURE_ELEM, GSXML.DOC_NODE_ELEM});