[sword-svn] r2445 - trunk/bindings/corba/omniorbcpp

[scribe at crosswire.org]

Author: scribe
Date: 2009-08-23 12:55:37 -0700 (Sun, 23 Aug 2009)
New Revision: 2445

Modified:
   trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
Log:
removed local copy of assureValidUTF8.
debug for entryAttributesSearch still in SWModule.  Be sure to remove after purpose is served.


Modified: trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
===================================================================
--- trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp	2009-08-23 19:49:52 UTC (rev 2444)
+++ trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp	2009-08-23 19:55:37 UTC (rev 2445)
@@ -35,38 +35,9 @@
 
 sword::RawText NULLMod("/dev/null", SWNULL, SWNULL);
 
-namespace {
 
-// something about this still doesn't work. see gerlut1545.conf
-SWBuf assureValidUTF8(SWBuf buf) {
 
-	const unsigned char *b = (const unsigned char *)buf.c_str();
-	const unsigned char *q = 0;
-	bool invalidChar = false;
-	while (*b) {
-		q = b;
-		if (!getUniCharFromUTF8(&b)) {
-			long len = b - q;
-			if (len) {
-				invalidChar = true;
-				for (long start = q - (const unsigned char *)buf.c_str(); len; len--) {
-					buf[start+len-1] = 0x1a;	// unicode replacement character
-//					buf[start+len-1] = '?';	// unicode replacement character
-				}
-				
-			}
-		}
-	}
-	if (invalidChar) {
-		std::cerr << "Changing invalid UTF-8 string to (" << buf << ")" << std::endl;
-	}
-	return buf;
-}
 
-}
-
-
-
 swordorb_SWModule_i::swordorb_SWModule_i(sword::SWModule *delegate)
 {
 	this->delegate = delegate;