From b9fcc57b3a6fce059a568de20dcf7c3d1efc6403 Mon Sep 17 00:00:00 2001
From: Frederico Palma <deactivated@coded.pt>
Date: Mon, 2 Mar 2015 22:59:35 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@2044
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 .../evolute/siprp/pagina/GlobalConstants.java |  2 +-
 .../evolute/siprp/pagina/doGetFicheiro.java   | 22 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/trunk/siprpWeb/src/com/evolute/siprp/pagina/GlobalConstants.java b/trunk/siprpWeb/src/com/evolute/siprp/pagina/GlobalConstants.java
index e7055155..fc370549 100644
--- a/trunk/siprpWeb/src/com/evolute/siprp/pagina/GlobalConstants.java
+++ b/trunk/siprpWeb/src/com/evolute/siprp/pagina/GlobalConstants.java
@@ -45,7 +45,7 @@ public interface GlobalConstants
     public static final String bdLocalUsername = "siprp";
     public static final String bdLocalPassword = "rg2h-opksiprp";
     public static final String bdLocalDriver = "org.postgresql.Driver";
-    public static final String bdLocalUrl = "jdbc:postgresql://" + bdHost + ":" + bdPort + "/siprp_local";
+    public static final String bdLocalUrl = "jdbc:postgresql://" + bdLocalHost + ":" + bdLocalPort + "/siprp_local";
 	
 	public static final String DEFAULT_EMAIL = "geral@siprp.pt";
 	
diff --git a/trunk/siprpWeb/src/com/evolute/siprp/pagina/doGetFicheiro.java b/trunk/siprpWeb/src/com/evolute/siprp/pagina/doGetFicheiro.java
index 6468f76d..fdf5ee17 100644
--- a/trunk/siprpWeb/src/com/evolute/siprp/pagina/doGetFicheiro.java
+++ b/trunk/siprpWeb/src/com/evolute/siprp/pagina/doGetFicheiro.java
@@ -13,7 +13,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.evolute.utils.arrays.ResultSet2DArray;
+import com.evolute.utils.arrays.Virtual2DArray;
+import com.evolute.utils.db.Executer;
+import com.evolute.utils.db.JDBCManager;
 import com.evolute.utils.error.ErrorLogger;
+import com.evolute.utils.sql.Field;
+import com.evolute.utils.sql.SQLQuery;
+import com.evolute.utils.sql.Select;
+import com.evolute.utils.sql.Select2;
 import com.evolute.utils.strings.UnicodeChecker;
 
 
@@ -26,7 +33,7 @@ public class doGetFicheiro extends siprpServlet
 		ServletOutputStream os = res.getOutputStream();
 		try
 		{
-			ResultSet2DArray rs = getDatabaseData(query);
+			Virtual2DArray rs = getDatabaseData(query);
 			if(rs != null)
 			{	
 				for( int i = 0; i <= rs.columnLength(); i++ )
@@ -52,8 +59,19 @@ public class doGetFicheiro extends siprpServlet
 		os.close();
 	}
 
+//	private Virtual2DArray getDatabaseData(String query) throws Exception
+//	{
+//		JDBCManager dbm = new JDBCManager( bdLocalUrl, bdLocalUsername, bdLocalPassword, 2, 1, 1, null);
+//		Executer executer = dbm.getSharedExecuter( "" );
+//		Select select = 
+//			new Select2( "fil_file",
+//				new Field( "id" ).isEqual( query ), 
+//				"file_data", "mime_type", "name" );
+//		return executer.executeQuery( select );
+//	}
+	
 	private ResultSet2DArray getDatabaseData(String query) throws Exception
-	{
+	{		
 		ResultSet2DArray rs;
 		Class.forName( bdDriver );
 		Connection con = DriverManager.getConnection( bdLocalUrl, bdLocalUsername, bdLocalPassword );