Changeset 31241 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/OAIPMH.java

Timestamp:

2016-12-15T17:34:22+13:00 (7 years ago)

Author:

ak19

Message:

Corrected misunderstanding on distinction between whether we're processing a ListRecords request or a ListIdentifiers request. The difference was denoted by the boolean include_metadata parameter.

File:

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

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

@@ -512 +512 @@
       }
       DBInfo info = this.coll_db.getInfo(oid);
-      if (info == null) { // can happen if oid was deleted, in which case only oai_info keeps a record of it
+      if (info == null) { // can happen if oid was deleted, in which case only oai_info keeps a record of the oid
         logger.error("Collection database does not contain information about oid: " +oid);
       }
@@ -540 +540 @@
       }
       
-      
-      // compose a record for adding header and metadata
-      Element record = doc.createElement(OAIXML.RECORD);
-      list_items.appendChild(record);
-      //compose the header element
-      record.appendChild(createHeaderElement(doc, oid, OAIXML.getTime(millis), OID_is_deleted));
-
-
-      //Now check that this id has metadata for the required prefix.
-      if (info != null && documentContainsMetadata(info, set_of_elems)) {
-      // YES, it does have some metadata for this prefix        
-      
-        if (include_metadata) {     
-        //compose the metadata element
-        record.appendChild(createMetadataElement(doc, prefix, info));
-        } /*else {
-          //compose the header element and append it
-          list_items.appendChild(createHeaderElement(doc, oid, OAIXML.getTime(millis)));      
-          }*/
-      } // otherwise we won't include this oid. with meta
-      
-      
+      //compose the header element, which we'll be appending no matter what
+      Element header = createHeaderElement(doc, oid, OAIXML.getTime(millis), OID_is_deleted);
+
+      if (include_metadata) { // doing ListRecords
+      // compose a record for adding header and metadata
+      Element record = doc.createElement(OAIXML.RECORD);
+      list_items.appendChild(record);
+      //insert the header element
+      record.appendChild(header);
+      //Now check that this id has metadata for the required prefix.
+      if (info != null && documentContainsMetadata(info, set_of_elems)) {
+          // YES, it does have some metadata for this prefix        
+          //compose the metadata element
+          record.appendChild(createMetadataElement(doc, prefix, info));
+      } // otherwise the oid was 'deleted' and only in the oai-inf db and not in the info (collection index) db
+      } else { // doing ListIdentifiers
+      //append the header element
+      list_items.appendChild(header);      
+      }      
       
     }//end of for(int i=0; i<oid_list.size(); i++) of doing thru each record