Changeset 8830

Timestamp:

2004-12-16T15:34:06+13:00 (19 years ago)

Author:

kjdon

Message:

added some checks for null results from the database

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java (modified) (1 diff)

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

@@ -116 +116 @@
     for (int i = 0; i < doc_ids.length; i++) {
         String doc_id = doc_ids[i];
+        Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
+        doc_list.appendChild(doc);
+        
         if (extlink) {
         doc_id = this.gdbm_src.extlink2OID(doc_id);
+        if (doc_id==null) {
+            continue;
+        }
+        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
         }
         else if (OID.needsTranslating(doc_id)) {
         doc_id = this.gdbm_src.translateOID(doc_id);
+        if (doc_id==null) {
+            continue;
+        }
+        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
         }
-
+        
         long doc_num = this.gdbm_src.OID2Docnum(doc_id);
+        if (doc_num == -1) {
+        continue;
+        }
         String doc_content = this.mgpp_src.getDocument(textdir, this.default_level, doc_num);
         doc_content = resolveTextMacros(doc_content, doc_id, lang);
-
+        
         // For now, stick it in a text node - eventually should be parsed as xml??
-
-        Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
-        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
         GSXML.addDocText(this.doc, doc, doc_content);
-        doc_list.appendChild(doc);
+        
 
     }