Displaying differences for changeset
 
display as  

src/csip/Config.java

@@ -105,7 +105,7 @@
         /* 
          The CSIP version
          */
-        put("csip.version", "$version: 2.1.13 4fc5a24a0aff 2016-04-01 od, built at 2016-04-04 10:44 by od$");
+        put("csip.version", "$version: 2.1.16 7a86841f0017 2016-04-04 od, built at 2016-04-04 14:19 by od$");
 
         /*
          * The runtime architecture. 
@@ -1195,15 +1195,19 @@
 
     static synchronized ArchiveStore getArchiveStore() {
         if (archive == null) {
-            switch (getString("csip.archive.backend")) {
-                case "mongodb":
-                    archive = new MongoDBArchive(getString("csip.archive.mongodb.uri"));
-                    break;
-                case "none":
-                    archive = ArchiveStore.NONE;
-                    break;
-                default:
-                    throw new RuntimeException("unknown archive backend: " + getString("csip.archive.backend"));
+            if (!isArchiveEnabled()) {
+                archive = ArchiveStore.NONE;
+            } else {
+                switch (getString("csip.archive.backend")) {
+                    case "mongodb":
+                        archive = new MongoDBArchive(getString("csip.archive.mongodb.uri"));
+                        break;
+                    case "none":
+                        archive = ArchiveStore.NONE;
+                        break;
+                    default:
+                        throw new RuntimeException("unknown archive backend: " + getString("csip.archive.backend"));
+                }
             }
         }
         return archive;
@@ -1212,15 +1216,19 @@
 
     static synchronized AccessLogStore getAccessLogStore() {
         if (logstore == null) {
-            switch (getString("csip.accesslog.backend")) {
-                case "postgres":
-                    logstore = new PostgresAccessLogStore(getString("csip.accesslog.postgres.url"));
-                    break;
-                case "none":
-                    logstore = AccessLogStore.NONE;
-                    break;
-                default:
-                    throw new RuntimeException("unknown accesslog backend: " + getString("csip.accesslog.backend"));
+            if (!isAccessLogEnabled()) {
+                logstore = AccessLogStore.NONE;
+            } else {
+                switch (getString("csip.accesslog.backend")) {
+                    case "postgres":
+                        logstore = new PostgresAccessLogStore(getString("csip.accesslog.postgres.url"));
+                        break;
+                    case "none":
+                        logstore = AccessLogStore.NONE;
+                        break;
+                    default:
+                        throw new RuntimeException("unknown accesslog backend: " + getString("csip.accesslog.backend"));
+                }
             }
         }
         return logstore;

src/csip/QueryService.java

@@ -414,8 +414,11 @@
                 if (out.getEntity() instanceof StreamingOutput) {
                     StreamingOutput o = (StreamingOutput) out.getEntity();
                     return toString(o);
+                } else {
+                    InputStream is = out.readEntity(InputStream.class);
+                    return IOUtils.toString(is);
                 }
-                return JSONUtils.error("not found: " + suid).toString();
+//                return JSONUtils.error("not found: " + suid).toString();
             }
             return JSONUtils.error("suid unknown: " + suid).toString();
         } catch (Exception E) {