Changeset 413

Timestamp:

1999-07-21T19:23:18+12:00 (25 years ago)

Author:

rjmcnab

Message:

Added setmapfile function to map conversion utilities so the map file
does not need to be loaded when map conversion object is created.

Location:

trunk/gsdl/lib

Files:

• gsdlunicode.cpp (modified) (3 diffs)
• gsdlunicode.h (modified) (3 diffs)

trunk/gsdl/lib/gsdlunicode.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.9  1999/07/21 07:23:17  rjmcnab
+   Added setmapfile function to map conversion utilities so the map file
+   does not need to be loaded when map conversion object is created.
+
    Revision 1.8  1999/07/01 04:03:45  rjmcnab
    Optimised utf8inconvertclass::convert slightly.
@@ -259 +263 @@
 }
 
+// setmapfile will cause loadmapfile to be called when conversion is
+// needed
+bool mapconvert::setmapfile (const text_t &thegsdlhome, const text_t &theencoding, 
+                 unsigned short theabsentc) {
+  // check to see if the mapfile has been already loaded
+  if (mapdata.loaded && gsdlhome == thegsdlhome &&
+      encoding == theencoding && absentc == theabsentc) 
+    return true;
+
+  unloadmapfile ();
+  gsdlhome = thegsdlhome;
+  encoding = theencoding;
+  absentc = theabsentc;
+  
+  return true;
+}
+
+
 
 // loadmapfile should be called before any conversion is done
@@ -338 +360 @@
 
 unsigned short mapconvert::convert (unsigned short c) {
-  if (!mapdata.loaded) return absentc;
+  if (!mapdata.loaded) {
+    if (!gsdlhome.empty() && !encoding.empty() &&
+    loadmapfile (gsdlhome, encoding, absentc)) {
+      // do nothing, successfully loaded database
+    } else return absentc;
+  }
 
   if (c == 0) return 0; // 0 always maps to 0...

trunk/gsdl/lib/gsdlunicode.h

@@ -98 +98 @@
   ~mapconvert () {unloadmapfile();};
 
+  // setmapfile will cause loadmapfile to be called when conversion is
+  // needed
+  bool setmapfile (const text_t &thegsdlhome, const text_t &theencoding, 
+           unsigned short theabsentc);
+
   // loadmapfile should be called before any conversion is done
   bool loadmapfile (const text_t &thegsdlhome, const text_t &theencoding, 
@@ -125 +130 @@
   mapinconvertclass();
   virtual ~mapinconvertclass() {};
+
+  // setmapfile will cause loadmapfile to be called when conversion is needed
+  bool setmapfile (const text_t &thegsdlhome, const text_t &theencoding, 
+            unsigned short theabsentc) {
+    return converter.setmapfile (thegsdlhome, theencoding, theabsentc);
+  };
 
   // loadmapfile should be called before any conversion takes
@@ -163 +174 @@
   virtual ~mapoutconvertclass() {};
 
+  // setmapfile will cause loadmapfile to be called when conversion is needed
+  bool setmapfile (const text_t &thegsdlhome, const text_t &theencoding, 
+            unsigned short theabsentc) {
+    return converter.setmapfile (thegsdlhome, theencoding, theabsentc);
+  };
+
   // loadmapfile should be called before any conversion takes
   // place