From f2a20d2c2013cb1d759e01b225cd012fd436085f Mon Sep 17 00:00:00 2001
From: "Unknown (roddey)" <dev-null@apache.org>
Date: Sat, 19 Feb 2000 00:26:41 +0000
Subject: [PATCH] Yet, yet, yet still another EBCDIC alias tweak.
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@171871 13f79535-47bb-0310-9956-ffa450edef68
---
src/util/TransService.cpp | 13 ++++---------
src/util/XMLUni.cpp | 25 +++----------------------
src/util/XMLUni.hpp | 8 +++-----
3 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/src/util/TransService.cpp b/src/util/TransService.cpp
index 635fa736d..19474efb2 100644
--- a/src/util/TransService.cpp
+++ b/src/util/TransService.cpp
@@ -374,22 +374,17 @@ void XMLTransService::initTransService()
);
//
- // Add in our mappings for EBCDIC-US. We map all the default EBCDIC-US
- // encodings to our intrinsic encoder, which is IBM-037.
+ // Add in our mappings for IBM037, and the one alias we support for
+ // it, which is EBCDIC-CP-US.
//
gMappings->put(new ENameMapFor<XMLEBCDICTranscoder>(XMLUni::fgIBM037EncodingString));
gMappings->put(new ENameMapFor<XMLEBCDICTranscoder>(XMLUni::fgIBM037EncodingString2));
- gMappings->put(new ENameMapFor<XMLEBCDICTranscoder>(XMLUni::fgIBM037EncodingString3));
- gMappings->put(new ENameMapFor<XMLEBCDICTranscoder>(XMLUni::fgIBM037EncodingString4));
- gMappings->put(new ENameMapFor<XMLEBCDICTranscoder>(XMLUni::fgIBM037EncodingString5));
-
//
- // Add in our mappings for the EBCDIC-US with Euro update, i.e. IBM1140
- // or CPIBM1140.
+ // Add in our mappings for IBM037 with Euro update, i.e. IBM1140. It
+ // has no aliases
//
gMappings->put(new ENameMapFor<XMLIBM1140Transcoder>(XMLUni::fgIBM1140EncodingString));
- gMappings->put(new ENameMapFor<XMLIBM1140Transcoder>(XMLUni::fgIBM1140EncodingString2));
//
// Add in our mappings for Windows-1252. We don't have any aliases for
diff --git a/src/util/XMLUni.cpp b/src/util/XMLUni.cpp
index 1a7bcd660..1b6f14bce 100644
--- a/src/util/XMLUni.cpp
+++ b/src/util/XMLUni.cpp
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.12 2000/02/19 00:26:41 roddey
+ * Yet, yet, yet still another EBCDIC alias tweak.
+ *
* Revision 1.11 2000/02/18 22:24:18 roddey
* Ok... yet still one more tweak for EBCDIC aliases
*
@@ -207,39 +210,17 @@ const XMLCh XMLUni::fgGlobalNSURIName[] =
, chLatin_N, chLatin_S, chNull
};
-
const XMLCh XMLUni::fgIBM037EncodingString[] =
{
chLatin_E, chLatin_B, chLatin_C, chLatin_D, chLatin_I, chLatin_C, chDash, chLatin_C, chLatin_P, chDash, chLatin_U, chLatin_S, chNull
};
const XMLCh XMLUni::fgIBM037EncodingString2[] =
-{
- chLatin_C, chLatin_P, chLatin_I, chLatin_B, chLatin_M, chDigit_3, chDigit_7, chNull
-};
-
-const XMLCh XMLUni::fgIBM037EncodingString3[] =
{
chLatin_I, chLatin_B, chLatin_M, chDigit_0, chDigit_3, chDigit_7, chNull
};
-const XMLCh XMLUni::fgIBM037EncodingString4[] =
-{
- chLatin_C, chLatin_P, chDigit_0, chDigit_3, chDigit_7, chNull
-};
-
-const XMLCh XMLUni::fgIBM037EncodingString5[] =
-{
- chLatin_C, chLatin_S, chLatin_I, chLatin_B, chLatin_M, chDigit_0
- , chDigit_3, chDigit_7, chNull
-};
-
const XMLCh XMLUni::fgIBM1140EncodingString[] =
-{
- chLatin_C, chLatin_P, chLatin_I, chLatin_B, chLatin_M, chDigit_1, chDigit_1, chDigit_4, chDigit_0, chNull
-};
-
-const XMLCh XMLUni::fgIBM1140EncodingString2[] =
{
chLatin_I, chLatin_B, chLatin_M, chDigit_1, chDigit_1, chDigit_4, chDigit_0, chNull
};
diff --git a/src/util/XMLUni.hpp b/src/util/XMLUni.hpp
index 9012f62b0..2fe3447cd 100644
--- a/src/util/XMLUni.hpp
+++ b/src/util/XMLUni.hpp
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.11 2000/02/19 00:26:41 roddey
+ * Yet, yet, yet still another EBCDIC alias tweak.
+ *
* Revision 1.10 2000/02/18 22:03:31 roddey
* One more tweak for EBCDIC encoding aliases.
*
@@ -249,12 +252,7 @@ public :
static const XMLCh fgGlobalNSURIName[];
static const XMLCh fgIBM037EncodingString[];
static const XMLCh fgIBM037EncodingString2[];
- static const XMLCh fgIBM037EncodingString3[];
- static const XMLCh fgIBM037EncodingString4[];
- static const XMLCh fgIBM037EncodingString5[];
- static const XMLCh fgIBM037EncodingString6[];
static const XMLCh fgIBM1140EncodingString[];
- static const XMLCh fgIBM1140EncodingString2[];
static const XMLCh fgIESString[];
static const XMLCh fgIDString[];
static const XMLCh fgIDRefString[];
--
GitLab