sync with crosswire 20021002-1300

7 files changed, 16 insertions, 9 deletions

diff --git a/bindings/flatapi.cpp b/bindings/flatapi.cpp
index 7728b86..a2c2696 100644
--- a/bindings/flatapi.cpp
+++ b/bindings/flatapi.cpp
@@ -14,6 +14,9 @@
 #include <versekey.h>
 #include <swmgr.h>
 #include <markupfiltmgr.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
 
 #include "flatapi.h"
 
diff --git a/bindings/swig/Makefile b/bindings/swig/Makefile
index a1dca13..44f00ce 100644
--- a/bindings/swig/Makefile
+++ b/bindings/swig/Makefile
@@ -1,6 +1,7 @@
 TOP        = $(PWD)
 SWIG       = swig
-SWIGOPT    = -Wall -proxy
+#SWIGOPT    = -Wall -proxy
+SWIGOPT    = -shadow
 CXXSRCS    = 
 TARGET     = sword
 INTERFACE  = sword.i
diff --git a/bindings/swig/Makefile.swig b/bindings/swig/Makefile.swig
index 736488c..9b8271a 100644
--- a/bindings/swig/Makefile.swig
+++ b/bindings/swig/Makefile.swig
@@ -167,7 +167,7 @@ tcl_multi_cpp: $(SRCS)
 # files "perl.h", "EXTERN.h" and "XSUB.h".   With Perl5.003, it's
 # usually something like /usr/local/lib/perl5/arch-osname/5.003/CORE.
 
-PERL5_INCLUDE= /usr/lib/perl5/5.6.1/i586-linux/CORE
+PERL5_INCLUDE= /usr/lib/perl5/5.6.1/i386-linux/CORE
 
 # Extra Perl specific dynamic linking options
 PERL5_DLNK   = 
diff --git a/bindings/swig/listkey.i b/bindings/swig/listkey.i
index 945621f..bb39b3d 100644
--- a/bindings/swig/listkey.i
+++ b/bindings/swig/listkey.i
@@ -38,7 +38,7 @@ public:
 	//virtual char SetToElement (int ielement, SW_POSITION = TOP);
 %extend {
 	virtual char SetToElement(int element) {
-		self->SetToElement(element, TOP);
+		return self->SetToElement(element, TOP);
 	};
 }
 
diff --git a/bindings/swig/swmgr.i b/bindings/swig/swmgr.i
index a50c8fe..b66c2c4 100644
--- a/bindings/swig/swmgr.i
+++ b/bindings/swig/swmgr.i
@@ -9,8 +9,8 @@ typedef map < string, SWFilter * > FilterMap;
 class SWMgr {
 public:
 //member data
-  static bool debug;
-  static const char *globalConfPath;
+//  static bool debug;
+//  static const char *globalConfPath;
   static void findConfig (char *configType, char **prefixPath, char **configPath);
 
   SWConfig *config;
diff --git a/bindings/swig/swmodule.i b/bindings/swig/swmodule.i
index f65fd1b..da8c8ff 100644
--- a/bindings/swig/swmodule.i
+++ b/bindings/swig/swmodule.i
@@ -84,7 +84,7 @@ public:
 //write interface
   virtual bool isWritable ();
   static signed char createModule (const char *);
-  virtual SWModule& setentry (const char *inbuf, long len);
+  virtual void setEntry (const char *inbuf, long len);
   virtual void deleteEntry ();
   
 %extend {
diff --git a/bindings/swig/sword.pl b/bindings/swig/sword.pl
index 969424d..873b948 100644
--- a/bindings/swig/sword.pl
+++ b/bindings/swig/sword.pl
@@ -21,11 +21,14 @@ print " finished \n";
 $config->Save();
 
 #testing SWMgr
-$localemgr = sword::LocaleMgr::systemLocaleMgr();
-$localemgr->setDefaultLocaleName("de");
+print "testing SWMgr\n";
+#$localemgr = sword::LocaleMgr::systemLocaleMgr();
+#$localemgr->setDefaultLocaleName("de");
 
 $mgr = new sword::SWMgr();
-$module = $mgr->module("GerLut1545-temp");
+print "init ... ";
+#$module = $mgr->module("GerLut1545-temp");
+$module = $mgr->module("WEB");
 print "Printing WEB Module information: \n";
 print "Name:\t", $module->Name(),"\nDescription:\t", $module->Description(), "\nLang:\t", $module->Lang(), "\n";