Downgrades to Java 1.6 to run demo on Debian Wheezy

diff --git a/pom.xml b/pom.xml
index 567fde3..2df0cf2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,8 @@
           <excludes>\r
              <exclude>src/META-INF/</exclude>\r
           </excludes>\r
-          <source>1.7</source>\r
-          <target>1.7</target>\r
+          <source>1.6</source>\r
+          <target>1.6</target>\r
         </configuration>\r
       </plugin>\r
     </plugins>\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/errors/ErrorHelper.java b/src/main/java/com/indexdata/pz2utils4jsf/errors/ErrorHelper.java
index 874c50f..0664f20 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/errors/ErrorHelper.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/errors/ErrorHelper.java
@@ -121,19 +121,19 @@ public class ErrorHelper implements Serializable {
             + "that a pazpar2 service is running at the given address." + nl);\r
         break;           \r
       case PAZPAR2_ERRORS:\r
-        if (error.hasPazpar2Error()) {\r
-          String pz2code = error.getPazpar2Error().getCode();\r
+        if (error.hasPazpar2Error()) {          \r
+          int pz2code = Integer.parseInt(error.getPazpar2Error().getCode());\r
           switch (pz2code) {\r
-            case "3":\r
+            case 3:\r
               suggestions.add("Query terms not supported.");\r
               break;\r
-            case "12":\r
+            case 12:\r
               suggestions.add("The Pazpar2 server does not have a service defined by the requested ID ");\r
               suggestions.add("Please check the service ID set in the configuration and compare it with the " +\r
                   " configuration on the Pazpar2 server-side.");\r
               addConfigurationDocumentation(suggestions);    \r
               break;\r
-            case "100":\r
+            case 100:\r
               suggestions.add("Pazpar2 Service Proxy error");\r
               suggestions.add("A request was made to the Pazpar2 Service Proxy, but the Service Proxy reports ");\r
               suggestions.add(" that authentication is lacking. Could be no successful authentication request was made or");\r
@@ -151,7 +151,7 @@ public class ErrorHelper implements Serializable {
         break;       \r
       case NOT_RESOLVED:\r
         suggestions.add("Sorry, no troubleshooting suggestions were written for this error scenario just yet.");\r
-        break;\r
+        break;                \r
     }\r
     return suggestions;\r
   }\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
index 16eea35..e881506 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
@@ -2,10 +2,8 @@ package com.indexdata.pz2utils4jsf.pazpar2.sp;
 \r
 import static com.indexdata.pz2utils4jsf.utils.Utils.nl;\r
 \r
-import java.io.BufferedWriter;\r
 import java.io.ByteArrayOutputStream;\r
 import java.io.File;\r
-import java.io.FileWriter;\r
 import java.io.IOException;\r
 import java.nio.file.Path;\r
 import java.nio.file.Paths;\r
@@ -13,7 +11,6 @@ import java.util.ArrayList;
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
-import java.util.Scanner;\r
 \r
 import javax.enterprise.context.SessionScoped;\r
 import javax.inject.Named;\r
@@ -241,6 +238,7 @@ public class ServiceProxyClient implements SearchClient {
     File initDoc = new File(filePath);\r
     logger.info("Posting to SP: ");\r
     Path path = Paths.get(filePath);\r
+    /*\r
     if (logger.isDebugEnabled()) {\r
       try (Scanner scanner =  new Scanner(path, "UTF-8")){\r
         while (scanner.hasNextLine()){\r
@@ -248,6 +246,7 @@ public class ServiceProxyClient implements SearchClient {
         }      \r
       }     \r
     }\r
+    */\r
     post.setEntity(new FileEntity(initDoc));\r
     byte[] response = client.execute(post, handler);\r
     logger.info("Response on POST was: " + new String(response,"UTF-8"));    \r