Changeset 10567

Timestamp:

2005-08-25T17:02:29+12:00 (19 years ago)

Author:

kjdon

Message:

added checks for no childtype metadata - this occurs when it is erroneously thinking a document is hierarchical when it is not. see wiki entry in greenstone bugs

File:

• trunk/gsdl/src/recpt/browsetools.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -384 +384 @@
   while (thisdoc != lastdoc) {
 
-    if (is_top ((*thisdoc).OID))
+    if (is_top ((*thisdoc).OID)) {
       load_formatstring ((*thisdoc).metadata["thistype"].values[0], metadata, 
              getParents, classification, browsermap, formatinfo, 
              formatlistmap);
-
-    text_t &childtype = (*thisdoc).metadata["childtype"].values[0];
-    text_tset::const_iterator it = cache.find (childtype);
-    if (it == cache.end()) {
-      load_formatstring (childtype, metadata, getParents, classification,
-             browsermap, formatinfo, formatlistmap);
-      cache.insert (childtype);
+    }
+    
+    // sometimes childtype is not set - why??
+    if ((*thisdoc).metadata.find("childtype") != (*thisdoc).metadata.end()) {
+      text_t &childtype = (*thisdoc).metadata["childtype"].values[0];
+
+      text_tset::const_iterator it = cache.find (childtype);
+      if (it == cache.end()) {
+    load_formatstring (childtype, metadata, getParents, classification,
+               browsermap, formatinfo, formatlistmap);
+    cache.insert (childtype);
+      }
     }
     ++thisdoc;
@@ -417 +422 @@
     // get classifytype of this level
     if (is_top ((*thisparent).OID)) classifytype = (*thisparent).metadata["thistype"].values[0];
-    else if (!first) classifytype = (*(thisparent-1)).metadata["childtype"].values[0];
+    else if (!first && (*(thisparent-1)).metadata.find("childtype") != (*(thisparent-1)).metadata.end()) classifytype = (*(thisparent-1)).metadata["childtype"].values[0];
     
     // if we still don't have a classifytype we'll use the default
@@ -516 +521 @@
   text_t classifytype;
   int numparents = response.docInfo.size();
-  if (!parents.empty())
+  if (!parents.empty() && (response.docInfo[numparents-1].metadata.find("childtype") != response.docInfo[numparents-1].metadata.end()))
     classifytype = response.docInfo[numparents-1].metadata["childtype"].values[0];
   else {