Changeset 8306

Timestamp:

2004-10-13T12:25:32+13:00 (20 years ago)

Author:

mdewsnip

Message:

A few changes necessary to get the OAI server compiling with Microsoft Visual C++ 4.

Location:

trunk/gsdl/src/oaiservr

Files:

• metaformat.h (modified) (1 diff)
• oaiaction.cpp (modified) (1 diff)
• oaimain.cpp (modified) (1 diff)
• recordaction.cpp (modified) (1 diff)

trunk/gsdl/src/oaiservr/metaformat.h

@@ -52 +52 @@
 };
 
-typedef map<text_t, metaformatptr> metaformat_map;
+typedef map<text_t, metaformatptr, lttext_t> metaformat_map;
 
 #endif

trunk/gsdl/src/oaiservr/oaiaction.cpp

@@ -329 +329 @@
     // avoid outputting the action tag if the action's body is unsuccessful, in which
     // case the leading tag must be suppressed
+#if defined(GSDL_USE_IOS_H)
+    ostrstream outstream;
+#else
     ostringstream outstream;
+#endif
 
     // Version 2.0 needs an <Identify>, etc. tag after the OAI-PMH header, IF there is no error

trunk/gsdl/src/oaiservr/oaimain.cpp

@@ -26 +26 @@
  *********************************************************************/
 
-#if defined(GSDL_USE_STL_H)
-#include <fstream.h>
-#include <strstream.h>
+#if defined(GSDL_USE_IOS_H)
+#  include <fstream.h>
+#  if defined(__WIN32__)
+#    include <strstrea.h> // vc4
+#  else
+#    include <strstream.h>
+#  endif
 #else
-#include <fstream>
-#include <strstream>
+#  include <fstream>
+#  include <sstream>
 #endif
 

trunk/gsdl/src/oaiservr/recordaction.cpp

@@ -100 +100 @@
   }
 
-  this->output_record(output, collection, OID, metadataPrefix);
+  return this->output_record(output, collection, OID, metadataPrefix);
 }