bugfix with perl/inc and java/inc.

wadelau · Aug 10, 2018 · 17fb025 · 17fb025
1 parent 4744ac9
commit 17fb025
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/java/inc/MySql.class.jsp b/java/inc/MySql.class.jsp
@@ -140,8 +140,6 @@ public final class MySql implements DbDriver {
 			
 			hm.put(0, true);
 			hm.put(1, affectrows);
-
-            rs.close(); rs = null;
 		
 		}
 		catch (Exception ex){

diff --git a/perl/inc/Conn.pm b/perl/inc/Conn.pm
@@ -13,7 +13,10 @@ binmode( STDERR, ':encoding(utf8)' );
 #use parent 'inc::DBA';
 use inc::Config;
 
-my $_ROOT_ = dirname(abs_path($0));
+my $_ROOT_ = "../";
+if(my $tmpPath=abs_path($0)){
+    $_ROOT_ = dirname($tmpPath);
+}
 my $isdbg = 1;
 
 #

diff --git a/perl/inc/Dba.pm b/perl/inc/Dba.pm
@@ -14,7 +14,10 @@ use inc::Config;
 use inc::MySQL;
 use inc::Conn;
 
-my $_ROOT_ = dirname(abs_path($0));
+my $_ROOT_ = "../";
+if(my $tmpPath=abs_path($0)){
+    $_ROOT_ = dirname($tmpPath);
+}
 my $conf = ();
 my $dbconn = {};
 my %Sql_Operator_List = (' '=>1,'^'=>1,'~'=>1,':'=>1,'!'=>1,'/'=>1,

diff --git a/perl/inc/FileSys.pm b/perl/inc/FileSys.pm
@@ -20,7 +20,10 @@ use File::Path qw(make_path remove_tree);
 #use parent 'inc::DBA';
 use inc::Config;
 
-my $_ROOT_ = dirname(abs_path($0));
+my $_ROOT_ = "../";
+if(my $tmpPath=abs_path($0)){
+    $_ROOT_ = dirname($tmpPath);
+}
 my $isdbg = 1;
 my $file = '';
 my $fh = undef;

diff --git a/perl/inc/Filea.pm b/perl/inc/Filea.pm
@@ -17,7 +17,10 @@ use inc::Config;
 use inc::Conn;
 use inc::FileSys;
 
-my $_ROOT_ = dirname(abs_path($0));
+my $_ROOT_ = "../";
+if(my $tmpPath=abs_path($0)){
+    $_ROOT_ = dirname($tmpPath);
+}
 my $conf = ();
 my $filehdl = {};
 

diff --git a/perl/inc/MySQL.pm b/perl/inc/MySQL.pm
@@ -18,7 +18,10 @@ use Try::Tiny;
 #use parent 'inc::DBA';
 use inc::Config;
 
-my $_ROOT_ = dirname(abs_path($0));
+my $_ROOT_ = "../";
+if(my $tmpPath=abs_path($0)){
+    $_ROOT_ = dirname($tmpPath);
+}
 my ($m_host, $m_port, $m_user, $m_password, $m_name, $_link, $m_sock)
 	= ('', '', '', '', '', '', '');
 my ($dbh, $sth, $sql, $rs, $row, %datasource) = (undef, undef, 0, 0, 0, ());

diff --git a/perl/inc/WebApp.pm b/perl/inc/WebApp.pm
@@ -25,7 +25,10 @@ use inc::Config qw(GConf);
 use inc::Dba;
 use inc::Filea;
 
-my $_ROOT_ = dirname(abs_path($0));
+my $_ROOT_ = "../";
+if(my $tmpPath=abs_path($0)){
+    $_ROOT_ = dirname($tmpPath);
+}
 use constant VER => 0.01;
 my $dba = {};
 my %hm = (); # []; is a reference

diff --git a/perl/index.pl b/perl/index.pl
@@ -75,5 +75,5 @@
 
 if($singlerun == 1){
 	close(LOCK);
-	unlink($mydir."/".$basename.".lock") or warn "remove lock file failed:[$!].\n";
+	unlink($mydir."/".$basename.".".$mod.".".$act.".lock") or warn "remove lock file failed:[$!].\n";
 }