INTEGRATION: CWS hr49 (1.5.790); FILE MERGED

2008/01/15 12:11:34 hr 1.5.790.1: #i82792#: improve SOAP::Lite version check. Applied patch by Hubert Figuire (hub)

1 files changed, 15 insertions, 7 deletions

diff --git a/solenv/bin/modules/Eis.pm b/solenv/bin/modules/Eis.pm
index e10df924b669..3c184bb42560 100755
--- a/solenv/bin/modules/Eis.pm
+++ b/solenv/bin/modules/Eis.pm
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: Eis.pm,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: rt $ $Date: 2006-01-10 13:10:13 $
+#   last change: $Author: vg $ $Date: 2008-01-29 07:57:31 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -191,15 +191,23 @@ sub create_eis_connector
     # Since older versions do not support the ns() method we
     # either force everyone to upgrade now, or make the following
     # dependent on the SOAP::Lite version.
-    if ( $SOAP::Lite::VERSION >= 0.66 ) {
-        $sl = SOAP::Lite
+    my ($vmaj, $vmin) = (0, 0);
+    if( $SOAP::Lite::VERSION =~ m/([0-9]*)\.([0-9]*)/ ) {
+        $vmaj = $1;
+        $vmin = $2;
+        if ( $vmaj > 0 || ( $vmaj == 0 && $vmin >= 66 ) ) {
+            $sl = SOAP::Lite
             -> ns($uri)
             -> proxy($proxy);
-    }
-    else {
-        $sl = SOAP::Lite
+        }
+        else {
+            $sl = SOAP::Lite
             -> uri($uri)
             -> proxy($proxy);
+        }
+    }
+    else {
+        carp("ERROR: Can't determine SOAP::Lite version.");
     }
 
     return $sl;