X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fsoap.cgi;h=8c1ec3c5c3466d45d6168f22ec299311fc2326da;hb=eeaa1c6b4d90ed620b53e92efef377446c0b9e8b;hp=31b43bab1367681681234c4d07a55252ef259a1c;hpb=2e85e976dcd2cc3bdc89715eb8465abad8b85df6;p=debbugs.git

diff --git a/cgi/soap.cgi b/cgi/soap.cgi
index 31b43ba..8c1ec3c 100755
--- a/cgi/soap.cgi
+++ b/cgi/soap.cgi
@@ -3,6 +3,29 @@
 use warnings;
 use strict;
 
+# if we're running out of git, we want to use the git base directory as the
+# first INC directory. If you're not running out of git, don't do that.
+use File::Basename qw(dirname);
+use Cwd qw(abs_path);
+our $debbugs_dir;
+BEGIN {
+    $debbugs_dir =
+	abs_path(dirname(abs_path(__FILE__)) . '/../');
+    # clear the taint; we'll assume that the absolute path to __FILE__ is the
+    # right path if there's a .git directory there
+    ($debbugs_dir) = $debbugs_dir =~ /([[:print:]]+)/;
+    if (defined $debbugs_dir and
+	-d $debbugs_dir . '/.git/') {
+    } else {
+	undef $debbugs_dir;
+    }
+    # if the first directory in @INC is not an absolute directory, assume that
+    # someone has overridden us via -I.
+    if ($INC[0] !~ /^\//) {
+    }
+}
+use if defined $debbugs_dir, lib => $debbugs_dir;
+
 #use SOAP::Transport::HTTP;
 
 use Debbugs::SOAP::Server;
@@ -19,12 +42,21 @@ my $soap = Debbugs::SOAP::Server
 # soapy is stupid, and is using the 1999 schema; override it.
 *SOAP::XMLSchema1999::Serializer::as_base64Binary = \&SOAP::XMLSchema2001::Serializer::as_base64Binary;
 *SOAP::Serializer::as_anyURI       = \&SOAP::XMLSchema2001::Serializer::as_string;
+# do this twice to avoid the warning if the serializer doesn't get
+# used
+*SOAP::XMLSchema1999::Serializer::as_base64Binary = \&SOAP::XMLSchema2001::Serializer::as_base64Binary;
+*SOAP::Serializer::as_anyURI       = \&SOAP::XMLSchema2001::Serializer::as_string;
 # to work around the serializer improperly using date/time stuff
 # (Nothing in Debbugs should be looked at as if it were date/time) we
 # kill off all of the date/time related bits in the serializer.
 my $typelookup = $soap->serializer()->{_typelookup};
 for my $key (keys %{$typelookup}) {
-     delete $typelookup->{$key} if defined $key and $key =~ /Month|Day|Year|date|time|duration/i;
+    if (defined $key and
+        $key =~ /Month|Day|Year|date|time|duration/i
+       ) {
+        # set the sub to always return 0
+        $typelookup->{$key}[1] = sub { 0 };
+    }
 }
 
 our $warnings = '';