Bugfix: Querformat, BKU 2.7.x, ...

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@35 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 52 insertions, 2 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUPostConnection.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUPostConnection.java
index 773b248..1ddef5f 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUPostConnection.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUPostConnection.java
@@ -18,7 +18,11 @@
 package at.knowcenter.wag.egov.egiz.sig.connectors;

 

 import java.io.IOException;

+import java.util.Properties;

+import java.util.regex.Matcher;

+import java.util.regex.Pattern;

 

+import org.apache.commons.httpclient.Header;

 import org.apache.commons.httpclient.HttpClient;

 import org.apache.commons.httpclient.HttpException;

 import org.apache.commons.httpclient.NameValuePair;

@@ -52,7 +56,7 @@ public abstract class BKUPostConnection
    * @throws HttpException

    *           ErrorCode:320

    */

-  public static String doPostRequest(String url, String request) throws HttpException, IOException

+  public static Properties doPostRequest(String url, String request) throws HttpException, IOException

   {

 

     PostMethod post_method = new PostMethod(url);

@@ -81,6 +85,23 @@ public abstract class BKUPostConnection
     int method_response = http_client.executeMethod(post_method);

     logger_.debug("method_response = " + method_response);

 

+    Properties response_properties = new Properties();

+    

+    if (logger_.isDebugEnabled())

+    {

+      Header[] response_headers = post_method.getResponseHeaders();

+      logger_.debug("#" + response_headers.length + " headers in response:");

+      for (int i = 0; i < response_headers.length; i++)

+      {

+        logger_.debug("  response_header[" + i + "]: name = " + response_headers[i].getName() + ", value = " + response_headers[i].getValue());

+      }

+    }

+    

+    Header server_header = post_method.getResponseHeader("Server");

+    logger_.debug("server_header: name = " + server_header.getName() + ", value = " + server_header.getValue());

+    parseBKUVersion(server_header.getValue(), response_properties);

+

+

     byte[] response_body = post_method.getResponseBody();

     String response_string = new String(response_body, "UTF-8");

 

@@ -89,7 +110,36 @@ public abstract class BKUPostConnection
     // response.

     // String response_string = post.getResponseBodyAsString();

 

-    return response_string;

+    response_properties.setProperty("response_string", response_string);

+    

+    return response_properties;

   }

 

+  // TODO hotfix

+  public static void parseBKUVersion(String header_value, Properties properties)

+  {

+    Pattern pattern = Pattern.compile("^citizen-card-environment/(\\d+\\.\\d+) (.+)/(\\d+\\.\\d+\\.\\d+)$");

+    Matcher m = pattern.matcher(header_value);

+    

+    m.matches();

+    

+    logger_.debug("group count = " + m.groupCount());

+    

+    for (int i = 0; i <= m.groupCount(); i++)

+    {

+      logger_.debug("  group[" + i + "] = " + m.group(i));

+    }

+    

+    final String cceVersion = m.group(1);

+    final String productName = m.group(2);

+    final String productVersion = m.group(3);

+    

+    logger_.debug("cceVersion = " + cceVersion);

+    logger_.debug("productName = " + productName);

+    logger_.debug("productVersion = " + productVersion);

+    

+    properties.setProperty("cceVersion", cceVersion);

+    properties.setProperty("productName", productName);

+    properties.setProperty("productVersion", productVersion);

+  }

 }