Changeset 10738

Timestamp:

2005-10-20T10:36:24+13:00 (19 years ago)

Author:

kjdon

Message:

now use utf8outconvertclass when outputting metadata so that its in the right encoding

Location:

trunk/gsdl/src/oaiservr

Files:

• metaformat.cpp (modified) (6 diffs)
• metaformat.h (modified) (1 diff)

trunk/gsdl/src/oaiservr/metaformat.cpp

@@ -1 +1 @@
 #include "metaformat.h"
-
+#include "gsdlunicode.h"
 #include <fstream>
 
@@ -18 +18 @@
 }
 
-void metaformat::output_item(ostream &output, bool &headerDone, const text_t &label, 
+void metaformat::output_item(ostream &output, outconvertclass &outconvert, 
+                 bool &headerDone, const text_t &label, 
                  const text_tarray &values)
 { 
+
   if (!headerDone && (values.size() > 0)) {
     this->output_metadata_header(output);
@@ -28 +30 @@
   for (int item = 0; item < values.size(); ++item) {
     if (this->oaiConfigure->getOAIVersion() >= 200) { // TODO: GRB: This code may need to be subclassed by dc for 200 and later...
-      output << "        <" << this->formatPrefix() << ":" << label << ">" << values[item] << "</" << this->formatPrefix() << ":" << label << ">\n";
+      output << outconvert << "        <" << this->formatPrefix() << ":" << label << ">" << values[item] << "</" << this->formatPrefix() << ":" << label << ">\n";
     }
     else {
-      output << "        <" << label << ">" << values[item] << "</" << label << ">\n";
+      output << outconvert << "        <" << label << ">" << values[item] << "</" << label << ">\n";
     }
   }
@@ -42 +44 @@
   MetadataInfo_tmap::iterator here = docInfo.metadata.begin();
   MetadataInfo_tmap::iterator end = docInfo.metadata.end();
+
+  utf8outconvertclass utf8convert; // we want to output metadata in utf8
 
   // metaItem is used initially to identify the rfc1807 (etc) metadata items. It is 
@@ -66 +70 @@
 
       if (doOutput) {
-    this->output_item(output, headerDone, metaItem, here->second.values);
+    this->output_item(output, utf8convert, headerDone, metaItem, here->second.values);
       }
       else {
@@ -80 +84 @@
     // particular metadata is stuff we don't want?
     if (doOutput) {
-      this->output_item(output, headerDone, mapTo, here->second.values);
+      this->output_item(output, utf8convert, headerDone, mapTo, here->second.values);
     }
     else {

trunk/gsdl/src/oaiservr/metaformat.h

@@ -19 +19 @@
  protected:
   virtual void output_metadata_header(ostream &output) = 0;
-  virtual void output_item(ostream &output, bool &headerDone, const text_t &label, 
+  virtual void output_item(ostream &output, outconvertclass &outconvert, bool &headerDone, const text_t &label, 
                const text_tarray &values);
   virtual void output_metadata_footer(ostream &output) = 0;