Changeset 9933

Timestamp:

2005-05-24T10:40:47+12:00 (19 years ago)

Author:

kjdon

Message:

made it compile with the new ColInfoResponse collectionmeta type

File:

• trunk/gsdl/src/recpt/z3950proto.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -262 +262 @@
   // copy the text maps over.
   //  collectinfo.collectionmeta; // text_tmap
-  collectinfo.collectionmeta=*((*here)->getMeta());
+  text_tmap collmeta = *((*here)->getMeta());
+  text_tmap::iterator mhere = collmeta.begin();
+  text_tmap::iterator mend = collmeta.end();
+  while (mhere != mend) {
+    collectinfo.collectionmeta[(*mhere).first][g_EmptyText] = (*mhere).second;
+    mhere ++;
+  }
+  //collectinfo.collectionmeta=*((*here)->getMeta());
   collectinfo.format=*((*here)->getFormat()); //text_tmap
   /*    collectinfo.building; //text_tmap  */
@@ -465 +472 @@
     text_tset::iterator fields_here=request.fields.begin();
     text_tset::iterator fields_end=request.fields.end();
-    text_tmap::iterator it;
+    //text_tmap::iterator it;
+    collectionmeta_map::iterator it;
     while (fields_here!=fields_end) {
       it=info.collectionmeta.find(*fields_here);
       if (it!=info.collectionmeta.end())
-        docs_here->metadata[*fields_here].values.push_back((*it).second);
+        docs_here->metadata[*fields_here].values.push_back(((*it).second)[g_EmptyText]);
       else if (*fields_here=="Title" && !request.docSet.empty()) { 
         // We only do this for a document action.
@@ -518 +526 @@
     else { // request.fields empty: return all metadata for about page or query
       // we'll only put it in the first docInfo.
-      text_tmap::iterator colmeta_here=info.collectionmeta.begin();
-      text_tmap::iterator colmeta_end=info.collectionmeta.end();
+      collectionmeta_map::iterator colmeta_here=info.collectionmeta.begin();
+      collectionmeta_map::iterator colmeta_end=info.collectionmeta.end();
       while (colmeta_here!=colmeta_end) {
     response.docInfo[0].metadata[(*colmeta_here).first].
-      values.push_back((*colmeta_here).second);
+      values.push_back(((*colmeta_here).second)[g_EmptyText]);
     ++colmeta_here;
       }
@@ -539 +547 @@
     if ((*zserver)->getcfgAbout("en", tmpabout)==true)
       abouttext+=tmpabout;
-
+    
     (*zserver)->setMeta("collectionextra",abouttext);
     response.docInfo[0].metadata["collectionextra"].values.push_back(abouttext);