Changeset 1870 for trunk/gsdl/lib

Timestamp:

2001-01-29T14:54:58+13:00 (23 years ago)

Author:

sjboddie

Message:

Tidied up language support stuff.

Location:

trunk/gsdl/lib

Files:

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

trunk/gsdl/lib/gsdlunicode.cpp

@@ -263 +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) {
+bool mapconvert::setmapfile (const text_t &themapfile, unsigned short theabsentc) {
   // check to see if the mapfile has been already loaded
-  if (mapdata.loaded && gsdlhome == thegsdlhome &&
-      encoding == theencoding && absentc == theabsentc) 
-    return true;
+  if (mapdata.loaded && mapfile == themapfile && absentc == theabsentc) return true;
 
   unloadmapfile ();
-  gsdlhome = thegsdlhome;
-  encoding = theencoding;
+  mapfile = themapfile;
   absentc = theabsentc;
   
@@ -281 +277 @@
 
 // loadmapfile should be called before any conversion is done
-bool mapconvert::loadmapfile (const text_t &thegsdlhome, 
-                  const text_t &theencoding, 
+bool mapconvert::loadmapfile (const text_t &themapfile,
                   unsigned short theabsentc) {
   FILE *mapfilein = (FILE *)NULL;
 
   // check to see if the mapfile has been already loaded
-  if (mapdata.loaded && gsdlhome == thegsdlhome &&
-      encoding == theencoding && absentc == theabsentc) 
-    return true;
+  if (mapdata.loaded && mapfile == themapfile && absentc == theabsentc) return true;
 
   unloadmapfile ();
-  gsdlhome = thegsdlhome;
-  encoding = theencoding;
+  mapfile = themapfile;
   absentc = theabsentc;
 
   // open the map file
-  text_t filename = filename_cat (gsdlhome, "unicode");
-  filename = filename_cat (filename, encoding);
-  filename += ".ump";
-  char *cfilename = filename.getcstr();
+  char *cfilename = mapfile.getcstr();
   if (cfilename == (char *)NULL) return false;
   mapfilein = fopen(cfilename, "rb");
@@ -359 +348 @@
 unsigned short mapconvert::convert (unsigned short c) {
   if (!mapdata.loaded) {
-    if (!gsdlhome.empty() && !encoding.empty() &&
-    loadmapfile (gsdlhome, encoding, absentc)) {
+    if (!mapfile.empty() && loadmapfile (mapfile, absentc)) {
       // do nothing, successfully loaded database
     } else return absentc;

trunk/gsdl/lib/gsdlunicode.h

@@ -114 +114 @@
   // setmapfile will cause loadmapfile to be called when conversion is
   // needed
-  bool setmapfile (const text_t &thegsdlhome, const text_t &theencoding, 
-           unsigned short theabsentc);
+  bool setmapfile (const text_t &themapfile, unsigned short theabsentc);
 
   // loadmapfile should be called before any conversion is done
-  bool loadmapfile (const text_t &thegsdlhome, const text_t &theencoding, 
-            unsigned short theabsentc);
+  bool loadmapfile (const text_t &themapfile, unsigned short theabsentc);
   void unloadmapfile ();
 
@@ -129 +127 @@
 
 protected:
-  text_t gsdlhome;
-  text_t encoding;
+  text_t mapfile;
   unsigned short absentc;
   mapdata_t mapdata;
@@ -146 +143 @@
 
   // 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);
+  bool setmapfile (const text_t &themapfile, unsigned short theabsentc) {
+    return converter.setmapfile (themapfile, theabsentc);
   };
 
   // loadmapfile should be called before any conversion takes
   // place
-  bool loadmapfile (const text_t &thegsdlhome, const text_t &theencoding, 
-            unsigned short theabsentc) {
-    return converter.loadmapfile (thegsdlhome, theencoding, theabsentc);
+  bool loadmapfile (const text_t &themapfile, unsigned short theabsentc) {
+    return converter.loadmapfile (themapfile, theabsentc);
   };
 
@@ -189 +184 @@
 
   // 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);
+  bool setmapfile (const text_t &themapfile, unsigned short theabsentc) {
+    return converter.setmapfile (themapfile, theabsentc);
   };
 
   // loadmapfile should be called before any conversion takes
   // place
-  bool loadmapfile (const text_t &thegsdlhome, const text_t &theencoding, 
-            unsigned short theabsentc) {
-    return converter.loadmapfile (thegsdlhome, theencoding, theabsentc);
+  bool loadmapfile (const text_t &themapfile, unsigned short theabsentc) {
+    return converter.loadmapfile (themapfile, theabsentc);
   };