Ticket #133: 0001-Fix-handling-of-simultaneous-requests-in-petascope-t.patch

applications/petascope/src/main/java/petascope/core/DbMetadataSource.java

@@ -451 +451 @@
             ensureConnection();
             s = conn.createStatement();
 
-            ResultSet r = s.executeQuery("SELECT id, type, nullDefault, interpolationTypeDefault, nullResistanceDefault FROM PS_Coverage WHERE name = '" + coverageName + "'");
+            ResultSet r = null;
+                r = s.executeQuery("SELECT id, type, nullDefault, interpolationTypeDefault, nullResistanceDefault FROM PS_Coverage WHERE name = '" + coverageName + "'");
 
             if (!r.next()) {
                 throw new PetascopeException(ExceptionCode.InvalidRequest,
@@ -630 +631 @@
             } else if (twoDCoverage) {
                 log.warn(" Bounding box missing for 2-D coverage '" + coverageName + "'...");
             }
+            
+            r = s.executeQuery("SELECT metadata FROM ps_metadata WHERE coverage in "
+                     + "(SELECT id FROM ps_coverage WHERE name = '" + coverage + "')");
+            String metadata = "";
+            if (r.next()) {
+                metadata = r.getString("metadata");
+            }
 
             /* Done with SQL statements */
             s.close();
@@ -639 +647 @@
                     new InterpolationMethod(interpolationTypeDefault, nullResistanceDefault),
                     coverageName, coverageType, domain, bbox, title, abstr, keywords);
             meta.setCoverageId(coverage);
+            meta.setMetadata(metadata);
             log.trace("Caching coverage metadata.");
             cache.put(coverageName, meta);
             return meta;
@@ -1054 +1063 @@
         }
     }
     
-    /**
-     * Given the CoverageID; returns image metadata
-     * @param coverageId
-     * @return textual metadata
-     * @throws PetascopeException
-     */
-    public String getImageMetadata(String coverageId) throws PetascopeException {
-        Statement s = null;
-        try {
-            ensureConnection();
-            s = conn.createStatement();
-            ResultSet r = s.executeQuery("SELECT metadata FROM ps_metadata WHERE coverage in "
-                     + "(SELECT id FROM ps_coverage WHERE name = '" + coverageId + "')");
-            if (r.next()) {
-                return r.getString("metadata");
-            } else {
-                return "";
-            }
-        } catch (SQLException sqle) {
-            throw new PetascopeException(ExceptionCode.ResourceError,
-                    "Error retrieving metadata for coverage " + coverageId, sqle);
-        } finally {
-            if (s != null) {
-                try {
-                    s.close();
-                } catch (SQLException f) {
-                }
-            }
-            close();
-        }
-    }
-
     /** Insert metadata for a new coverage.
      *
      * @param meta Metadata object, container of information

applications/petascope/src/main/java/petascope/core/Metadata.java

@@ -63 +63 @@
     private Bbox bbox = null;
     private CellDomainElement cellX, cellY, cellT;
     private DomainElement domX, domY, domT;
+    private String metadata;
 
     public Metadata(List<CellDomainElement> cellDomain, List<RangeElement> range,
             Set<String> nullSet, String nullDefault, Set<InterpolationMethod> interpolationSet,
@@ -683 +684 @@
         BigInteger big = cellT.getHi().subtract(cellT.getLo());
         return big.longValue();
     }
+
+    public String getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(String metadata) {
+        this.metadata = metadata;
+    }
 }

applications/petascope/src/main/java/petascope/util/WcsUtil.java

@@ -183 +183 @@
                     Pair.of("\\{code\\}", range.getUomCode()));
         }
 
+        String metadata = m.getMetadata().getMetadata();
+        if (metadata == null) {
+            metadata = "<gmlcov:metadata>" + metadata + "</gmlcov:metadata>";
+        } else {
+            metadata = "";
+        }
         String ret = Templates.getTemplate(template,
                 Pair.of("\\{coverageId\\}", m.getCoverageId()),
                 Pair.of("\\{coverageType\\}", m.getCoverageType()),
@@ -199 +205 @@
                 Pair.of("\\{srsName\\}", getSrsName(m)),
                 Pair.of("\\{lowerCorner\\}", getLowerCorner(m)),
                 Pair.of("\\{upperCorner\\}", getUpperCorner(m)),
+                Pair.of("\\{metadata\\}", metadata),
                 Pair.of("\\{additions\\}", getAdditions(m)));
 
         if (replaceBounds) {

applications/petascope/src/main/java/petascope/wcs2/extensions/GmlFormatExtension.java

@@ -72 +72 @@
         //Handle the range subset feature
         RangeSubsettingExtension rsubExt = (RangeSubsettingExtension) ExtensionsRegistry.getExtension(ExtensionsRegistry.RANGE_SUBSETTING_IDENTIFIER);
         rsubExt.handle(request, m);
-        String metadata = "";
-        try {
-            metadata = meta.getImageMetadata(request.getCoverageId());
-        } catch (PetascopeException p) {
-            throw new WCSException(ExceptionCode.ResourceError, p);
-        }
         
         if (m.getCoverageType().equals(GetCoverageRequest.MULTIPOINT_COVERAGE)) {
             Response r = handleMultiPoint(request, request.getCoverageId(), meta, m);
             String xml = r.getXml();
-            if (!metadata.isEmpty()) {
-                xml = xml.replace("{metadata}", "<gmlcov:metadata>" + metadata + "</gmlcov:metadata>");
-            } else {
-                xml = xml.replace("{metadata}", "");
-            }
             return new Response(r.getData(), xml, r.getMimeType());
         }
         
         setBounds(request, m, meta);
         String gml = WcsUtil.getGML(m, Templates.GRID_COVERAGE, true);
         gml = addCoverageData(gml, request, meta, m);
-        if (!metadata.isEmpty()) {
-            gml = gml.replace("{metadata}", "<gmlcov:metadata>" + metadata + "</gmlcov:metadata>");
-        } else {
-            gml = gml.replace("{metadata}", "");
-        }
         return new Response(gml);
     }
     

applications/petascope/src/main/java/petascope/wcs2/handlers/DescribeCoverageHandler.java

@@ -80 +80 @@
             if (exc != null) {
                 continue;
             }
-            String metadata = "";
-            try {
-                metadata = meta.getImageMetadata(coverageId);
-            } catch (PetascopeException p) {
-                throw new WCSException(ExceptionCode.ResourceError, p);
-            }
-            if (!metadata.isEmpty()) {
-                descr = descr.replace("{metadata}", "<gmlcov:metadata>" + metadata + "</gmlcov:metadata>"); 
-            } else {
-                descr = descr.replace("{metadata}", ""); 
-            }
             try {
                 root.appendChild(XMLUtil.buildDocument(null, descr).getRootElement().copy());
             } catch (Exception ex) {