Changeset 8828

Timestamp:

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

Author:

kjdon

Message:

checking a lot more for null results from database, so hopefully wont crap out if we ask for a document that doesn't exist

Location:

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

Files:

• GS2MGRetrieve.java (modified) (3 diffs)
• GS2Retrieve.java (modified) (11 diffs)

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

@@ -122 +122 @@
     for (int i = 0; i < doc_ids.length; i++) {
         String doc_id = doc_ids[i];
+        // Create the document node
+        Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
+        doc_list.appendChild(doc);
+        
         System.err.println("doc id= "+doc_id);
         if (extlink) {
@@ -131 +136 @@
         } else {
             doc_id = this.gdbm_src.extlink2OID(doc_id);
-
         }
+        if (doc_id == null) {
+            System.err.println("extlink "+doc_id +" couldn't be converted to proper id");
+            continue;
+        }
+        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id); // reset the att cos it may have changed
+            
         }
         else if (OID.needsTranslating(doc_id)) {
         doc_id = this.gdbm_src.translateOID(doc_id);
+        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id); // reset the att cos it may have changed
         }
-        System.err.println("remaining dco id = "+doc_id);
+        
+        System.err.println("remaining doc id = "+doc_id);
         long doc_num = this.gdbm_src.OID2Docnum(doc_id);
-
+        if (doc_num == -1) {
+        System.err.println("OID "+doc_id +" couldn't be converted to mg num");
+        continue;
+        }
         String doc_content = this.mg_src.getDocument(basedir, textdir, doc_num);
-        // Create the  text node
-        Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
-        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
-        doc_list.appendChild(doc);
         
         if (doc_content!=null) {
@@ -151 +162 @@
         //System.err.println("doc content "+doc_content);
         doc_content = doc_content.replaceAll("\u0002|\u0003", "");
+        System.err.println("replaced ctrl b");
         // replace _httpimg_ with the correct address
         doc_content = resolveTextMacros(doc_content, doc_id, lang);
+        System.err.println("resolved text macros");
         GSXML.addDocText(this.doc, doc, doc_content);
+        System.err.println("added text");
         } else {
         System.err.println("the doc content was null, not getting that section\n");

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

@@ -379 +379 @@
      * child is true is it definitely is a child of something - just for efficiency purposes */
     protected Element createDocNode(String node_id, boolean parent, boolean child) {
+    
     // create this here or pass it in?
     DBInfo info = this.gdbm_src.getInfo(node_id);
@@ -410 +411 @@
     }
   
+    if (info==null) {
+        node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+        node.setAttribute(GSXML.NODE_ID_ATT, node_id);
+        return node;
+    }
     String top_id = OID.getTop(node_id);
     boolean is_top = (top_id.equals(node_id) ? true : false);
@@ -436 +442 @@
             info = this.gdbm_src.getInfo(top_id);
         }
-        
-        String childtype = info.getInfo("childtype");
-        if (childtype.equals("Paged")) {
-            node.setAttribute(GSXML.DOC_TYPE_ATT, "paged");
-        } else {
-            node.setAttribute(GSXML.DOC_TYPE_ATT, "hierarchy");
+        if (info != null) {
+            String childtype = info.getInfo("childtype");
+            if (childtype.equals("Paged")) {
+            node.setAttribute(GSXML.DOC_TYPE_ATT, "paged");
+            } else {
+            node.setAttribute(GSXML.DOC_TYPE_ATT, "hierarchy");
+            }
         }
         }
