Changeset 129

Timestamp:

05/02/08 17:14:26 (8 months ago)

Author:

zork

Message:

encoding support

Files:

• trunk/dba/dba/xmlarchive.cpp (modified) (2 diffs)
• trunk/dba/dba/xmlarchive.h (modified) (1 diff)
• trunk/dba/test/main.cpp (modified) (1 diff)
• trunk/dba/test/xmltestcase.cpp (modified) (1 diff)
• trunk/dba/test/xmltestcase.h (modified) (2 diffs)

trunk/dba/dba/xmlarchive.cpp

@@ -43 +43 @@
-    xmlDocSetRootElement(mDocument,node);
-  };
+  updateEncoding();
-  mRootNode = mDocument->children;
-};
@@ -54 +55 @@
-XMLArchive::getOutputStream() {
-  //TODO
+};
+
+void
+XMLArchive::updateEncoding() {
+  if (mDocument->encoding == NULL)
+    return;
+  if (xmlStrcasecmp((xmlChar*)"utf-8",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::UTF8;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-1",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_1;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-2",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_2;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-3",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_3;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-4",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_4;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-5",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_5;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-6",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_6;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-7",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_7;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-8",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_8;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-9",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_9;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-10",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_10;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-11",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_11;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-13",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_13;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-14",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_14;
+  else if (xmlStrcasecmp((xmlChar*)"iso-8859-15",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::ISO8859_15;
+  else if (xmlStrcasecmp((xmlChar*)"win-1250",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::CP1250;
+  else if (xmlStrcasecmp((xmlChar*)"win-1251",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::CP1251;
+  else if (xmlStrcasecmp((xmlChar*)"win-1252",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::CP1252;
+  else if (xmlStrcasecmp((xmlChar*)"win-1254",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::CP1254;
+  else if (xmlStrcasecmp((xmlChar*)"win-1255",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::CP1255;
+  else if (xmlStrcasecmp((xmlChar*)"win-1256",mDocument->encoding) == 0)
+    mConvSpecs.mDbCharset = ConvSpec::CP1256;
-};
-

trunk/dba/dba/xmlarchive.h

@@ -63 +63 @@
-    */
-    ConvSpec::charset getDebeaEncoding(const char* pLibxmlEncoding);
+    /**
+      update ConvSpec encoding
+    */
+    void updateEncoding();
-};
-

trunk/dba/test/main.cpp

@@ -150 +150 @@
-  //runner.addTest(new CppUnit::TestCaller<dba_tests::CSVTestCase>("debug_test",&dba_tests::CSVTestCase::manual));
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback));
-
+
+
-  //runner.addTest(new CppUnit::TestCaller<OdbcPluginTestCase>("debug_test",&OdbcPluginTestCase::dbConnection));
-  //runner.addTest(new CppUnit::TestCaller<PostgresSQLArchiveTestCase>("debug_test",&PostgresSQLArchiveTestCase::sqlError));

trunk/dba/test/xmltestcase.cpp

@@ -39 +39 @@
-};
-
+void
+XMLTestCase::encodingChange() {
+  { 
+    unlink("encoding.xml");
+    dba::XMLArchive ar;
+    ar.conversionSpecs().mDbCharset = dba::ConvSpec::ISO8859_2;
+    ar.open("encoding.xml");
+  };  
+  dba::XMLArchive res;
+  res.open("encoding.xml");
+  CPPUNIT_ASSERT(res.getConversionSpecs().mDbCharset == dba::ConvSpec::ISO8859_2);
+};
+
-} //namespace

trunk/dba/test/xmltestcase.h

@@ -27 +27 @@
-    CPPUNIT_TEST_SUITE(XMLTestCase);
-      CPPUNIT_TEST(empty);
+      CPPUNIT_TEST(encodingChange);
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -35 +36 @@
-    //tests
-    void empty();
+    void encodingChange();
-  private:
-};