[sword-cvs] sword/bindings/perl Sword.xs,1.1,1.2

sword@www.crosswire.org sword@www.crosswire.org
Fri, 6 Feb 2004 14:01:32 -0700


Update of /cvs/core/sword/bindings/perl
In directory www:/tmp/cvs-serv27118/bindings/perl

Modified Files:
	Sword.xs 
Log Message:
	Changed system[Log|File|Locale]Mgr to
		*Mgr *[get|set]System*Mgr() per Daniel Glassey's
		discovery of potential problems from order of
		initializing statics.

	Added new prefix recognition for OSIS lemma prefix
		"strong:"



Index: Sword.xs
===================================================================
RCS file: /cvs/core/sword/bindings/perl/Sword.xs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Sword.xs	9 Jun 2002 14:09:53 -0000	1.1
+++ Sword.xs	6 Feb 2004 21:01:00 -0000	1.2
@@ -58,7 +58,7 @@
 VerseIterator::VerseIterator(char * module_name) {
 	module = manager.Modules[module_name];
 	key = module->Key();
-	key.setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
+	key.setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
 
 	key = key.LowerBound();
 }
@@ -121,9 +121,9 @@
 void
 get_locales()
 PPCODE:
-	LocaleMgr lm = LocaleMgr::systemLocaleMgr;
-	list<string> loclist = lm.getAvailableLocales();
-	list<string>::iterator li = loclist.begin();
+	LocaleMgr *lm = LocaleMgr::getSystemLocaleMgr();
+	list<SWBuf> loclist = lm->getAvailableLocales();
+	list<SWBuf>::iterator li = loclist.begin();
 	for (;li != loclist.end(); li++) {
 		XPUSHs(sv_2mortal(newSVpv(li->c_str(), li->length())));
 	}
@@ -131,7 +131,7 @@
 void
 set_locale(char * locale)
 CODE:
-	LocaleMgr::systemLocaleMgr.setDefaultLocaleName(locale);
+	LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(locale);
 
 
 MODULE = Sword		PACKAGE = Sword::VerseIterator