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

Timestamp:

2011-07-14T21:39:43+12:00 (13 years ago)

Author:

ak19

Message:

Commits for ticket 770 concerning the display of multiple values for a metadata (like dc.Title) when classified by that metadata. So when the user browses by dc.Title, they no longer merely see a doc listed once for each dc.Title assigned but under the same (first retrieved) dc.Title, but they should now see the doc listed once for each dc.Title assigned to it with a different dc.Title value each time.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java (modified) (4 diffs)

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

@@ -574 +574 @@
      * <docNode nodeId='xxx' nodeType='leaf' docType='hierarchy'/>
      */
-    protected Element createDocNode(String node_id) {
+    protected Element createDocNode(String node_id, int offset) {
     Element node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
     node.setAttribute(GSXML.NODE_ID_ATT, node_id);
@@ -587 +587 @@
     String node_type = getNodeType(node_id, doc_type);  
     node.setAttribute(GSXML.NODE_TYPE_ATT, node_type);
+    
+    // mdoffset information stored in DB determines which of multiple values for
+    // a metadata needs to be displayed when a classifier is built on that metadata
+    node.setAttribute(GSXML.NODE_MDOFFSET_ATT, Integer.toString(offset));
     return node;
     }
@@ -621 +625 @@
     ArrayList child_ids = getChildrenIds(node_id);
     if (child_ids==null) return;
+    
+    // get a list of all mdoffsets at this point
+    ArrayList child_offsets = getOffsetsForChildrenIds(node_id);
+    // make sure that if it's doesn't match up with child_ids in length, 
+    // it is padded with 0s to make up the length
+    if(child_offsets == null) {
+        child_offsets = new ArrayList(child_ids.size());
+    } 
+    if(child_offsets.size() < child_ids.size()) {
+        Integer zero = new Integer(0);
+        for(int i = child_offsets.size()-1; i < child_ids.size(); i++) {
+        child_offsets.add(zero);
+        }
+    }
+
     for (int i=0; i< child_ids.size(); i++) {
         String child_id = (String)child_ids.get(i);
+        int child_offset = ((Integer)child_offsets.get(i)).intValue(); // counts both docnodes and classnodes at the childlevel, is this right?
         Element child_elem;
         if (isDocumentId(child_id)) {
-        child_elem = createDocNode(child_id);
+        child_elem = createDocNode(child_id, child_offset);
         } else {
         child_elem = createClassifierNode(child_id);
@@ -684 +704 @@
     }
 
+    /** Override to get a list of mdoffsets of children. Return null if no children or if no mdoffsets for them */
+    protected ArrayList getOffsetsForChildrenIds(String node_id) { 
+    return null; 
+    }
+
     /** if id ends in .fc, .pc etc, then translate it to the correct id */
     abstract protected String translateId(String node_id);