Changeset 20708 for gsdl

Timestamp:

2009-09-25T12:03:35+12:00 (15 years ago)

Author:

mdewsnip

Message:

Same fix as made to identifyaction.cpp, to use a utf8outconvertclass when writing output so Unicode characters are correctly encoded as UTF-8.

File:

• gsdl/trunk/runtime-src/src/oaiservr/listsetsaction.cpp (modified) (3 diffs)

gsdl/trunk/runtime-src/src/oaiservr/listsetsaction.cpp

@@ -151 +151 @@
 bool listsetsaction::output_content_for_col(ostream &output, recptproto *protocol, oaiargs &params, text_t collection)
 {
+  utf8outconvertclass utf8convert;
   text_t position = "";
 
@@ -184 +185 @@
   if (position == "" || position == collection)
   {
-    output << "  <set>" << endl;
-    output << "    <setSpec>" << collection << "</setSpec>" << endl;
+    output << utf8convert << "  <set>\n";
+    output << utf8convert << "    <setSpec>" << collection << "</setSpec>\n";
     if (this->configuration->getSetName(collection) != "")
     {
-      output << "    <setName>" << this->configuration->getSetName(collection) << "</setName>" << endl;
+      output << utf8convert << "    <setName>" << this->configuration->getSetName(collection) << "</setName>\n";
     }
     else
     {
-      output << "    <setName>" << collection << "</setName>" << endl;
+      output << utf8convert << "    <setName>" << collection << "</setName>\n";
     }
     if (this->configuration->getSetDescription(collection) != "")
     {
-      output << "    <setDescription>" << this->configuration->getSetDescription(collection) << "</setDescription>" << endl;
-    }
-    output << "  </set>" << endl;
+      output << utf8convert << "    <setDescription>" << this->configuration->getSetDescription(collection) << "</setDescription>\n";
+    }
+    output << utf8convert << "  </set>\n";
     this->setsOutput++;
   }
@@ -227 +228 @@
 
       // Otherwise output this set and increment the count
-      output << "  <set>" << endl;
-      output << "    <setSpec>" << collection << ":" << set << "</setSpec>" << endl;
+      output << utf8convert << "  <set>\n";
+      output << utf8convert << "    <setSpec>" << collection << ":" << set << "</setSpec>\n";
       if (this->configuration->getSetName(collection + ":" + set) != "")
       {
-    output << "    <setName>" << this->configuration->getSetName(collection + ":" + set) << "</setName>" << endl;
+    output << utf8convert << "    <setName>" << this->configuration->getSetName(collection + ":" + set) << "</setName>\n";
       }
       else
       {
-    output << "    <setName>" << set_response.docInfo[0].metadata["Title"].values[0] << "</setName>" << endl;
+    output << utf8convert << "    <setName>" << set_response.docInfo[0].metadata["Title"].values[0] << "</setName>\n";
       }
       if (this->configuration->getSetDescription(collection + ":" + set) != "")
       {
-    output << "    <setDescription>" << this->configuration->getSetDescription(collection + ":" + set) << "</setDescription>" << endl;
-      }
-      output << "  </set>" << endl;
+    output << utf8convert << "    <setDescription>" << this->configuration->getSetDescription(collection + ":" + set) << "</setDescription>\n";
+      }
+      output << utf8convert << "  </set>\n";
       this->setsOutput++;
     }