Changeset 20707 for gsdl

Timestamp:

2009-09-25T10:31:05+12:00 (15 years ago)

Author:

mdewsnip

Message:

Now uses a utf8outconvertclass when writing output from the Identify action, so Unicode characters are correctly encoded as UTF-8.

File:

• gsdl/trunk/runtime-src/src/oaiservr/identifyaction.cpp (modified) (4 diffs)

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

@@ -55 +55 @@
 bool identifyaction::output_content(ostream &output, recptproto *protocol, oaiargs &params)
 {
+  utf8outconvertclass utf8convert;
+
   // Get the repository name (some human-readable name for the site, or superset of collections)
   text_t repositoryName = this->configuration->getCollectionConfig("", "repositoryName");
@@ -63 +65 @@
   text_t baseURL = this->configuration->getCollectionConfig("", "baseURL");
   
-  output << "  <repositoryName>"  << repositoryName << "</repositoryName>" << endl;
-  output << "  <baseURL>"         << baseURL     << "</baseURL>" << endl; // Tack on the app name
-  output << "  <protocolVersion>" << version        << "</protocolVersion>" << endl;
-  output << "  <adminEmail>"      << maintainer     << "</adminEmail>" << endl;
+  output << utf8convert << "  <repositoryName>"  << repositoryName << "</repositoryName>\n";
+  output << utf8convert << "  <baseURL>"         << baseURL        << "</baseURL>\n";
+  output << utf8convert << "  <protocolVersion>" << version        << "</protocolVersion>\n";
+  output << utf8convert << "  <adminEmail>"      << maintainer     << "</adminEmail>\n";
 
   if(version == "2.0"){
@@ -73 +75 @@
     // not to be worth the effort of trolling through all the lastmodified dates (by others with more 
     // say than me)
-    output << "  <earliestDatestamp>1970-01-01</earliestDatestamp>\n"
-       << "  <deletedRecord>no</deletedRecord>\n"
-       << "  <granularity>YYYY-MM-DD</granularity>\n";
+    output << utf8convert << "  <earliestDatestamp>1970-01-01</earliestDatestamp>\n";
+    output << utf8convert << "  <deletedRecord>no</deletedRecord>\n";
+    output << utf8convert << "  <granularity>YYYY-MM-DD</granularity>\n";
   }
   // list all configuration information
@@ -81 +83 @@
   text_tmap::iterator end  = this->configuration->getInformation()->end();
   while (here != end) {
-    output << "  <" << here->first << ">" << here->second;
-    output << "  </" << here->first << ">" << endl;
+    output << utf8convert << "  <" << here->first << ">" << here->second;
+    output << utf8convert << "  </" << here->first << ">\n";
     ++here;
   }