[med-svn] r2559 - in trunk/packages/agdbnet/trunk/debian: . patches

[tille at alioth.debian.org]

Author: tille
Date: 2008-09-30 08:15:03 +0000 (Tue, 30 Sep 2008)
New Revision: 2559

Modified:
   trunk/packages/agdbnet/trunk/debian/control
   trunk/packages/agdbnet/trunk/debian/patches/10_config_location.patch
Log:
Regard hint from upstream about mod_perl


Modified: trunk/packages/agdbnet/trunk/debian/control
===================================================================
--- trunk/packages/agdbnet/trunk/debian/control	2008-09-30 07:23:33 UTC (rev 2558)
+++ trunk/packages/agdbnet/trunk/debian/control	2008-09-30 08:15:03 UTC (rev 2559)
@@ -14,6 +14,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, emboss, blast2, postgresql-8.3,
  libcgi-pm-perl, libdbd-pg-perl, libxml-perl, dbconfig-common, apache2
+Recommends: libapache2-mod-perl2
 Description: antigen sequence database software for web-based bacterial typing
  AgdbNet facilitates simultaneous BLAST querying of multiple loci using
  either nucleotide or peptide sequences.  Databases are described by XML

Modified: trunk/packages/agdbnet/trunk/debian/patches/10_config_location.patch
===================================================================
--- trunk/packages/agdbnet/trunk/debian/patches/10_config_location.patch	2008-09-30 07:23:33 UTC (rev 2558)
+++ trunk/packages/agdbnet/trunk/debian/patches/10_config_location.patch	2008-09-30 08:15:03 UTC (rev 2559)
@@ -19,18 +19,34 @@
  }
  #######End Local configuration########################
  local (
-@@ -128,7 +125,10 @@
- 				$parser->parse( Source => { SystemId => "$1/$instance" } );
- 			}
- 		} else {
+@@ -121,15 +118,19 @@
+ 	if ( $q->param('file') =~ /^([\w\d\-_]+\.xml)$/ ) {
+ 		$instance = $1;
+ 	}
+-	eval {
+-		if ( $ENV{MOD_PERL} )
+-		{
+-			if ( $ENV{SCRIPT_FILENAME} =~ /(.*)agdbnet\.pl/ ) {
+-				$parser->parse( Source => { SystemId => "$1/$instance" } );
+-			}
+-		} else {
 -			$parser->parse( Source => { SystemId => $instance } );
-+			my $xmlinstance = `pwd`."/$instance";
-+		        if ( ! -e $xmlinstance ) { $xmlinstance = "/etc/agdbnet/$instance"; }
-+			else                     { $xmlinstance = $instance ; }
-+			$parser->parse( Source => { SystemId => $xmlinstance } );
++	my $xmlinstance;
++	if ( $ENV{MOD_PERL} ) {
++		if ( $ENV{SCRIPT_FILENAME} =~ /(.*)agdbnet\.pl/ ) {
++			$xmlinstance = "$1/$instance";
  		}
++	} else {
++		$xmlinstance = $instance;
++	}
++	if ( !-e $xmlinstance ){
++		$xmlinstance = "/etc/agdbnet/$instance";
++	}
++	eval {
++		$parser->parse( Source => { SystemId => $xmlinstance } );
  	};
  	if ($@) {
+ 		if ( $config{'debug'} ) {
 --- agdbnet_v1.0.4.orig/cgi-bin/agcurate.pl
 +++ agdbnet_v1.0.4/cgi-bin/agcurate.pl
 @@ -29,7 +29,7 @@
@@ -42,14 +58,13 @@
  #######End Local configuration########################
  local (
  	our (
-@@ -69,7 +69,10 @@
+@@ -69,7 +69,9 @@
  	if ( $q->param('file') =~ /^([\w\d\-_]+\.xml)$/ ) {
  		$instance = $1;
  	}
 -	eval { $parser->parse( Source => { SystemId => $instance } ); };
-+	my $xmlinstance = `pwd`."/$instance";
++	my $xmlinstance = $instance;
 +	if ( ! -e $xmlinstance ) { $xmlinstance = "/etc/agdbnet/$instance" ; }
-+        else                     { $xmlinstance = $instance ; }
 +	eval { $parser->parse( Source => { SystemId => $xmlinstance } ); };
  	if ($@) {
  		$invalidXML = 1;