Changeset 19591 for gsdl/trunk/runtime-src/src/z3950/z3950server.cpp

Timestamp:

2009-05-25T15:19:23+12:00 (15 years ago)

Author:

kjdon

Message:

strip off namespace and subfield when creating metatags, as the d2m mappings don't allow them

File:

• gsdl/trunk/runtime-src/src/z3950/z3950server.cpp (modified) (1 diff)

gsdl/trunk/runtime-src/src/z3950/z3950server.cpp

@@ -595 +595 @@
     cerr << "get_marc_record failed" << endl;
     return false; // failed
-  } else {
-    FilterResponse_t response;
-    // iterate through Response_tlist to find the right response
-    RESPONSE_here = Response_tlist.begin();
-    RESPONSE_end = Response_tlist.end();
-    RESPONSE_COLNAMES_here = Response_tlist_colnames.begin();
-    RESPONSE_COLNAMES_end = Response_tlist_colnames.end();
-    RESPONSE_SIZES_here = Response_tlist_sizes.begin();
-    RESPONSE_SIZES_end = Response_tlist_sizes.end();
-    int n = 0;
-    while (RESPONSE_here != RESPONSE_end) {
-      n += *RESPONSE_SIZES_here;
-      if (n >= recnum) {
-    response = *RESPONSE_here;
-    CollectionName = *RESPONSE_COLNAMES_here;
-    recnum = *RESPONSE_SIZES_here - (n - recnum);
-    break;
-      }
-      // these should all have the same number of elements,
-      // so only need to check that one is within bounds.
-      // may want to combine these into a larger data structure later.
-      RESPONSE_here++;
-      RESPONSE_COLNAMES_here++;
-      RESPONSE_SIZES_here++;
-    }
-
-    // locate the desired record in the response
+  }
+   
+  FilterResponse_t response;
+  // iterate through Response_tlist to find the right response
+  RESPONSE_here = Response_tlist.begin();
+  RESPONSE_end = Response_tlist.end();
+  RESPONSE_COLNAMES_here = Response_tlist_colnames.begin();
+  RESPONSE_COLNAMES_end = Response_tlist_colnames.end();
+  RESPONSE_SIZES_here = Response_tlist_sizes.begin();
+  RESPONSE_SIZES_end = Response_tlist_sizes.end();
+  int n = 0;
+  while (RESPONSE_here != RESPONSE_end) {
+    n += *RESPONSE_SIZES_here;
+    if (n >= recnum) {
+      response = *RESPONSE_here;
+      CollectionName = *RESPONSE_COLNAMES_here;
+      recnum = *RESPONSE_SIZES_here - (n - recnum);
+      break;
+    }
+    // these should all have the same number of elements,
+    // so only need to check that one is within bounds.
+    // may want to combine these into a larger data structure later.
+    RESPONSE_here++;
+    RESPONSE_COLNAMES_here++;
+    RESPONSE_SIZES_here++;
+  }
+
+  // locate the desired record in the response and gather all the metadata
     
-    MetadataInfo_tmap::iterator METAFIELD_here = response.docInfo[recnum-1].metadata.begin();
-    MetadataInfo_tmap::iterator METAFIELD_end = response.docInfo[recnum-1].metadata.end();
-    
-    while (METAFIELD_here!=METAFIELD_end) {
+  MetadataInfo_tmap::iterator METAFIELD_here = response.docInfo[recnum-1].metadata.begin();
+  MetadataInfo_tmap::iterator METAFIELD_end = response.docInfo[recnum-1].metadata.end();
+  
+  while (METAFIELD_here!=METAFIELD_end) {
+    text_t meta_name = METAFIELD_here->first;
+    text_t::const_iterator pos = findchar(meta_name.begin(), meta_name.end(), '.');
+    // strip off namespace and subfield
+    if (pos != meta_name.end()) {
+      meta_name = substr(pos+1, meta_name.end());
+    }
+    pos = findchar(meta_name.begin(), meta_name.end(), '^');
+    if (pos != meta_name.end()) {
+      meta_name = substr(meta_name.begin(), pos);
+    }
+    if (meta_name[0] >= 'A' &&
+    meta_name[0] <= 'Z') {
       text_tarray::iterator METAVALUE_here = METAFIELD_here->second.values.begin();
       text_tarray::iterator METAVALUE_end = METAFIELD_here->second.values.end();
       while (METAVALUE_here!=METAVALUE_end) {
-    if (METAFIELD_here->first[0] >= 'A' &&
-        METAFIELD_here->first[0] <= 'Z') {
-      metatag *tmptag = new metatag();
-      tmptag->name = METAFIELD_here->first.getcstr();
-      tmptag->type = "";
-      tmptag->scheme = "";
-      tmptag->value = (*METAVALUE_here).getcstr();
-      Metatag_list.push_back(tmptag);
-    }
+    
+    metatag *tmptag = new metatag();
+    tmptag->name = meta_name.getcstr();
+    tmptag->type = "";
+    tmptag->scheme = "";
+    tmptag->value = (*METAVALUE_here).getcstr();
+    Metatag_list.push_back(tmptag);
+    
     METAVALUE_here++;
       }
-      METAFIELD_here++;
-    }
-    return true; // succeeded
-  }
+    }
+    
+    METAFIELD_here++;
+  }
+  return true; // succeeded
+
 }