@@ -481 +488 @@
     {
     DBInfo info = this.gdbm_src.getInfo(doc_id);
+    if (info == null) {
+        return;
+    }
     String contains = info.getInfo("contains");
 
@@ -525 +535 @@
     {
     DBInfo info = this.gdbm_src.getInfo(oid);
+    if (info == null) {
+        return true; // or should it be false?
+    } 
     String children = info.getInfo("contains");
     return (children.equals(""));
@@ -639 +652 @@
                                 GSXML.NODE_ID_ATT);
     for (int i = 0; i < doc_ids.length; i++) {
-        String doc_id = doc_ids[i];
-        
-        if (OID.needsTranslating(doc_id)) {
-        doc_id = this.gdbm_src.translateOID(doc_id);
-        }
-
         // Add the document to the list
         Element doc = this.doc.createElement(node_name);
         doc_list.appendChild(doc);
+
+        String doc_id = doc_ids[i];
         doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
-
+        
+        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);
+        }
         
         if (want_info) {
@@ -798 +814 @@
         Element request_node = (Element) request_nodes.item(i);
         String node_id = request_node.getAttribute(GSXML.NODE_ID_ATT);
+        
+        // Add the document to the results list
+        Element new_node = (Element)this.doc.importNode(request_node, false);
+        node_list.appendChild(new_node);
 
         if (extlink) {
@@ -812 +832 @@
         node_id = this.gdbm_src.translateOID(node_id);
         }
-
-        // Add the document to the list
-        Element new_node = (Element)this.doc.importNode(request_node, false);
-        node_list.appendChild(new_node);
+        if (node_id == null) {
+        continue;
+        }
 
         // Add the requested metadata information
@@ -968 +987 @@
     protected String resolveTextMacros(String doc_content, String doc_id, String lang)
     {
-    String top_doc_id = OID.getTop(doc_id);
-    DBInfo info = this.gdbm_src.getInfo(top_doc_id);
-    String archivedir = info.getInfo("archivedir");
-    String image_dir  = this.site_http_address + "/collect/"+this.cluster_name+"/index/assoc/"+archivedir;
-    
-    // Resolve all "_httpdocimg_"s
-    doc_content = doc_content.replaceAll("_httpdocimg_", image_dir);
+    DBInfo info = null;
+    if (doc_content.indexOf("_httpdocimg_")!=-1) {
+        String top_doc_id = OID.getTop(doc_id);
+        info = this.gdbm_src.getInfo(top_doc_id);
+        if (info == null) {
+        // perhaps we had per.iods in the ids - just try the current id
+        top_doc_id = doc_id;
+        info = this.gdbm_src.getInfo(top_doc_id);
+        }
+        if (info != null) {
+        String archivedir = info.getInfo("archivedir");
+        String image_dir  = this.site_http_address + "/collect/"+this.cluster_name+"/index/assoc/"+archivedir;
+        
+        // Resolve all "_httpdocimg_"s
+        doc_content = doc_content.replaceAll("_httpdocimg_", image_dir);
+        }
+    }
     // resolve any collection specific macros
-    doc_content = macro_resolver.resolve(doc_content, lang, GS2MacroResolver.SCOPE_TEXT, top_doc_id, info);
+    doc_content = macro_resolver.resolve(doc_content, lang, GS2MacroResolver.SCOPE_TEXT, doc_id, info);
     return doc_content;
     }
@@ -998 +1027 @@
         } else {
         DBInfo info = this.gdbm_src.getInfo(parent_id);
-        String contains = info.getInfo("contains");
-        contains = contains.replaceAll("\"", parent_id);
-        String [] children = contains.split(";");
-        for (int i=0;i<children.length;i++) {
-            String child_id = children[i];
-            if (child_id.equals(doc_id)) {
-            value = String.valueOf(i+1); // make it from 1 to length
-            break;
+        if (info==null) {
+            value ="-1";
+        } else {
+            String contains = info.getInfo("contains");
+            contains = contains.replaceAll("\"", parent_id);
+            String [] children = contains.split(";");
+            for (int i=0;i<children.length;i++) {
+            String child_id = children[i];
+            if (child_id.equals(doc_id)) {
+                value = String.valueOf(i+1); // make it from 1 to length
+                break;
+            }
             }
         }
@@ -1020 +1053 @@
     protected int getNumChildren(String doc_id) {
     DBInfo info = this.gdbm_src.getInfo(doc_id);
+    if (info == null) {
+        return 0;
+    }
     String contains = info.getInfo("contains");
     if (contains.equals("")) {